From 295964f0ec7d7507253f42810418b184d0508e29 Mon Sep 17 00:00:00 2001 From: Peter Olsson Date: Fri, 11 Apr 2014 16:49:30 +0200 Subject: [PATCH] FS-6457 --resolve Upgrade to OpenSSL 1.0.1g in Windows build (Visual Studio 2010 and 2012) --- libs/srtp/libsrtp.2010.vcxproj | 8 +- libs/srtp/libsrtp.2012.vcxproj | 8 +- libs/win32/Download OPENSSL.2010.vcxproj | 4 +- libs/win32/Download OPENSSL.2012.vcxproj | 4 +- libs/win32/curl/curllib.2010.vcxproj | 8 +- libs/win32/curl/curllib.2012.vcxproj | 8 +- libs/win32/iksemel/iksemel.2010.vcxproj | 8 +- libs/win32/iksemel/iksemel.2012.vcxproj | 8 +- libs/win32/openssl/include/bn.h | 11 + libs/win32/openssl/include/e_os.h | 7 + libs/win32/openssl/include/kssl.h | 9 + libs/win32/openssl/include/opensslv.h | 6 +- libs/win32/openssl/include/ssl.h | 2 +- libs/win32/openssl/include/symhacks.h | 6 + libs/win32/openssl/include/tls1.h | 6 + libs/win32/openssl/libeay32.2010.vcxproj | 1384 ++++++++--------- .../openssl/libeay32.2010.vcxproj.filters | 1328 ++++++++-------- libs/win32/openssl/libeay32.2012.vcxproj | 1384 ++++++++--------- .../openssl/libeay32.2012.vcxproj.filters | 1328 ++++++++-------- libs/win32/openssl/openssl.2010.vcxproj | 114 +- .../openssl/openssl.2010.vcxproj.filters | 106 +- libs/win32/openssl/openssl.2012.vcxproj | 114 +- .../openssl/openssl.2012.vcxproj.filters | 106 +- libs/win32/openssl/ssleay32.2010.vcxproj | 116 +- .../openssl/ssleay32.2010.vcxproj.filters | 100 +- libs/win32/openssl/ssleay32.2012.vcxproj | 116 +- .../openssl/ssleay32.2012.vcxproj.filters | 100 +- .../sofia/libsofia_sip_ua_static.2010.vcxproj | 8 +- .../sofia/libsofia_sip_ua_static.2012.vcxproj | 8 +- .../mod_xml_rpc/mod_xml_rpc.2010.vcxproj | 8 +- .../mod_xml_rpc/mod_xml_rpc.2012.vcxproj | 8 +- w32/Library/FreeSwitchCore.2010.vcxproj | 8 +- w32/Library/FreeSwitchCore.2012.vcxproj | 8 +- 33 files changed, 3243 insertions(+), 3204 deletions(-) diff --git a/libs/srtp/libsrtp.2010.vcxproj b/libs/srtp/libsrtp.2010.vcxproj index 6100f53d20..2c8aa25059 100644 --- a/libs/srtp/libsrtp.2010.vcxproj +++ b/libs/srtp/libsrtp.2010.vcxproj @@ -127,7 +127,7 @@ Disabled - crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -149,7 +149,7 @@ Disabled - crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -166,7 +166,7 @@ copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" > NUL - crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL Default @@ -184,7 +184,7 @@ X64 - crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL Default diff --git a/libs/srtp/libsrtp.2012.vcxproj b/libs/srtp/libsrtp.2012.vcxproj index 4efa4e64d1..eebc138ade 100644 --- a/libs/srtp/libsrtp.2012.vcxproj +++ b/libs/srtp/libsrtp.2012.vcxproj @@ -135,7 +135,7 @@ Disabled - crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -157,7 +157,7 @@ Disabled - crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -174,7 +174,7 @@ copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" > NUL - crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL Default @@ -192,7 +192,7 @@ X64 - crypto/include;include;..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + crypto/include;include;..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL Default diff --git a/libs/win32/Download OPENSSL.2010.vcxproj b/libs/win32/Download OPENSSL.2010.vcxproj index 74dbda16e6..3d0a0a1e76 100644 --- a/libs/win32/Download OPENSSL.2010.vcxproj +++ b/libs/win32/Download OPENSSL.2010.vcxproj @@ -51,11 +51,11 @@ Document Downloading OPENSSL - if not exist "$(ProjectDir)..\openssl-1.0.1f" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1f.tar.gz "$(ProjectDir).." + if not exist "$(ProjectDir)..\openssl-1.0.1g" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1g.tar.gz "$(ProjectDir).." $(ProjectDir)..\OPENSSL;%(Outputs) Downloading OPENSSL - if not exist "$(ProjectDir)..\openssl-1.0.1f" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1f.tar.gz "$(ProjectDir).." + if not exist "$(ProjectDir)..\openssl-1.0.1g" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1g.tar.gz "$(ProjectDir).." $(ProjectDir)..\OPENSSL;%(Outputs) diff --git a/libs/win32/Download OPENSSL.2012.vcxproj b/libs/win32/Download OPENSSL.2012.vcxproj index 3a881d7bd1..5ecf8e386f 100644 --- a/libs/win32/Download OPENSSL.2012.vcxproj +++ b/libs/win32/Download OPENSSL.2012.vcxproj @@ -53,11 +53,11 @@ Document Downloading OPENSSL - if not exist "$(ProjectDir)..\openssl-1.0.1f" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1f.tar.gz "$(ProjectDir).." + if not exist "$(ProjectDir)..\openssl-1.0.1g" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1g.tar.gz "$(ProjectDir).." $(ProjectDir)..\OPENSSL;%(Outputs) Downloading OPENSSL - if not exist "$(ProjectDir)..\openssl-1.0.1f" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1f.tar.gz "$(ProjectDir).." + if not exist "$(ProjectDir)..\openssl-1.0.1g" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1g.tar.gz "$(ProjectDir).." $(ProjectDir)..\OPENSSL;%(Outputs) diff --git a/libs/win32/curl/curllib.2010.vcxproj b/libs/win32/curl/curllib.2010.vcxproj index 82c9fdb977..983f3074f6 100644 --- a/libs/win32/curl/curllib.2010.vcxproj +++ b/libs/win32/curl/curllib.2010.vcxproj @@ -80,7 +80,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -111,7 +111,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -141,7 +141,7 @@ Disabled - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true EnableFastChecks @@ -171,7 +171,7 @@ Disabled - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/libs/win32/curl/curllib.2012.vcxproj b/libs/win32/curl/curllib.2012.vcxproj index 7ddfadbb46..fe1f314baf 100644 --- a/libs/win32/curl/curllib.2012.vcxproj +++ b/libs/win32/curl/curllib.2012.vcxproj @@ -84,7 +84,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -145,7 +145,7 @@ Disabled - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true EnableFastChecks @@ -175,7 +175,7 @@ Disabled - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/libs/win32/iksemel/iksemel.2010.vcxproj b/libs/win32/iksemel/iksemel.2010.vcxproj index 2fb1620ec2..0f1a9e2cbc 100644 --- a/libs/win32/iksemel/iksemel.2010.vcxproj +++ b/libs/win32/iksemel/iksemel.2010.vcxproj @@ -69,7 +69,7 @@ Disabled - ..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -79,7 +79,7 @@ - ..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings @@ -91,7 +91,7 @@ Disabled - ..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -104,7 +104,7 @@ X64 - ..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings diff --git a/libs/win32/iksemel/iksemel.2012.vcxproj b/libs/win32/iksemel/iksemel.2012.vcxproj index a95f224d15..600b647ded 100644 --- a/libs/win32/iksemel/iksemel.2012.vcxproj +++ b/libs/win32/iksemel/iksemel.2012.vcxproj @@ -73,7 +73,7 @@ Disabled - ..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,7 +83,7 @@ - ..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings @@ -95,7 +95,7 @@ Disabled - ..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -108,7 +108,7 @@ X64 - ..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings diff --git a/libs/win32/openssl/include/bn.h b/libs/win32/openssl/include/bn.h index f34248ec4f..21a1a3fe35 100644 --- a/libs/win32/openssl/include/bn.h +++ b/libs/win32/openssl/include/bn.h @@ -538,6 +538,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *ret, BIGNUM *BN_mod_sqrt(BIGNUM *ret, const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx); +void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords); + /* Deprecated versions */ #ifndef OPENSSL_NO_DEPRECATED BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe, @@ -774,11 +776,20 @@ int RAND_pseudo_bytes(unsigned char *buf,int num); #define bn_fix_top(a) bn_check_top(a) +#define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2) +#define bn_wcheck_size(bn, words) \ + do { \ + const BIGNUM *_bnum2 = (bn); \ + assert(words <= (_bnum2)->dmax && words >= (_bnum2)->top); \ + } while(0) + #else /* !BN_DEBUG */ #define bn_pollute(a) #define bn_check_top(a) #define bn_fix_top(a) bn_correct_top(a) +#define bn_check_size(bn, bits) +#define bn_wcheck_size(bn, words) #endif diff --git a/libs/win32/openssl/include/e_os.h b/libs/win32/openssl/include/e_os.h index 79c1392573..6a0aad1de7 100644 --- a/libs/win32/openssl/include/e_os.h +++ b/libs/win32/openssl/include/e_os.h @@ -368,6 +368,13 @@ static unsigned int _strlen31(const char *str) # define DEFAULT_HOME "C:" # endif +/* Avoid Windows 8 SDK GetVersion deprecated problems */ +#if defined(_MSC_VER) && _MSC_VER>=1800 +# define check_winnt() (1) +#else +# define check_winnt() (GetVersion() < 0x80000000) +#endif + #else /* The non-microsoft world */ # ifdef OPENSSL_SYS_VMS diff --git a/libs/win32/openssl/include/kssl.h b/libs/win32/openssl/include/kssl.h index 8242fd5eeb..e4df843073 100644 --- a/libs/win32/openssl/include/kssl.h +++ b/libs/win32/openssl/include/kssl.h @@ -70,6 +70,15 @@ #include #include #include +#ifdef OPENSSL_SYS_WIN32 +/* These can sometimes get redefined indirectly by krb5 header files + * after they get undefed in ossl_typ.h + */ +#undef X509_NAME +#undef X509_EXTENSIONS +#undef OCSP_REQUEST +#undef OCSP_RESPONSE +#endif #ifdef __cplusplus extern "C" { diff --git a/libs/win32/openssl/include/opensslv.h b/libs/win32/openssl/include/opensslv.h index b27a5bb8c0..ebe7180723 100644 --- a/libs/win32/openssl/include/opensslv.h +++ b/libs/win32/openssl/include/opensslv.h @@ -25,11 +25,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x1000106fL +#define OPENSSL_VERSION_NUMBER 0x1000107fL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f-fips 6 Jan 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g-fips 7 Apr 2014" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f 6 Jan 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1g 7 Apr 2014" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/libs/win32/openssl/include/ssl.h b/libs/win32/openssl/include/ssl.h index dece04de01..7219a0e64b 100644 --- a/libs/win32/openssl/include/ssl.h +++ b/libs/win32/openssl/include/ssl.h @@ -915,7 +915,7 @@ struct ssl_ctx_st */ unsigned int max_send_fragment; -#ifndef OPENSSL_ENGINE +#ifndef OPENSSL_NO_ENGINE /* Engine to pass requests for client certs to */ ENGINE *client_cert_engine; diff --git a/libs/win32/openssl/include/symhacks.h b/libs/win32/openssl/include/symhacks.h index 07a412f845..bd2f000d59 100644 --- a/libs/win32/openssl/include/symhacks.h +++ b/libs/win32/openssl/include/symhacks.h @@ -204,6 +204,12 @@ #define SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_protos_adv_cb #undef SSL_CTX_set_next_proto_select_cb #define SSL_CTX_set_next_proto_select_cb SSL_CTX_set_next_proto_sel_cb +#undef ssl3_cbc_record_digest_supported +#define ssl3_cbc_record_digest_supported ssl3_cbc_record_digest_support +#undef ssl_check_clienthello_tlsext_late +#define ssl_check_clienthello_tlsext_late ssl_check_clihello_tlsext_late +#undef ssl_check_clienthello_tlsext_early +#define ssl_check_clienthello_tlsext_early ssl_check_clihello_tlsext_early /* Hack some long ENGINE names */ #undef ENGINE_get_default_BN_mod_exp_crt diff --git a/libs/win32/openssl/include/tls1.h b/libs/win32/openssl/include/tls1.h index c39c267f0b..c992091e30 100644 --- a/libs/win32/openssl/include/tls1.h +++ b/libs/win32/openssl/include/tls1.h @@ -230,6 +230,12 @@ extern "C" { /* ExtensionType value from RFC5620 */ #define TLSEXT_TYPE_heartbeat 15 +/* ExtensionType value for TLS padding extension. + * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml + * http://tools.ietf.org/html/draft-agl-tls-padding-03 + */ +#define TLSEXT_TYPE_padding 21 + /* ExtensionType value from RFC4507 */ #define TLSEXT_TYPE_session_ticket 35 diff --git a/libs/win32/openssl/libeay32.2010.vcxproj b/libs/win32/openssl/libeay32.2010.vcxproj index 6cb7d673de..9a4987f989 100644 --- a/libs/win32/openssl/libeay32.2010.vcxproj +++ b/libs/win32/openssl/libeay32.2010.vcxproj @@ -81,18 +81,18 @@ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1f\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\" /C /Y /S + copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h" +copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c" +copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h" +copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def" +if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f\crypto\aes;..\..\openssl-1.0.1f\crypto\asn1;..\..\openssl-1.0.1f\crypto\bf;..\..\openssl-1.0.1f\crypto\bio;..\..\openssl-1.0.1f\crypto\bn;..\..\openssl-1.0.1f\crypto\buffer;..\..\openssl-1.0.1f\crypto\camellia;..\..\openssl-1.0.1f\crypto\cast;..\..\openssl-1.0.1f\crypto\cms;..\..\openssl-1.0.1f\crypto\comp;..\..\openssl-1.0.1f\crypto\conf;..\..\openssl-1.0.1f\crypto\des;..\..\openssl-1.0.1f\crypto\dh;..\..\openssl-1.0.1f\crypto\dsa;..\..\openssl-1.0.1f\crypto\dso;..\..\openssl-1.0.1f\crypto\ec;..\..\openssl-1.0.1f\crypto\ecdh;..\..\openssl-1.0.1f\crypto\ecdsa;..\..\openssl-1.0.1f\crypto\engine;..\..\openssl-1.0.1f\crypto\err;..\..\openssl-1.0.1f\crypto\evp;..\..\openssl-1.0.1f\crypto\modes;..\..\openssl-1.0.1f\ms;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -107,7 +107,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1g\libeay32.def true true MachineX86 @@ -115,11 +115,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1f\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\" /C /Y /S + copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h" +copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c" +copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h" +copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def" +if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S @@ -129,7 +129,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f\crypto\aes;..\..\openssl-1.0.1f\crypto\asn1;..\..\openssl-1.0.1f\crypto\bf;..\..\openssl-1.0.1f\crypto\bio;..\..\openssl-1.0.1f\crypto\bn;..\..\openssl-1.0.1f\crypto\buffer;..\..\openssl-1.0.1f\crypto\camellia;..\..\openssl-1.0.1f\crypto\cast;..\..\openssl-1.0.1f\crypto\cms;..\..\openssl-1.0.1f\crypto\comp;..\..\openssl-1.0.1f\crypto\conf;..\..\openssl-1.0.1f\crypto\des;..\..\openssl-1.0.1f\crypto\dh;..\..\openssl-1.0.1f\crypto\dsa;..\..\openssl-1.0.1f\crypto\dso;..\..\openssl-1.0.1f\crypto\ec;..\..\openssl-1.0.1f\crypto\ecdh;..\..\openssl-1.0.1f\crypto\ecdsa;..\..\openssl-1.0.1f\crypto\engine;..\..\openssl-1.0.1f\crypto\err;..\..\openssl-1.0.1f\crypto\evp;..\..\openssl-1.0.1f\crypto\modes;..\..\openssl-1.0.1f\ms;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -143,7 +143,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1g\libeay32.def true true MachineX64 @@ -151,18 +151,18 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1f\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\" /C /Y /S + copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h" +copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c" +copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h" +copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def" +if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S /Gs0 %(AdditionalOptions) Full AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f\crypto\aes;..\..\openssl-1.0.1f\crypto\asn1;..\..\openssl-1.0.1f\crypto\bf;..\..\openssl-1.0.1f\crypto\bio;..\..\openssl-1.0.1f\crypto\bn;..\..\openssl-1.0.1f\crypto\buffer;..\..\openssl-1.0.1f\crypto\camellia;..\..\openssl-1.0.1f\crypto\cast;..\..\openssl-1.0.1f\crypto\cms;..\..\openssl-1.0.1f\crypto\comp;..\..\openssl-1.0.1f\crypto\conf;..\..\openssl-1.0.1f\crypto\des;..\..\openssl-1.0.1f\crypto\dh;..\..\openssl-1.0.1f\crypto\dsa;..\..\openssl-1.0.1f\crypto\dso;..\..\openssl-1.0.1f\crypto\ec;..\..\openssl-1.0.1f\crypto\ecdh;..\..\openssl-1.0.1f\crypto\ecdsa;..\..\openssl-1.0.1f\crypto\engine;..\..\openssl-1.0.1f\crypto\err;..\..\openssl-1.0.1f\crypto\evp;..\..\openssl-1.0.1f\crypto\modes;..\..\openssl-1.0.1f\ms;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -177,7 +177,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1g\libeay32.def true true MachineX86 @@ -185,11 +185,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1f\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\" /C /Y /S + copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h" +copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c" +copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h" +copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def" +if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S @@ -199,7 +199,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) Full AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f\crypto\aes;..\..\openssl-1.0.1f\crypto\asn1;..\..\openssl-1.0.1f\crypto\bf;..\..\openssl-1.0.1f\crypto\bio;..\..\openssl-1.0.1f\crypto\bn;..\..\openssl-1.0.1f\crypto\buffer;..\..\openssl-1.0.1f\crypto\camellia;..\..\openssl-1.0.1f\crypto\cast;..\..\openssl-1.0.1f\crypto\cms;..\..\openssl-1.0.1f\crypto\comp;..\..\openssl-1.0.1f\crypto\conf;..\..\openssl-1.0.1f\crypto\des;..\..\openssl-1.0.1f\crypto\dh;..\..\openssl-1.0.1f\crypto\dsa;..\..\openssl-1.0.1f\crypto\dso;..\..\openssl-1.0.1f\crypto\ec;..\..\openssl-1.0.1f\crypto\ecdh;..\..\openssl-1.0.1f\crypto\ecdsa;..\..\openssl-1.0.1f\crypto\engine;..\..\openssl-1.0.1f\crypto\err;..\..\openssl-1.0.1f\crypto\evp;..\..\openssl-1.0.1f\crypto\modes;..\..\openssl-1.0.1f\ms;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -213,679 +213,679 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1g\libeay32.def true true MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/win32/openssl/libeay32.2010.vcxproj.filters b/libs/win32/openssl/libeay32.2010.vcxproj.filters index b72363f920..80893a4fe8 100644 --- a/libs/win32/openssl/libeay32.2010.vcxproj.filters +++ b/libs/win32/openssl/libeay32.2010.vcxproj.filters @@ -185,1998 +185,1998 @@ - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto\rc2 - + Source Files\crypto\rc2 - + Source Files\crypto\rc2 - + Source Files\crypto\rc2 - + Source Files\crypto\rc2 - + Source Files\crypto\rc4 - + Source Files\crypto\rc4 - + Source Files\crypto\idea - + Source Files\crypto\idea - + Source Files\crypto\idea - + Source Files\crypto\idea - + Source Files\crypto\idea - + Source Files\crypto\bf - + Source Files\crypto\bf - + Source Files\crypto\bf - + Source Files\crypto\bf - + Source Files\crypto\bf - + Source Files\crypto\cast - + Source Files\crypto\cast - + Source Files\crypto\cast - + Source Files\crypto\cast - + Source Files\crypto\cast - + Source Files\crypto\ripemd - + Source Files\crypto\ripemd - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\seed - + Source Files\crypto\seed - + Source Files\crypto\seed - + Source Files\crypto\seed - + Source Files\crypto\seed - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\err - + Source Files\crypto\err - + Source Files\crypto\err - + Source Files\crypto\ui - + Source Files\crypto\ui - + Source Files\crypto\ui - + Source Files\crypto\ui - + Source Files\crypto\ui - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\objects - + Source Files\crypto\objects - + Source Files\crypto\objects - + Source Files\crypto\objects - + Source Files\crypto\objects - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\buffer - + Source Files\crypto\buffer - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\stack - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ecdh - + Source Files\crypto\ecdh - + Source Files\crypto\ecdh - + Source Files\crypto\ecdh - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\md5 - + Source Files\crypto\md5 - + Source Files\crypto\md4 - + Source Files\crypto\md4 - + Source Files\crypto\lhash - + Source Files\crypto\lhash - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\hmac - + Source Files\crypto\hmac - + Source Files\crypto\hmac - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\comp - + Source Files\crypto\comp - + Source Files\crypto\comp - + Source Files\crypto\comp - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\whrlpool - + Source Files\crypto\whrlpool - + Source Files\crypto\mdc2 - + Source Files\crypto\mdc2 - + Source Files\crypto\krb5 - + Source Files\crypto\txt_db - + Source Files\crypto\pqueue - + Source Files\ms - + Source Files\crypto\buffer - + Source Files\crypto\camellia - + Source Files\crypto\ec - + Source Files\crypto\rc4 - + Source Files\crypto\rsa - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\cms - + Source Files\crypto\cmac - + Source Files\crypto\cmac - + Source Files\crypto\cmac - + Source Files\crypto - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\srp - + Source Files\crypto\srp - + Source Files\crypto\evp - + Source Files\crypto\bn - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto\evp - + Header Files - + Header Files\crypto - + Header Files\crypto - + Header Files\crypto - + Header Files\crypto - + Header Files\crypto\evp - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\bf - + Header Files\bf - + Header Files\bf - + Header Files\ms diff --git a/libs/win32/openssl/libeay32.2012.vcxproj b/libs/win32/openssl/libeay32.2012.vcxproj index b74e567116..e4ac19109b 100644 --- a/libs/win32/openssl/libeay32.2012.vcxproj +++ b/libs/win32/openssl/libeay32.2012.vcxproj @@ -85,18 +85,18 @@ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1f\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\" /C /Y /S + copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h" +copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c" +copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h" +copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def" +if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f\crypto\aes;..\..\openssl-1.0.1f\crypto\asn1;..\..\openssl-1.0.1f\crypto\bf;..\..\openssl-1.0.1f\crypto\bio;..\..\openssl-1.0.1f\crypto\bn;..\..\openssl-1.0.1f\crypto\buffer;..\..\openssl-1.0.1f\crypto\camellia;..\..\openssl-1.0.1f\crypto\cast;..\..\openssl-1.0.1f\crypto\cms;..\..\openssl-1.0.1f\crypto\comp;..\..\openssl-1.0.1f\crypto\conf;..\..\openssl-1.0.1f\crypto\des;..\..\openssl-1.0.1f\crypto\dh;..\..\openssl-1.0.1f\crypto\dsa;..\..\openssl-1.0.1f\crypto\dso;..\..\openssl-1.0.1f\crypto\ec;..\..\openssl-1.0.1f\crypto\ecdh;..\..\openssl-1.0.1f\crypto\ecdsa;..\..\openssl-1.0.1f\crypto\engine;..\..\openssl-1.0.1f\crypto\err;..\..\openssl-1.0.1f\crypto\evp;..\..\openssl-1.0.1f\crypto\modes;..\..\openssl-1.0.1f\ms;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -111,7 +111,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1g\libeay32.def true true MachineX86 @@ -119,11 +119,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1f\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\" /C /Y /S + copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h" +copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c" +copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h" +copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def" +if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S @@ -133,7 +133,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f\crypto\aes;..\..\openssl-1.0.1f\crypto\asn1;..\..\openssl-1.0.1f\crypto\bf;..\..\openssl-1.0.1f\crypto\bio;..\..\openssl-1.0.1f\crypto\bn;..\..\openssl-1.0.1f\crypto\buffer;..\..\openssl-1.0.1f\crypto\camellia;..\..\openssl-1.0.1f\crypto\cast;..\..\openssl-1.0.1f\crypto\cms;..\..\openssl-1.0.1f\crypto\comp;..\..\openssl-1.0.1f\crypto\conf;..\..\openssl-1.0.1f\crypto\des;..\..\openssl-1.0.1f\crypto\dh;..\..\openssl-1.0.1f\crypto\dsa;..\..\openssl-1.0.1f\crypto\dso;..\..\openssl-1.0.1f\crypto\ec;..\..\openssl-1.0.1f\crypto\ecdh;..\..\openssl-1.0.1f\crypto\ecdsa;..\..\openssl-1.0.1f\crypto\engine;..\..\openssl-1.0.1f\crypto\err;..\..\openssl-1.0.1f\crypto\evp;..\..\openssl-1.0.1f\crypto\modes;..\..\openssl-1.0.1f\ms;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WINDOWS;WIN32;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -147,7 +147,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1g\libeay32.def true true MachineX64 @@ -155,18 +155,18 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1f\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\" /C /Y /S + copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h" +copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c" +copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h" +copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def" +if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S /Gs0 %(AdditionalOptions) Full AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f\crypto\aes;..\..\openssl-1.0.1f\crypto\asn1;..\..\openssl-1.0.1f\crypto\bf;..\..\openssl-1.0.1f\crypto\bio;..\..\openssl-1.0.1f\crypto\bn;..\..\openssl-1.0.1f\crypto\buffer;..\..\openssl-1.0.1f\crypto\camellia;..\..\openssl-1.0.1f\crypto\cast;..\..\openssl-1.0.1f\crypto\cms;..\..\openssl-1.0.1f\crypto\comp;..\..\openssl-1.0.1f\crypto\conf;..\..\openssl-1.0.1f\crypto\des;..\..\openssl-1.0.1f\crypto\dh;..\..\openssl-1.0.1f\crypto\dsa;..\..\openssl-1.0.1f\crypto\dso;..\..\openssl-1.0.1f\crypto\ec;..\..\openssl-1.0.1f\crypto\ecdh;..\..\openssl-1.0.1f\crypto\ecdsa;..\..\openssl-1.0.1f\crypto\engine;..\..\openssl-1.0.1f\crypto\err;..\..\openssl-1.0.1f\crypto\evp;..\..\openssl-1.0.1f\crypto\modes;..\..\openssl-1.0.1f\ms;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -181,7 +181,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1g\libeay32.def true true MachineX86 @@ -189,11 +189,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1f\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\" /C /Y /S + copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\opensslconf.h" +copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\applink.c" +copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1g\crypto\buildinf.h" +copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\libeay32.def" +if not exist "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1g\include\openssl\" /C /Y /S @@ -203,7 +203,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) Full AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f\crypto\aes;..\..\openssl-1.0.1f\crypto\asn1;..\..\openssl-1.0.1f\crypto\bf;..\..\openssl-1.0.1f\crypto\bio;..\..\openssl-1.0.1f\crypto\bn;..\..\openssl-1.0.1f\crypto\buffer;..\..\openssl-1.0.1f\crypto\camellia;..\..\openssl-1.0.1f\crypto\cast;..\..\openssl-1.0.1f\crypto\cms;..\..\openssl-1.0.1f\crypto\comp;..\..\openssl-1.0.1f\crypto\conf;..\..\openssl-1.0.1f\crypto\des;..\..\openssl-1.0.1f\crypto\dh;..\..\openssl-1.0.1f\crypto\dsa;..\..\openssl-1.0.1f\crypto\dso;..\..\openssl-1.0.1f\crypto\ec;..\..\openssl-1.0.1f\crypto\ecdh;..\..\openssl-1.0.1f\crypto\ecdsa;..\..\openssl-1.0.1f\crypto\engine;..\..\openssl-1.0.1f\crypto\err;..\..\openssl-1.0.1f\crypto\evp;..\..\openssl-1.0.1f\crypto\modes;..\..\openssl-1.0.1f\ms;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g\crypto\aes;..\..\openssl-1.0.1g\crypto\asn1;..\..\openssl-1.0.1g\crypto\bf;..\..\openssl-1.0.1g\crypto\bio;..\..\openssl-1.0.1g\crypto\bn;..\..\openssl-1.0.1g\crypto\buffer;..\..\openssl-1.0.1g\crypto\camellia;..\..\openssl-1.0.1g\crypto\cast;..\..\openssl-1.0.1g\crypto\cms;..\..\openssl-1.0.1g\crypto\comp;..\..\openssl-1.0.1g\crypto\conf;..\..\openssl-1.0.1g\crypto\des;..\..\openssl-1.0.1g\crypto\dh;..\..\openssl-1.0.1g\crypto\dsa;..\..\openssl-1.0.1g\crypto\dso;..\..\openssl-1.0.1g\crypto\ec;..\..\openssl-1.0.1g\crypto\ecdh;..\..\openssl-1.0.1g\crypto\ecdsa;..\..\openssl-1.0.1g\crypto\engine;..\..\openssl-1.0.1g\crypto\err;..\..\openssl-1.0.1g\crypto\evp;..\..\openssl-1.0.1g\crypto\modes;..\..\openssl-1.0.1g\ms;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CRT_NON_CONFORMING_SWPRINTFS;OPENSSL_THREADS;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_NO_ASM;OPENSSL_NO_GMP;OPENSSL_NO_JPAKE;OPENSSL_NO_KRB5;OPENSSL_NO_MD2;OPENSSL_NO_RFC3779;OPENSSL_NO_STORE;OPENSSL_NO_STATIC_ENGINE;OPENSSL_BUILD_SHLIBCRYPTO;MK1MF_BUILD;OPENSSL_NO_SCTP;OPENSSL_NO_EC_NISTP_64_GCC_128;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -217,679 +217,679 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1f\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1g\libeay32.def true true MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/win32/openssl/libeay32.2012.vcxproj.filters b/libs/win32/openssl/libeay32.2012.vcxproj.filters index b72363f920..80893a4fe8 100644 --- a/libs/win32/openssl/libeay32.2012.vcxproj.filters +++ b/libs/win32/openssl/libeay32.2012.vcxproj.filters @@ -185,1998 +185,1998 @@ - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto\rc2 - + Source Files\crypto\rc2 - + Source Files\crypto\rc2 - + Source Files\crypto\rc2 - + Source Files\crypto\rc2 - + Source Files\crypto\rc4 - + Source Files\crypto\rc4 - + Source Files\crypto\idea - + Source Files\crypto\idea - + Source Files\crypto\idea - + Source Files\crypto\idea - + Source Files\crypto\idea - + Source Files\crypto\bf - + Source Files\crypto\bf - + Source Files\crypto\bf - + Source Files\crypto\bf - + Source Files\crypto\bf - + Source Files\crypto\cast - + Source Files\crypto\cast - + Source Files\crypto\cast - + Source Files\crypto\cast - + Source Files\crypto\cast - + Source Files\crypto\ripemd - + Source Files\crypto\ripemd - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\des - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\aes - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\camellia - + Source Files\crypto\seed - + Source Files\crypto\seed - + Source Files\crypto\seed - + Source Files\crypto\seed - + Source Files\crypto\seed - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\bn - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\rsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\dsa - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\rand - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\bio - + Source Files\crypto\err - + Source Files\crypto\err - + Source Files\crypto\err - + Source Files\crypto\ui - + Source Files\crypto\ui - + Source Files\crypto\ui - + Source Files\crypto\ui - + Source Files\crypto\ui - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\x509 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\asn1 - + Source Files\crypto\objects - + Source Files\crypto\objects - + Source Files\crypto\objects - + Source Files\crypto\objects - + Source Files\crypto\objects - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\buffer - + Source Files\crypto\buffer - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\cms - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\stack - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\pkcs7 - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\dh - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\ocsp - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\x509v3 - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\ts - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\conf - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ecdh - + Source Files\crypto\ecdh - + Source Files\crypto\ecdh - + Source Files\crypto\ecdh - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\ecdsa - + Source Files\crypto\md5 - + Source Files\crypto\md5 - + Source Files\crypto\md4 - + Source Files\crypto\md4 - + Source Files\crypto\lhash - + Source Files\crypto\lhash - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\dso - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\pkcs12 - + Source Files\crypto\hmac - + Source Files\crypto\hmac - + Source Files\crypto\hmac - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\sha - + Source Files\crypto\comp - + Source Files\crypto\comp - + Source Files\crypto\comp - + Source Files\crypto\comp - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\pem - + Source Files\crypto\whrlpool - + Source Files\crypto\whrlpool - + Source Files\crypto\mdc2 - + Source Files\crypto\mdc2 - + Source Files\crypto\krb5 - + Source Files\crypto\txt_db - + Source Files\crypto\pqueue - + Source Files\ms - + Source Files\crypto\buffer - + Source Files\crypto\camellia - + Source Files\crypto\ec - + Source Files\crypto\rc4 - + Source Files\crypto\rsa - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\evp - + Source Files\crypto\evp - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\modes - + Source Files\crypto\engine - + Source Files\crypto\engine - + Source Files\crypto\cms - + Source Files\crypto\cmac - + Source Files\crypto\cmac - + Source Files\crypto\cmac - + Source Files\crypto - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\ec - + Source Files\crypto\srp - + Source Files\crypto\srp - + Source Files\crypto\evp - + Source Files\crypto\bn - + Source Files\crypto - + Source Files\crypto - + Source Files\crypto\evp - + Header Files - + Header Files\crypto - + Header Files\crypto - + Header Files\crypto - + Header Files\crypto - + Header Files\crypto\evp - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\openssl - + Header Files\bf - + Header Files\bf - + Header Files\bf - + Header Files\ms diff --git a/libs/win32/openssl/openssl.2010.vcxproj b/libs/win32/openssl/openssl.2010.vcxproj index 800b451809..e1c8e5242d 100644 --- a/libs/win32/openssl/openssl.2010.vcxproj +++ b/libs/win32/openssl/openssl.2010.vcxproj @@ -75,7 +75,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions) true true @@ -103,7 +103,7 @@ MaxSpeed AnySuitable true - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions) true true @@ -135,7 +135,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions) true true @@ -165,7 +165,7 @@ MaxSpeed AnySuitable true - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions) true true @@ -189,61 +189,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/libs/win32/openssl/openssl.2010.vcxproj.filters b/libs/win32/openssl/openssl.2010.vcxproj.filters index f415047bdc..0aa3b5be8c 100644 --- a/libs/win32/openssl/openssl.2010.vcxproj.filters +++ b/libs/win32/openssl/openssl.2010.vcxproj.filters @@ -17,165 +17,165 @@ - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Header Files\apps diff --git a/libs/win32/openssl/openssl.2012.vcxproj b/libs/win32/openssl/openssl.2012.vcxproj index d19f0a88ab..f12884bc40 100644 --- a/libs/win32/openssl/openssl.2012.vcxproj +++ b/libs/win32/openssl/openssl.2012.vcxproj @@ -79,7 +79,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions) true true @@ -107,7 +107,7 @@ MaxSpeed AnySuitable true - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions) true true @@ -139,7 +139,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions) true true @@ -169,7 +169,7 @@ MaxSpeed AnySuitable true - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CONSOLE;OPENSSL_THREADS;MONOLITH;DSO_WIN32;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;%(PreprocessorDefinitions) true true @@ -193,61 +193,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/libs/win32/openssl/openssl.2012.vcxproj.filters b/libs/win32/openssl/openssl.2012.vcxproj.filters index f415047bdc..0aa3b5be8c 100644 --- a/libs/win32/openssl/openssl.2012.vcxproj.filters +++ b/libs/win32/openssl/openssl.2012.vcxproj.filters @@ -17,165 +17,165 @@ - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Source Files\apps - + Header Files\apps diff --git a/libs/win32/openssl/ssleay32.2010.vcxproj b/libs/win32/openssl/ssleay32.2010.vcxproj index 7c16015d6d..71c52bd331 100644 --- a/libs/win32/openssl/ssleay32.2010.vcxproj +++ b/libs/win32/openssl/ssleay32.2010.vcxproj @@ -80,13 +80,13 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def" /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -108,13 +108,13 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def" /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -136,7 +136,7 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def" X64 @@ -145,7 +145,7 @@ /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -166,7 +166,7 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def" X64 @@ -175,7 +175,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -195,58 +195,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/libs/win32/openssl/ssleay32.2010.vcxproj.filters b/libs/win32/openssl/ssleay32.2010.vcxproj.filters index 527c3a58fc..85a68df172 100644 --- a/libs/win32/openssl/ssleay32.2010.vcxproj.filters +++ b/libs/win32/openssl/ssleay32.2010.vcxproj.filters @@ -20,156 +20,156 @@ - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Header Files\crypto - + Header Files\crypto - + Header Files\crypto\evp diff --git a/libs/win32/openssl/ssleay32.2012.vcxproj b/libs/win32/openssl/ssleay32.2012.vcxproj index 310a8691ff..d677d84b5d 100644 --- a/libs/win32/openssl/ssleay32.2012.vcxproj +++ b/libs/win32/openssl/ssleay32.2012.vcxproj @@ -84,13 +84,13 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def" /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -112,13 +112,13 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def" /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -140,7 +140,7 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def" X64 @@ -149,7 +149,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;_DEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -171,7 +171,7 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1g\ssleay32.def" X64 @@ -180,7 +180,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1g\include;..\..\openssl-1.0.1g\crypto;..\..\openssl-1.0.1g;%(AdditionalIncludeDirectories) WIN32;NDEBUG;DSO_WIN32;OPENSSL_THREADS;OPENSSL_SYSNAME_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN;_CRT_SECURE_NO_DEPRECATE;OPENSSL_USE_APPLINK;OPENSSL_NO_RC5;OPENSSL_NO_MD2;OPENSSL_NO_KRB5;OPENSSL_NO_JPAKE;OPENSSL_NO_STATIC_ENGINE;_WINDLL;OPENSSL_BUILD_SHLIBSSL;OPENSSL_NO_SCTP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -201,58 +201,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/libs/win32/openssl/ssleay32.2012.vcxproj.filters b/libs/win32/openssl/ssleay32.2012.vcxproj.filters index 527c3a58fc..85a68df172 100644 --- a/libs/win32/openssl/ssleay32.2012.vcxproj.filters +++ b/libs/win32/openssl/ssleay32.2012.vcxproj.filters @@ -20,156 +20,156 @@ - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Source Files\ssl - + Header Files\crypto - + Header Files\crypto - + Header Files\crypto\evp diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj index 1bd39b525c..9f4b294266 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2010.vcxproj @@ -78,7 +78,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Disabled - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions) true EnableFastChecks @@ -114,7 +114,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Disabled - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) _WIN64;WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions) true EnableFastChecks @@ -148,7 +148,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" MaxSpeed OnlyExplicitInline - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -185,7 +185,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" MaxSpeed OnlyExplicitInline - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) _WIN64;WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2012.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2012.vcxproj index fbc38c2692..3dd1eb7a81 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2012.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2012.vcxproj @@ -82,7 +82,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Disabled - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions) true EnableFastChecks @@ -119,7 +119,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Disabled - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) _WIN64;WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions) true EnableFastChecks @@ -154,7 +154,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" MaxSpeed OnlyExplicitInline - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -192,7 +192,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" MaxSpeed OnlyExplicitInline - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-1.0.1g\include;%(AdditionalIncludeDirectories) _WIN64;WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj index 854f48d3ef..6d5e67e8a7 100644 --- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj +++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj @@ -66,7 +66,7 @@ - $(SolutionDir)libs\openssl-1.0.1f\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -83,7 +83,7 @@ X64 - $(SolutionDir)libs\openssl-1.0.1f\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -98,7 +98,7 @@ - $(SolutionDir)libs\openssl-1.0.1f\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -115,7 +115,7 @@ X64 - $(SolutionDir)libs\openssl-1.0.1f\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2012.vcxproj b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2012.vcxproj index b643b781a2..92c4a10d0a 100644 --- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2012.vcxproj +++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2012.vcxproj @@ -86,7 +86,7 @@ - $(SolutionDir)libs\openssl-1.0.1f\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -105,7 +105,7 @@ X64 - $(SolutionDir)libs\openssl-1.0.1f\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -122,7 +122,7 @@ - $(SolutionDir)libs\openssl-1.0.1f\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -141,7 +141,7 @@ X64 - $(SolutionDir)libs\openssl-1.0.1f\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\openssl-1.0.1g\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj index cbe56e23ce..43fedd67cc 100644 --- a/w32/Library/FreeSwitchCore.2010.vcxproj +++ b/w32/Library/FreeSwitchCore.2010.vcxproj @@ -88,7 +88,7 @@ Disabled - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) true EnableFastChecks @@ -147,7 +147,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs Disabled - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) true EnableFastChecks @@ -199,7 +199,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs MaxSpeed - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) MultiThreadedDLL Use @@ -249,7 +249,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs MaxSpeed - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) MultiThreadedDLL Use diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj b/w32/Library/FreeSwitchCore.2012.vcxproj index b7258122bf..6987782bff 100644 --- a/w32/Library/FreeSwitchCore.2012.vcxproj +++ b/w32/Library/FreeSwitchCore.2012.vcxproj @@ -92,7 +92,7 @@ Disabled - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) true EnableFastChecks @@ -155,7 +155,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs Disabled - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) true EnableFastChecks @@ -209,7 +209,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs MaxSpeed - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) MultiThreadedDLL Create @@ -260,7 +260,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs MaxSpeed - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1g\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) MultiThreadedDLL Create