removed duplicate call to useSNI, check session if != null for cached SNI name if not set through parameters

Author: rlm2002

src/java/com/wolfssl/provider/jsse/WolfSSLAuthStore.java

@@ -411,27 +411,6 @@ else if (!sessionCipherSuiteAvailable(
 
             ses.isFromTable = true;
 
-            /* Check if the session has stored SNI server names */
-            List<SNIServerName> sniNames = ses.getSNIServerNames();
-            if (sniNames != null && !sniNames.isEmpty()) {
-                WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
-                    () -> "Found SNI server names in cached session");
-
-                /* Apply SNI settings to the SSL connection */
-                for (SNIServerName name : sniNames) {
-                    if (name instanceof SNIHostName) {
-                        String hostName = ((SNIHostName)name).getAsciiName();
-                        WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
-                            () -> "Applying SNI hostname for resumption: " +
-                            hostName);
-
-                        /* Set the SNI directly on the SSL object */
-                        ssl.useSNI((byte)WolfSSL.WOLFSSL_SNI_HOST_NAME,
-                            hostName.getBytes(StandardCharsets.UTF_8));
-                    }
-                }
-            }
-
             if (ses.resume(ssl) != WolfSSL.SSL_SUCCESS) {
                 WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
                     () -> "native wolfSSL_set_session() failed, " +

src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java

@@ -1122,25 +1122,38 @@ else if (this.clientMode) {
 
             /* Explicitly set if user has set through SSLParameters. Check
              * wolfSSL-specific server names first, then fall back to standard
-             * SSLParameters server names (set via parent setServerNames()). */
+             * SSLParameters server names (set via parent setServerNames()).
+             * If neither have been set and session is being resumed, check
+             * cached SNI */
+            boolean sniSet = false;
             List<WolfSSLSNIServerName> names =
                 this.params.getWolfSSLServerNames();
             List<SNIServerName> parentNames =
                 this.params.getServerNames();
+            List<SNIServerName> sniServerNames =
+                (this.session == null) ? null :
+                    this.session.getSNIServerNames();
             if (names != null && !names.isEmpty()) {
                 WolfSSLSNIServerName sni = names.get(0);
                 if (sni != null) {
                     this.ssl.useSNI((byte)sni.getType(), sni.getEncoded());
+                    sniSet = true;
                 }
             } else if (parentNames != null && !parentNames.isEmpty()) {
                 SNIServerName sni = parentNames.get(0);
                 if (sni != null) {
                     this.ssl.useSNI((byte)sni.getType(), sni.getEncoded());
+                    sniSet = true;
+                }
+            } else if (sniServerNames != null && !sniServerNames.isEmpty()) {
+                SNIServerName sni = sniServerNames.get(0);
+                if (sni != null) {
+                    this.ssl.useSNI((byte)sni.getType(), sni.getEncoded());
+                    sniSet = true;
                 }
             }
 
-            if ((names == null || names.isEmpty()) &&
-                (parentNames == null || parentNames.isEmpty()) && autoSNI) {
+            if (!sniSet && autoSNI) {
                 if (this.peerAddr != null && this.jdkTlsTrustNameService) {
                     WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
                         () -> "setting SNI extension with " +
@@ -1173,10 +1186,14 @@ else if (this.clientMode) {
                         () -> "hostname and peerAddr are null, " +
                         "not setting SNI");
                 }
+            } else if (sniSet) {
+                WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
+                    () -> "SNI configured through SSLParameters " +
+                    "or session resumption");
             } else {
                 WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
-                    () -> "No SNI configured through SSLParameters, " +
-                    "not setting SNI");
+                    () -> "No SNI configured through SSLParameters " +
+                    "or session resumption, not setting SNI");
             }
         }
     }