squashme: more sni conversions for schannelbagder/keep-trailing-dot

InitializeSecurityContext's pszTargetName (hostname used for SNI)
should match in all calls.

1 files changed, 20 insertions, 6 deletions

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 2067ebb06..b5b879abe 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -1143,9 +1143,16 @@ schannel_connect_step2(struct Curl_easy *data, struct connectdata *conn,
     memcpy(inbuf[0].pvBuffer, backend->encdata_buffer,
            backend->encdata_offset);
 
-    host_name = curlx_convert_UTF8_to_tchar(hostname);
-    if(!host_name)
-      return CURLE_OUT_OF_MEMORY;
+    {
+      char *snihost = Curl_ssl_snihost(data, hostname, NULL);
+      if(!snihost) {
+        failf(data, "Failed to set SNI");
+        return CURLE_SSL_CONNECT_ERROR;
+      }
+      host_name = curlx_convert_UTF8_to_tchar(snihost);
+      if(!host_name)
+        return CURLE_OUT_OF_MEMORY;
+    }
 
     sspi_status = s_pSecFn->InitializeSecurityContext(
       &backend->cred->cred_handle, &backend->ctxt->ctxt_handle,
@@ -2192,9 +2199,16 @@ static int schannel_shutdown(struct Curl_easy *data, struct connectdata *conn,
             Curl_sspi_strerror(sspi_status, buffer, sizeof(buffer)));
     }
 
-    host_name = curlx_convert_UTF8_to_tchar(hostname);
-    if(!host_name)
-      return CURLE_OUT_OF_MEMORY;
+    {
+      char *snihost = Curl_ssl_snihost(data, hostname, NULL);
+      if(!snihost) {
+        failf(data, "Failed to set SNI");
+        return CURLE_SSL_CONNECT_ERROR;
+      }
+      host_name = curlx_convert_UTF8_to_tchar(snihost);
+      if(!host_name)
+        return CURLE_OUT_OF_MEMORY;
+    }
 
     /* setup output buffer */
     InitSecBuffer(&outbuf, SECBUFFER_EMPTY, NULL, 0);