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

configure.ac

@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[2.8.0],[http://www.yassl.com])
+AC_INIT([cyassl],[2.8.1],[http://www.yassl.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])

ctaocrypt/ctaocrypt.vcproj

@@ -296,6 +296,10 @@
 				RelativePath=".\src\md5.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\port.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\rabbit.c"
 				>

cyassl-ntru.vcproj

@@ -230,6 +230,10 @@
 				RelativePath=".\ctaocrypt\src\misc.c"
 				>
 			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\port.c"
+				>
+			</File>
 			<File
 				RelativePath=".\ctaocrypt\src\pwdbased.c"
 				>

cyassl.vcproj

@@ -222,6 +222,10 @@
 				RelativePath=".\ctaocrypt\src\memory.c"
 				>
 			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\port.c"
+				>
+			</File>
 			<File
 				RelativePath=".\ctaocrypt\src\pwdbased.c"
 				>

cyassl/ctaocrypt/include.am

@@ -21,6 +21,7 @@ nobase_include_HEADERS+= \
                          cyassl/ctaocrypt/md4.h \
                          cyassl/ctaocrypt/md5.h \
                          cyassl/ctaocrypt/misc.h \
+                         cyassl/ctaocrypt/port.h \
                          cyassl/ctaocrypt/pwdbased.h \
                          cyassl/ctaocrypt/rabbit.h \
                          cyassl/ctaocrypt/random.h \

cyassl/ctaocrypt/port.h

@@ -33,6 +33,9 @@
     #ifdef CYASSL_GAME_BUILD
         #include "system/xtl.h"
     #else
+        #ifndef WIN32_LEAN_AND_MEAN
+            #define WIN32_LEAN_AND_MEAN
+        #endif
         #if defined(_WIN32_WCE) || defined(WIN32_LEAN_AND_MEAN)
             /* On WinCE winsock2.h must be included before windows.h */
             #include <winsock2.h>

cyassl/ctaocrypt/settings.h

@@ -150,6 +150,13 @@
 #endif
 
 
+/* Micrium will use Visual Studio for compilation but not the Win32 API */
+#if defined(_WIN32) && !defined(MICRIUM) && !defined(FREERTOS) \
+        && !defined(EBSNET)
+    #define USE_WINDOWS_API
+#endif
+
+
 #if defined(CYASSL_LEANPSK) && !defined(XMALLOC_USER)
     #include <stdlib.h>
     #define XMALLOC(s, h, type)  malloc((s))

cyassl/version.h

@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define LIBCYASSL_VERSION_STRING "2.8.0"
+#define LIBCYASSL_VERSION_STRING "2.8.1"
-#define LIBCYASSL_VERSION_HEX 0x02008000
+#define LIBCYASSL_VERSION_HEX 0x02008001
 
 #ifdef __cplusplus
 }