narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

better error checking in ssl switch over

Browse source 
Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
This commit is contained in:
iNPUTmice 2014-11-16 12:00:53 +01:00
parent ac4eabbd22
commit f41f3b120c
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -18,6 +18,8 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.math.BigInteger; import java.math.BigInteger;
import java.net.IDN;
import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Socket; import java.net.Socket;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@ -553,12 +555,15 @@ public class XmppConnection implements Runnable {
HostnameVerifier verifier = this.mXmppConnectionService.getMemorizingTrustManager().wrapHostnameVerifier(new StrictHostnameVerifier()); HostnameVerifier verifier = this.mXmppConnectionService.getMemorizingTrustManager().wrapHostnameVerifier(new StrictHostnameVerifier());
if (socket == null) { if (socket == null || socket.isClosed()) {
throw new IOException("socket was null"); throw new IOException("socket null or closed");
} }
SSLSocket sslSocket = (SSLSocket) factory.createSocket(socket, final InetAddress address = socket.getInetAddress();
socket.getInetAddress().getHostAddress(), socket.getPort(), if (address == null) {
true); throw new IOException("socket address was null");
}
final SSLSocket sslSocket = (SSLSocket) factory.createSocket(socket,address.getHostAddress(), socket.getPort(),true);
// Support all protocols except legacy SSL. // Support all protocols except legacy SSL.
// The min SDK version prevents us having to worry about SSLv2. In // The min SDK version prevents us having to worry about SSLv2. In