merge in sni

examples/client/client.c

@@ -32,6 +32,8 @@
 
 #include <cyassl/ctaocrypt/settings.h>
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #if !defined(CYASSL_TRACK_MEMORY) && !defined(NO_MAIN_DRIVER)
     /* in case memory tracker wants stats */
     #define CYASSL_TRACK_MEMORY
@@ -130,6 +132,7 @@ static void Usage(void)
 #ifdef SHOW_SIZES
     printf("-z          Print structure sizes\n");
 #endif
+    printf("-S <str>    Use Host Name Indication\n");
 }
 
 
@@ -178,6 +181,10 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
     char*  ourCert    = (char*)cliCert;
     char*  ourKey     = (char*)cliKey;
 
+#ifdef HAVE_SNI
+    char*  sniHostName = NULL;
+#endif
+
     int     argc = ((func_args*)args)->argc;
     char**  argv = ((func_args*)args)->argv;
 
@@ -193,7 +200,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
     (void)sslResume;
     (void)trackMemory;
 
-    while ((ch = mygetopt(argc, argv, "?gdusmNrtfxh:p:v:l:A:c:k:b:z")) != -1) {
+    while ((ch = mygetopt(argc, argv, "?gdusmNrtfxh:p:v:l:A:c:k:b:zS:")) != -1){
         switch (ch) {
             case '?' :
                 Usage();
@@ -292,6 +299,12 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
                 #endif
                 break;
 
+            case 'S' :
+                #ifdef HAVE_SNI
+                    sniHostName = myoptarg;
+                #endif
+                break;
+
             default:
                 Usage();
                 exit(MY_EX_USAGE);
@@ -358,6 +371,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
 
         default:
             err_sys("Bad SSL version");
+            break;
     }
 
     if (method == NULL)
@@ -445,6 +459,12 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
     CyaSSL_CTX_UseCavium(ctx, CAVIUM_DEV_ID);
 #endif
 
+#ifdef HAVE_SNI
+    if (sniHostName)
+        if (CyaSSL_CTX_UseSNI(ctx, 0, sniHostName, XSTRLEN(sniHostName)))
+            err_sys("UseSNI failed");
+#endif
+
     if (benchmark) {
         /* time passed in number of connects give average */
         int times = benchmark;