Merge with latest yaSSL.

Fixes IsAligned yaSSL assertion failure.

3 files changed, 2 insertions, 1 deletions

diff --git a/extra/yassl/src/buffer.cpp b/extra/yassl/src/buffer.cpp
index a3a09121800..1da0827ac4e 100644
--- a/extra/yassl/src/buffer.cpp
+++ b/extra/yassl/src/buffer.cpp
@@ -24,6 +24,7 @@
  * with SSL types and sockets
  */
 
+#include <string.h>             // memcpy
 #include "buffer.hpp"
 #include "yassl_types.hpp"
 
diff --git a/extra/yassl/src/socket_wrapper.cpp b/extra/yassl/src/socket_wrapper.cpp
index f0d530f187c..1be6a715980 100644
--- a/extra/yassl/src/socket_wrapper.cpp
+++ b/extra/yassl/src/socket_wrapper.cpp
@@ -27,7 +27,6 @@
 
 
 #include "socket_wrapper.hpp"
-#include "yassl_error.hpp"
 
 #ifndef WIN32
     #include <errno.h>
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp
index 84ffb9b5829..a82afcd4aad 100644
--- a/extra/yassl/src/ssl.cpp
+++ b/extra/yassl/src/ssl.cpp
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include "runtime.hpp"
 
+
 namespace yaSSL {
 
 using mySTL::min;