From 3b95996022190ef016068c21e3b039822f5ddb27 Mon Sep 17 00:00:00 2001
From: Todd A Ouska <todd@yassl.com>
Date: Mon, 16 May 2011 10:31:35 -0700
Subject: [PATCH] make sure windows build uses same settings as unix for
 default

---
 configure.in                          | 2 +-
 ctaocrypt/ctaocrypt.vcproj            | 2 +-
 ctaocrypt/include/config.h            | 6 +++---
 cyassl.vcproj                         | 4 ++--
 examples/client/client.vcproj         | 4 ++--
 examples/echoclient/echoclient.vcproj | 4 ++--
 examples/echoserver/echoserver.vcproj | 4 ++--
 examples/server/server.vcproj         | 4 ++--
 include/openssl/ssl.h                 | 2 +-
 testsuite/testsuite.vcproj            | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/configure.in b/configure.in
index 3f30a0f89..c26d13638 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(cyassl,2.0.0rc1,http://www.yassl.com)    # !!! also change in ssl.h !!!
+AC_INIT(cyassl,2.0.0rc2,http://www.yassl.com)    # !!! also change in ssl.h !!!
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(ctaocrypt/include/config.h)
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/ctaocrypt/ctaocrypt.vcproj b/ctaocrypt/ctaocrypt.vcproj
index 26ba69662..8c73f3e23 100755
--- a/ctaocrypt/ctaocrypt.vcproj
+++ b/ctaocrypt/ctaocrypt.vcproj
@@ -100,7 +100,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OPENSSL_EXTRA"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/ctaocrypt/include/config.h b/ctaocrypt/include/config.h
index c6f16d0fb..5fb67b43c 100644
--- a/ctaocrypt/include/config.h
+++ b/ctaocrypt/include/config.h
@@ -61,13 +61,13 @@
 #define PACKAGE_NAME "cyassl"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "cyassl 2.0.0rc1"
+#define PACKAGE_STRING "cyassl 2.0.0rc2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "cyassl"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.0rc1"
+#define PACKAGE_VERSION "2.0.0rc2"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -83,7 +83,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.0.0rc1"
+#define VERSION "2.0.0rc2"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/cyassl.vcproj b/cyassl.vcproj
index 4f69508f7..cae44c47f 100755
--- a/cyassl.vcproj
+++ b/cyassl.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
-				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512"
+				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -106,7 +106,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
-				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512"
+				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/examples/client/client.vcproj b/examples/client/client.vcproj
index f5cd663fc..4f2fa8bb7 100755
--- a/examples/client/client.vcproj
+++ b/examples/client/client.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/examples/echoclient/echoclient.vcproj b/examples/echoclient/echoclient.vcproj
index 099b47f8b..bd82c03ea 100755
--- a/examples/echoclient/echoclient.vcproj
+++ b/examples/echoclient/echoclient.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/examples/echoserver/echoserver.vcproj b/examples/echoserver/echoserver.vcproj
index 16805abd9..265c7014c 100755
--- a/examples/echoserver/echoserver.vcproj
+++ b/examples/echoserver/echoserver.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
-				PreprocessorDefinitions="USE_ANY_ADDR"
+				PreprocessorDefinitions="USE_ANY_ADDR;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
-				PreprocessorDefinitions="USE_ANY_ADDR"
+				PreprocessorDefinitions="USE_ANY_ADDR;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/examples/server/server.vcproj b/examples/server/server.vcproj
index 556bd5970..2239804b8 100755
--- a/examples/server/server.vcproj
+++ b/examples/server/server.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index a46dd6adc..542305ace 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -39,7 +39,7 @@
     #include "prefix_ssl.h"
 #endif
 
-#define CYASSL_VERSION "2.0.0rc1"
+#define CYASSL_VERSION "2.0.0rc2"
 
 #ifdef _WIN32
     /* wincrypt.h clashes */
diff --git a/testsuite/testsuite.vcproj b/testsuite/testsuite.vcproj
index 649ab3bab..824932e31 100755
--- a/testsuite/testsuite.vcproj
+++ b/testsuite/testsuite.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl"
-				PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512"
+				PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl"
-				PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512"
+				PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"