Merge branch 'master' of github.com:cyassl/cyassl

README

@@ -34,7 +34,26 @@ before calling SSL_new();  Though it's not recommended.
 
 *** end Note ***
 
-CyaSSL Release 2.2.0 (5/18/2012)
+CyaSSL Release 2.3.0 (8/10/2012)
+
+Release 2.3.0 CyaSSL has bug fixes and a few new features including:
+- AES-GCM crypto and cipher suites
+- make test cipher suite checks
+- Subject AltName processing
+- Command line support for client/server examples
+- Sniffer SessionTicket support
+- SHA-384 cipher suites
+- Verify cipher suite validity when user overrides
+- CRL dir monitoring
+- DTLS Cookie support, reliability coming soon
+
+The CyaSSL manual is available at:
+http://www.yassl.com/documentation/CyaSSL-Manual.pdf.  For build instructions 
+and comments about the new features please check the manual.
+
+
+
+***************CyaSSL Release 2.2.0 (5/18/2012)
 
 Release 2.2.0 CyaSSL has bug fixes and a few new features including:
 - Initial CRL support (--enable-crl)

configure.ac

@@ -1,12 +1,12 @@
 # configure.ac
 #
-# Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
+# Copyright (C) 2006-2012 Sawtooth Consulting Ltd.
 #
 # This file is part of CyaSSL.
 #
 #
 
-AC_INIT([cyassl],[2.2.6],[http://www.yassl.com])
+AC_INIT([cyassl],[2.3.0],[http://www.yassl.com])
 
 AC_CONFIG_AUX_DIR(config)
 

examples/client/client.c

@@ -88,6 +88,7 @@ static void Usage(void)
     printf("-d          Disable peer checks\n");
     printf("-g          Send server HTTP GET\n");
     printf("-u          Use UDP DTLS\n");
+    printf("-m          Match domain name in cert\n");
 }
 
 
@@ -121,6 +122,7 @@ void client_test(void* args)
     int    sendGET  = 0;
     int    benchmark = 0;
     int    doDTLS    = 0;
+    int    matchName = 0;
     int    doPeerCheck = 1;
     char*  cipherList = NULL;
     char*  verifyCert = (char*)caCert;
@@ -132,7 +134,7 @@ void client_test(void* args)
 
     ((func_args*)args)->return_code = -1; /* error state */
 
-    while ((ch = mygetopt(argc, argv, "?gdush:p:v:l:A:c:k:b:")) != -1) {
+    while ((ch = mygetopt(argc, argv, "?gdusmh:p:v:l:A:c:k:b:")) != -1) {
         switch (ch) {
             case '?' :
                 Usage();
@@ -155,6 +157,10 @@ void client_test(void* args)
                 usePsk = 1;
                 break;
 
+            case 'm' :
+                matchName = 1;
+                break;
+
             case 'h' :
                 host   = myoptarg;
                 domain = myoptarg;
@@ -325,7 +331,7 @@ void client_test(void* args)
     CyaSSL_LoadCRL(ssl, crlPemDir, SSL_FILETYPE_PEM, 0);
     CyaSSL_SetCRL_Cb(ssl, CRL_CallBack);
 #endif
-    if (doPeerCheck)
+    if (matchName && doPeerCheck)
         CyaSSL_check_domain_name(ssl, domain);
 #ifdef NON_BLOCKING
     tcp_set_nonblocking(&sockfd);