Merge branch 'master' of https://github.com/kaleb-himes/cyassl

README

@@ -34,7 +34,16 @@ before calling SSL_new();  Though it's not recommended.
 
 *** end Notes ***
 
-CyaSSL Release 3.3.0 (12/05/2014)
+CyaSSL Release 3.3.2 (01/07/2015)
+
+Release 3.3.2 CyaSSL has bug fixes and new features including:
+
+- Improvements in the build configuration under AIX.
+- Various compile warnings.
+- Changed a memcpy to memmove in the sniffer.
+
+
+ ***********CyaSSL Release 3.3.0 (12/05/2014)
 
 - Countermeasuers for Handshake message duplicates, CHANGE CIPHER without
   FINISHED, and fast forward attempts.  Thanks to Karthikeyan Bhargavan from

README.md

@@ -35,6 +35,13 @@ SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
 before calling SSL_new();  Though it's not recommended.
 ```
 
+# CyaSSL Release 3.3.2 (01/07/2015)
+
+## Release 3.3.2 CyaSSL has bug fixes and new features including:
+
+- Improvements in the build configuration under AIX.
+- Various compile warnings.
+- Changed a memcpy to memmove in the sniffer
 
 # CyaSSL Release 3.3.0 (12/05/2014)
 

configure.ac

@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([wolfssl],[3.3.0],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
+AC_INIT([wolfssl],[3.3.2],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 

src/sniffer.c

@@ -2674,7 +2674,7 @@ doMessage:
                     return -1;
                 }
             }
-            XMEMCPY(ssl->buffers.inputBuffer.buffer, sslFrame, sslBytes);
+            XMEMMOVE(ssl->buffers.inputBuffer.buffer, sslFrame, sslBytes);
             ssl->buffers.inputBuffer.length = sslBytes;
         }
         if (HaveMoreInput(session, &sslFrame, &sslBytes, &end, error))

wolfssl/version.h

@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFSSL_VERSION_STRING "3.3.0"
-#define LIBWOLFSSL_VERSION_HEX 0x03003000
+#define LIBWOLFSSL_VERSION_STRING "3.3.2"
+#define LIBWOLFSSL_VERSION_HEX 0x03003002
 
 #ifdef __cplusplus
 }