Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2024-10-03 17:07:34 +02:00
Code Issues Projects Releases Wiki Activity

TLS does not require SSL to be true.

Browse Source
This commit is contained in:
cnaude 2015-03-18 11:24:24 -07:00
parent 620d1d0a9d
commit b3e92df042
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/cnaude/purpleirc/PurpleBot.java
View File

@ -55,8 +55,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
import me.botsko.prism.actionlibs.QueryParameters;
import me.botsko.prism.events.BlockStateChange;
import org.bukkit.Achievement;
@ -267,7 +265,7 @@ public final class PurpleBot {
}
configBuilder.setNickservPassword(botIdentPassword);
}
if (ssl) {
if (ssl || tls) {
UtilSSLSocketFactory socketFactory = new UtilSSLSocketFactory();
socketFactory.disableDiffieHellman();
if (trustAllCerts) {