change Visual Studio files to use new CyaSSL headers and layout, have examples and testsuite try to change to CyaSSL Home dir if not

.gitignore

@@ -8,6 +8,9 @@
 *.user
 config*
 *Debug/
+*Release/
+*.ncb
+*.suo
 stamp-h
 libtool.m4
 aclocal.m4
@@ -45,6 +48,7 @@ sslSniffer/sslSnifferTest/tracefile.txt
 *.dummy
 compile
 NTRU_algorithm/
+NTRU/
 build-test/
 build/
 cyassl.xcodeproj/

README

@@ -14,6 +14,11 @@ or
 
 make test    (when using autoconf)
 
+On *nix or Windows the examples and testsuite will check to see if the current
+directory is the source directory and if so, attempt to change to the CyaSSL
+home directory.  This should work in most setup cases, if not, just follow the
+beginning of the note and specify the full path.
+
 
 Note 2)
 CyaSSL takes a different approach to certificate verification than OpenSSL does.

configure.ac

@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[2.0.0rc2],[http://www.yassl.com])
+AC_INIT([cyassl],[2.0.0rc3],[http://www.yassl.com])
 
 AC_CONFIG_AUX_DIR(config)
 

ctaocrypt/benchmark/benchmark.c

@@ -43,7 +43,6 @@
 
 #include <cyassl/ctaocrypt/dh.h>
 
-
 #ifdef _MSC_VER
     /* 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy */
     #pragma warning(disable: 4996)

ctaocrypt/src/aes.c

@@ -35,6 +35,12 @@
 #endif
 
 
+#ifdef _MSC_VER
+    /* 4127 warning constant while(1)  */
+    #pragma warning(disable: 4127)
+#endif
+
+
 static const word32 rcon[] = {
     0x01000000, 0x02000000, 0x04000000, 0x08000000,
     0x10000000, 0x20000000, 0x40000000, 0x80000000,

ctaocrypt/src/hc128.c

@@ -321,4 +321,13 @@ void Hc128_Process(HC128* ctx, byte* output, const byte* input, word32 msglen)
 }
 
 
-#endif /* NO_HC128 */
+#else  /* HAVE_HC128 */
+
+
+#ifdef _MSC_VER
+    /* 4206 warning for blank file */
+    #pragma warning(disable: 4206)
+#endif
+
+
+#endif /* HAVE_HC128 */

ctaocrypt/test/test.c

@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
+#ifdef HAVE_CONFIG_H
     #include <config.h>
+#endif
 
 #include <string.h>
 #include <stdio.h>

cyassl-ntru.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="ctaocrypt/include;include;NTRU/include;include/openssl"
+				AdditionalIncludeDirectories="./;NTRU/include"
 				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;HAVE_NTRU;NO_PSK;WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="ctaocrypt/include;include;NTRU/include;include/openssl"
+				AdditionalIncludeDirectories="./;NTRU/include"
 				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;HAVE_NTRU;NO_PSK;WIN32"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -170,18 +170,6 @@
 				RelativePath=".\ctaocrypt\src\coding.c"
 				>
 			</File>
-			<File
-				RelativePath=".\src\cyassl_int.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\cyassl_io.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\cyassl_memory.c"
-				>
-			</File>
 			<File
 				RelativePath=".\ctaocrypt\src\des3.c"
 				>
@@ -206,6 +194,14 @@
 				RelativePath=".\ctaocrypt\src\integer.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\internal.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\io.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\keys.c"
 				>
@@ -222,6 +218,10 @@
 				RelativePath=".\ctaocrypt\src\md5.c"
 				>
 			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\memory.c"
+				>
+			</File>
 			<File
 				RelativePath=".\ctaocrypt\src\misc.c"
 				>
@@ -272,106 +272,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\ctaocrypt\include\arc4.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\asn.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\coding.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_aes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_dh.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_dsa.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_hmac.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_md4.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_md5.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_ripemd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_rsa.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_sha.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\cyassl_error.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\cyassl_int.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\des3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\error.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\hc128.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\integer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\misc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\pwdbased.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\rabbit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\random.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\sha256.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\tfm.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\types.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

cyassl.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
+				AdditionalIncludeDirectories="./"
 				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="ctaocrypt/include;include;include/openssl"
+				AdditionalIncludeDirectories="./"
 				PreprocessorDefinitions="OPENSSL_EXTRA;CYASSL_RIPEMD;CYASSL_SHA512;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -166,18 +166,6 @@
 				RelativePath=".\ctaocrypt\src\coding.c"
 				>
 			</File>
-			<File
-				RelativePath=".\src\cyassl_int.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\cyassl_io.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\src\cyassl_memory.c"
-				>
-			</File>
 			<File
 				RelativePath=".\ctaocrypt\src\des3.c"
 				>
@@ -202,6 +190,14 @@
 				RelativePath=".\ctaocrypt\src\integer.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\internal.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\io.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\keys.c"
 				>
@@ -218,6 +214,10 @@
 				RelativePath=".\ctaocrypt\src\md5.c"
 				>
 			</File>
+			<File
+				RelativePath=".\ctaocrypt\src\memory.c"
+				>
+			</File>
 			<File
 				RelativePath=".\ctaocrypt\src\pwdbased.c"
 				>
@@ -264,50 +264,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_aes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_dh.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_dsa.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_hmac.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_md4.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_md5.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_ripemd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_rsa.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ctaocrypt\include\ctc_sha.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\cyassl_error.h"
-				>
-			</File>
-			<File
-				RelativePath=".\include\cyassl_int.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

cyassl/openssl/ssl.h

@@ -30,26 +30,6 @@
 
 #include <cyassl/ssl.h>
 
-#ifdef USE_CYASSL_VERSION
-    #include <cyassl/version.h>
-#endif
-
-
-#ifdef YASSL_PREFIX
-    #include "prefix_ssl.h"
-#endif
-
-#ifdef LIBCYASSL_VERSION_STRING
-    #define CYASSL_VERSION LIBCYASSL_VERSION_STRING
-#endif
-
-#ifdef _WIN32
-    /* wincrypt.h clashes */
-    #undef X509_NAME
-    #undef OCSP_REQUEST 
-    #undef OCSP_RESPONSE
-#endif
-
 #ifdef __cplusplus
     extern "C" {
 #endif

cyassl/ssl.h

@@ -31,7 +31,27 @@
 
 
 #ifndef NO_FILESYSTEM
-    #include <stdio.h>   /* ERR_pr fp */
+    #include <stdio.h>   /* ERR_printf */
+#endif
+
+#ifdef USE_CYASSL_VERSION
+    #include <cyassl/version.h>
+#endif
+
+
+#ifdef YASSL_PREFIX
+    #include "prefix_ssl.h"
+#endif
+
+#ifdef LIBCYASSL_VERSION_STRING
+    #define CYASSL_VERSION LIBCYASSL_VERSION_STRING
+#endif
+
+#ifdef _WIN32
+    /* wincrypt.h clashes */
+    #undef X509_NAME
+    #undef OCSP_REQUEST 
+    #undef OCSP_RESPONSE
 #endif
 
 
@@ -175,10 +195,8 @@ typedef int (*pem_password_cb)(char*, int, int, void*);
 CYASSL_API void CyaSSL_CTX_set_verify(CYASSL_CTX*, int, 
                                       VerifyCallback verify_callback);
 
-
 CYASSL_API int  CyaSSL_pending(CYASSL*);
 
-
 CYASSL_API void CyaSSL_load_error_strings(void);
 CYASSL_API int  CyaSSL_library_init(void);
 CYASSL_API long CyaSSL_CTX_set_session_cache_mode(CYASSL_CTX*, long);

cyassl/test.h

@@ -594,5 +594,77 @@ static INLINE void SetDH(SSL* ssl)
     CyaSSL_SetTmpDH(ssl, p, sizeof(p), g, sizeof(g));
 }
 
+#ifdef USE_WINDOWS_API 
+
+/* do back x number of directories */
+static INLINE void ChangeDirBack(int x)
+{
+    char path[MAX_PATH];
+
+    if (x == 1)
+        strncpy(path, "..\\", MAX_PATH);
+    else if (x == 2)
+        strncpy(path, "..\\..\\", MAX_PATH);
+    else if (x == 3)
+        strncpy(path, "..\\..\\..\\", MAX_PATH);
+    else if (x == 4)
+        strncpy(path, "..\\..\\..\\..\\", MAX_PATH);
+    else
+        strncpy(path, ".\\", MAX_PATH);
+    
+    SetCurrentDirectoryA(path);
+}
+
+/* does current dir contain str */
+static INLINE int CurrentDir(const char* str)
+{
+    char path[MAX_PATH];
+
+    GetCurrentDirectoryA(sizeof(path), path);
+    if (strstr(path, str))
+        return 1;
+
+    return 0;
+}
+
+#else
+
+#ifndef MAX_PATH
+    #define MAX_PATH 256
+#endif
+
+/* do back x number of directories */
+static INLINE void ChangeDirBack(int x)
+{
+    char path[MAX_PATH];
+
+    if (x == 1)
+        strncpy(path, "../", MAX_PATH);
+    else if (x == 2)
+        strncpy(path, "../../", MAX_PATH);
+    else if (x == 3)
+        strncpy(path, "../../../", MAX_PATH);
+    else if (x == 4)
+        strncpy(path, "../../../../", MAX_PATH);
+    else
+        strncpy(path, "./", MAX_PATH);
+    
+    chdir(path);
+}
+
+/* does current dir contain str */
+static INLINE int CurrentDir(const char* str)
+{
+    char path[MAX_PATH];
+
+    getcwd(path, sizeof(path));
+    if (strstr(path, str))
+        return 1;
+
+    return 0;
+}
+
+#endif /* USE_WINDOWS_API */
+
 #endif /* CyaSSL_TEST_H */
 

examples/client/client-ntru.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

examples/client/client.c

@@ -316,6 +316,9 @@ void client_test(void* args)
 #ifdef DEBUG_CYASSL
         CyaSSL_Debugging_ON();
 #endif
+        if (CurrentDir("client"))
+            ChangeDirBack(2);
+   
         client_test(&args);
         CyaSSL_Cleanup();
 

examples/client/client.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

examples/echoclient/echoclient-ntru.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

examples/echoclient/echoclient.c

@@ -165,6 +165,8 @@ void echoclient_test(void* args)
         args.argv = argv;
 
         CyaSSL_Init();
+        if (CurrentDir("echoclient"))
+            ChangeDirBack(2);
         echoclient_test(&args);
         CyaSSL_Cleanup();
 

examples/echoclient/echoclient.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

examples/echoserver/echoserver-ntru.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="USE_ANY_ADDR"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="USE_ANY_ADDR"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

examples/echoserver/echoserver.c

@@ -247,6 +247,8 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
 #ifdef DEBUG_CYASSL
         CyaSSL_Debugging_ON();
 #endif
+        if (CurrentDir("echoserver"))
+            ChangeDirBack(2);
         echoserver_test(&args);
         CyaSSL_Cleanup();
 

examples/echoserver/echoserver.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="USE_ANY_ADDR;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="USE_ANY_ADDR;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

examples/server/server-ntru.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

examples/server/server.c

@@ -205,6 +205,9 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
 #ifdef DEBUG_CYASSL
         CyaSSL_Debugging_ON();
 #endif
+        if (CurrentDir("server"))
+            ChangeDirBack(2);
+   
         server_test(&args);
         CyaSSL_Cleanup();
 

examples/server/server.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../ctaocrypt/include;../../include;../../include/openssl"
+				AdditionalIncludeDirectories="../../"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

sslSniffer/sslSniffer.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl"
+				AdditionalIncludeDirectories="../"
 				PreprocessorDefinitions="CYASSL_SNIFFER;SSL_SNIFFER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl"
+				AdditionalIncludeDirectories="../"
 				PreprocessorDefinitions="CYASSL_SNIFFER;SSL_SNIFFER_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -196,7 +196,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\include\sniffer_error.rc"
+				RelativePath="..\cyassl\sniffer_error.rc"
 				>
 			</File>
 		</Filter>

testsuite/testsuite-ntru.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../ctaocrypt/include;../include;../NTRU/include;../include/openssl"
+				AdditionalIncludeDirectories="../;../NTRU/include"
 				PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;HAVE_NTRU;NO_PSK;WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../ctaocrypt/include;../include;../NTRU/include;../include/openssl"
+				AdditionalIncludeDirectories="../;../NTRU/include"
 				PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;HAVE_NTRU;NO_PSK;WIN32"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

testsuite/testsuite.c

@@ -66,6 +66,9 @@ int main(int argc, char** argv)
     CyaSSL_Debugging_ON();
 #endif
 
+    if (CurrentDir("testsuite"))
+        ChangeDirBack(1);
+   
     /* CTaoCrypt test */
     ctaocrypt_test(&args);
     if (args.return_code != 0) return args.return_code;

testsuite/testsuite.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl"
+				AdditionalIncludeDirectories="../"
 				PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;NO_PSK"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../ctaocrypt/include;../include;../include/openssl"
+				AdditionalIncludeDirectories="../"
 				PreprocessorDefinitions="NO_MAIN_DRIVER;CYASSL_RIPEMD;CYASSL_SHA512;OPENSSL_EXTRA;NO_PSK"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"