Merge pull request #942 from grandfield/develop

Append SSLParamaters

Author: Ranjan Dasgupta

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/SSLNetworkModule.java

@@ -136,26 +136,25 @@ public void start() throws IOException, MqttException {
 		socket.setSoTimeout(this.handshakeTimeoutSecs * 1000);
 
 		// SNI support.  Should be automatic under some circumstances - not all, apparently
+		SSLParameters sslParameters = ((SSLSocket)socket).getSSLParameters();
 		try {
-			SSLParameters sslParameters = new SSLParameters();
 			List<SNIServerName> sniHostNames = new ArrayList<SNIServerName>(1);
 			sniHostNames.add(new SNIHostName(host));
 			sslParameters.setServerNames(sniHostNames);
-			((SSLSocket)socket).setSSLParameters(sslParameters);
 		} catch(NoClassDefFoundError e) {
 			// Android < 7.0
 		}
 
 		// If default Hostname verification is enabled, use the same method that is used with HTTPS
 		if(this.httpsHostnameVerificationEnabled) {
 			try {
-				SSLParameters sslParams = new SSLParameters();
-				sslParams.setEndpointIdentificationAlgorithm("HTTPS");
-				((SSLSocket) socket).setSSLParameters(sslParams);
+				sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
 			} catch(NoSuchMethodError e) {
 				// Android < 7.0
 			}
 		}
+		((SSLSocket)socket).setSSLParameters(sslParameters);
+
 		((SSLSocket) socket).startHandshake();
 		if (hostnameVerifier != null && !this.httpsHostnameVerificationEnabled) {
 			SSLSession session = ((SSLSocket) socket).getSession();

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModule.java

@@ -130,19 +130,18 @@ public void start() throws IOException, MqttException {
 		socket.setSoTimeout(this.handshakeTimeoutSecs * 1000);
 
 		// SNI support.  Should be automatic under some circumstances - not all, apparently
-		SSLParameters sslParameters = new SSLParameters();
+		SSLParameters sslParameters = ((SSLSocket)socket).getSSLParameters();
 		List<SNIServerName> sniHostNames = new ArrayList<SNIServerName>(1);
 		sniHostNames.add(new SNIHostName(host));
 		sslParameters.setServerNames(sniHostNames);
-		((SSLSocket)socket).setSSLParameters(sslParameters);
 
 		// If default Hostname verification is enabled, use the same method that is used with HTTPS
 		if (this.httpsHostnameVerificationEnabled) {
-			SSLParameters sslParams = new SSLParameters();
-			sslParams.setEndpointIdentificationAlgorithm("HTTPS");
-			((SSLSocket) socket).setSSLParameters(sslParams);	
+			sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
 		}
 
+		((SSLSocket) socket).setSSLParameters(sslParameters);
+
 		((SSLSocket) socket).startHandshake();
 		if (hostnameVerifier != null) {
 			SSLSession session = ((SSLSocket) socket).getSession();