diff --git a/libs/win32/Download OPENSSL.2010.vcxproj b/libs/win32/Download OPENSSL.2010.vcxproj index bd3ec16307..74dbda16e6 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.1c" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1c.tar.gz "$(ProjectDir).." + 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).." $(ProjectDir)..\OPENSSL;%(Outputs) Downloading OPENSSL - if not exist "$(ProjectDir)..\openssl-1.0.1c" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1c.tar.gz "$(ProjectDir).." + 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).." $(ProjectDir)..\OPENSSL;%(Outputs) diff --git a/libs/win32/Download OPENSSL.2012.vcxproj b/libs/win32/Download OPENSSL.2012.vcxproj index 114e21d193..3a881d7bd1 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.1c" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1c.tar.gz "$(ProjectDir).." + 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).." $(ProjectDir)..\OPENSSL;%(Outputs) Downloading OPENSSL - if not exist "$(ProjectDir)..\openssl-1.0.1c" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1c.tar.gz "$(ProjectDir).." + 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).." $(ProjectDir)..\OPENSSL;%(Outputs) diff --git a/libs/win32/curl/curllib.2010.vcxproj b/libs/win32/curl/curllib.2010.vcxproj index 8e736d99cb..27e0dacafe 100644 --- a/libs/win32/curl/curllib.2010.vcxproj +++ b/libs/win32/curl/curllib.2010.vcxproj @@ -80,7 +80,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories) + ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -111,7 +111,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories) + ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -141,7 +141,7 @@ Disabled - ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories) + ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true EnableFastChecks @@ -171,7 +171,7 @@ Disabled - ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories) + ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/libs/win32/curl/curllib.2012.vcxproj b/libs/win32/curl/curllib.2012.vcxproj index c6f519ff3e..c9ad1a58c8 100644 --- a/libs/win32/curl/curllib.2012.vcxproj +++ b/libs/win32/curl/curllib.2012.vcxproj @@ -84,7 +84,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories) + ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories) + ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -145,7 +145,7 @@ Disabled - ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories) + ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true EnableFastChecks @@ -175,7 +175,7 @@ Disabled - ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories) + ..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/libs/win32/iksemel/iksemel.2010.vcxproj b/libs/win32/iksemel/iksemel.2010.vcxproj index 91e2852c92..2fb1620ec2 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.1c\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1f\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.1c\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1f\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.1c\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1f\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.1c\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1f\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 fdb233dbe9..a95f224d15 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.1c\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1f\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.1c\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1f\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.1c\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1f\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.1c\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;..\..\openssl-1.0.1f\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/buffer.h b/libs/win32/openssl/include/buffer.h index 178e418282..f8da32b485 100644 --- a/libs/win32/openssl/include/buffer.h +++ b/libs/win32/openssl/include/buffer.h @@ -88,7 +88,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, size_t len); char * BUF_strdup(const char *str); char * BUF_strndup(const char *str, size_t siz); void * BUF_memdup(const void *data, size_t siz); -void BUF_reverse(unsigned char *out, unsigned char *in, size_t siz); +void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz); /* safe string functions */ size_t BUF_strlcpy(char *dst,const char *src,size_t siz); diff --git a/libs/win32/openssl/include/crypto.h b/libs/win32/openssl/include/crypto.h index 6aeda0a9ac..f92fc5182d 100644 --- a/libs/win32/openssl/include/crypto.h +++ b/libs/win32/openssl/include/crypto.h @@ -488,10 +488,10 @@ void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int), long (**go)(void)); void *CRYPTO_malloc_locked(int num, const char *file, int line); -void CRYPTO_free_locked(void *); +void CRYPTO_free_locked(void *ptr); void *CRYPTO_malloc(int num, const char *file, int line); char *CRYPTO_strdup(const char *str, const char *file, int line); -void CRYPTO_free(void *); +void CRYPTO_free(void *ptr); void *CRYPTO_realloc(void *addr,int num, const char *file, int line); void *CRYPTO_realloc_clean(void *addr,int old_num,int num,const char *file, int line); @@ -574,6 +574,13 @@ void OPENSSL_init(void); #define fips_cipher_abort(alg) while(0) #endif +/* CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal. It + * takes an amount of time dependent on |len|, but independent of the contents + * of |a| and |b|. Unlike memcmp, it cannot be used to put elements into a + * defined order as the return value when a != b is undefined, other than to be + * non-zero. */ +int CRYPTO_memcmp(const void *a, const void *b, size_t len); + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. diff --git a/libs/win32/openssl/include/dtls1.h b/libs/win32/openssl/include/dtls1.h index 5008bf6081..e65d501191 100644 --- a/libs/win32/openssl/include/dtls1.h +++ b/libs/win32/openssl/include/dtls1.h @@ -57,8 +57,8 @@ * */ -#ifndef HEADER_DTLS1_H -#define HEADER_DTLS1_H +#ifndef HEADER_DTLS1_H +#define HEADER_DTLS1_H #include #include @@ -72,8 +72,12 @@ #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) #include #else +#if defined(OPENSSL_SYS_VXWORKS) +#include +#else #include #endif +#endif #ifdef __cplusplus extern "C" { diff --git a/libs/win32/openssl/include/ec.h b/libs/win32/openssl/include/ec.h index 9d01325af3..dfe8710d33 100644 --- a/libs/win32/openssl/include/ec.h +++ b/libs/win32/openssl/include/ec.h @@ -274,10 +274,10 @@ int EC_GROUP_get_curve_name(const EC_GROUP *group); void EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag); int EC_GROUP_get_asn1_flag(const EC_GROUP *group); -void EC_GROUP_set_point_conversion_form(EC_GROUP *, point_conversion_form_t); +void EC_GROUP_set_point_conversion_form(EC_GROUP *group, point_conversion_form_t form); point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP *); -unsigned char *EC_GROUP_get0_seed(const EC_GROUP *); +unsigned char *EC_GROUP_get0_seed(const EC_GROUP *x); size_t EC_GROUP_get_seed_len(const EC_GROUP *); size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len); @@ -626,8 +626,8 @@ int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *c */ int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx); -int EC_POINT_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *); -int EC_POINTs_make_affine(const EC_GROUP *, size_t num, EC_POINT *[], BN_CTX *); +int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx); +int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx); /** Computes r = generator * n sum_{i=0}^num p[i] * m[i] * \param group underlying EC_GROUP object @@ -800,16 +800,24 @@ const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key); int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub); unsigned EC_KEY_get_enc_flags(const EC_KEY *key); -void EC_KEY_set_enc_flags(EC_KEY *, unsigned int); -point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *); -void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t); +void EC_KEY_set_enc_flags(EC_KEY *eckey, unsigned int flags); +point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key); +void EC_KEY_set_conv_form(EC_KEY *eckey, point_conversion_form_t cform); /* functions to set/get method specific data */ -void *EC_KEY_get_key_method_data(EC_KEY *, +void *EC_KEY_get_key_method_data(EC_KEY *key, void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); -void EC_KEY_insert_key_method_data(EC_KEY *, void *data, +/** Sets the key method data of an EC_KEY object, if none has yet been set. + * \param key EC_KEY object + * \param data opaque data to install. + * \param dup_func a function that duplicates |data|. + * \param free_func a function that frees |data|. + * \param clear_free_func a function that wipes and frees |data|. + * \return the previously set data pointer, or NULL if |data| was inserted. + */ +void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data, void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); /* wrapper functions for the underlying EC_GROUP object */ -void EC_KEY_set_asn1_flag(EC_KEY *, int); +void EC_KEY_set_asn1_flag(EC_KEY *eckey, int asn1_flag); /** Creates a table of pre-computed multiples of the generator to * accelerate further EC_KEY operations. diff --git a/libs/win32/openssl/include/evp.h b/libs/win32/openssl/include/evp.h index 0d1b20a7d3..faeb3c24e6 100644 --- a/libs/win32/openssl/include/evp.h +++ b/libs/win32/openssl/include/evp.h @@ -402,7 +402,6 @@ struct evp_cipher_st /* Length of tag for TLS */ #define EVP_GCM_TLS_TAG_LEN 16 - typedef struct evp_cipher_info_st { const EVP_CIPHER *cipher; @@ -789,8 +788,8 @@ const EVP_CIPHER *EVP_aes_128_cfb128(void); # define EVP_aes_128_cfb EVP_aes_128_cfb128 const EVP_CIPHER *EVP_aes_128_ofb(void); const EVP_CIPHER *EVP_aes_128_ctr(void); -const EVP_CIPHER *EVP_aes_128_gcm(void); const EVP_CIPHER *EVP_aes_128_ccm(void); +const EVP_CIPHER *EVP_aes_128_gcm(void); const EVP_CIPHER *EVP_aes_128_xts(void); const EVP_CIPHER *EVP_aes_192_ecb(void); const EVP_CIPHER *EVP_aes_192_cbc(void); @@ -800,8 +799,8 @@ const EVP_CIPHER *EVP_aes_192_cfb128(void); # define EVP_aes_192_cfb EVP_aes_192_cfb128 const EVP_CIPHER *EVP_aes_192_ofb(void); const EVP_CIPHER *EVP_aes_192_ctr(void); -const EVP_CIPHER *EVP_aes_192_gcm(void); const EVP_CIPHER *EVP_aes_192_ccm(void); +const EVP_CIPHER *EVP_aes_192_gcm(void); const EVP_CIPHER *EVP_aes_256_ecb(void); const EVP_CIPHER *EVP_aes_256_cbc(void); const EVP_CIPHER *EVP_aes_256_cfb1(void); @@ -810,8 +809,8 @@ const EVP_CIPHER *EVP_aes_256_cfb128(void); # define EVP_aes_256_cfb EVP_aes_256_cfb128 const EVP_CIPHER *EVP_aes_256_ofb(void); const EVP_CIPHER *EVP_aes_256_ctr(void); -const EVP_CIPHER *EVP_aes_256_gcm(void); const EVP_CIPHER *EVP_aes_256_ccm(void); +const EVP_CIPHER *EVP_aes_256_gcm(void); const EVP_CIPHER *EVP_aes_256_xts(void); #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void); @@ -1243,6 +1242,8 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, int (*ctrl_str)(EVP_PKEY_CTX *ctx, const char *type, const char *value)); +void EVP_add_alg_module(void); + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. @@ -1257,6 +1258,7 @@ void ERR_load_EVP_strings(void); #define EVP_F_AES_INIT_KEY 133 #define EVP_F_AES_XTS 172 #define EVP_F_AES_XTS_CIPHER 175 +#define EVP_F_ALG_MODULE_INIT 177 #define EVP_F_CAMELLIA_INIT_KEY 159 #define EVP_F_CMAC_INIT 173 #define EVP_F_D2I_PKEY 100 @@ -1350,15 +1352,19 @@ void ERR_load_EVP_strings(void); #define EVP_R_DIFFERENT_PARAMETERS 153 #define EVP_R_DISABLED_FOR_FIPS 163 #define EVP_R_ENCODE_ERROR 115 +#define EVP_R_ERROR_LOADING_SECTION 165 +#define EVP_R_ERROR_SETTING_FIPS_MODE 166 #define EVP_R_EVP_PBE_CIPHERINIT_ERROR 119 #define EVP_R_EXPECTING_AN_RSA_KEY 127 #define EVP_R_EXPECTING_A_DH_KEY 128 #define EVP_R_EXPECTING_A_DSA_KEY 129 #define EVP_R_EXPECTING_A_ECDSA_KEY 141 #define EVP_R_EXPECTING_A_EC_KEY 142 +#define EVP_R_FIPS_MODE_NOT_SUPPORTED 167 #define EVP_R_INITIALIZATION_ERROR 134 #define EVP_R_INPUT_NOT_INITIALIZED 111 #define EVP_R_INVALID_DIGEST 152 +#define EVP_R_INVALID_FIPS_MODE 168 #define EVP_R_INVALID_KEY_LENGTH 130 #define EVP_R_INVALID_OPERATION 148 #define EVP_R_IV_TOO_LARGE 102 @@ -1383,6 +1389,7 @@ void ERR_load_EVP_strings(void); #define EVP_R_TOO_LARGE 164 #define EVP_R_UNKNOWN_CIPHER 160 #define EVP_R_UNKNOWN_DIGEST 161 +#define EVP_R_UNKNOWN_OPTION 169 #define EVP_R_UNKNOWN_PBE_ALGORITHM 121 #define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS 135 #define EVP_R_UNSUPPORTED_ALGORITHM 156 diff --git a/libs/win32/openssl/include/md2.h b/libs/win32/openssl/include/md2.h deleted file mode 100644 index d59c9f2593..0000000000 --- a/libs/win32/openssl/include/md2.h +++ /dev/null @@ -1,95 +0,0 @@ -/* crypto/md/md2.h */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#ifndef HEADER_MD2_H -#define HEADER_MD2_H - -#include /* OPENSSL_NO_MD2, MD2_INT */ -#ifdef OPENSSL_NO_MD2 -#error MD2 is disabled. -#endif -#include - -#define MD2_DIGEST_LENGTH 16 -#define MD2_BLOCK 16 - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct MD2state_st - { - unsigned int num; - unsigned char data[MD2_BLOCK]; - MD2_INT cksm[MD2_BLOCK]; - MD2_INT state[MD2_BLOCK]; - } MD2_CTX; - -const char *MD2_options(void); -#ifdef OPENSSL_FIPS -int private_MD2_Init(MD2_CTX *c); -#endif -int MD2_Init(MD2_CTX *c); -int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len); -int MD2_Final(unsigned char *md, MD2_CTX *c); -unsigned char *MD2(const unsigned char *d, size_t n,unsigned char *md); -#ifdef __cplusplus -} -#endif - -#endif diff --git a/libs/win32/openssl/include/o_dir.h b/libs/win32/openssl/include/o_dir.h deleted file mode 100644 index 4b725c0312..0000000000 --- a/libs/win32/openssl/include/o_dir.h +++ /dev/null @@ -1,53 +0,0 @@ -/* crypto/o_dir.h -*- mode:C; c-file-style: "eay" -*- */ -/* Copied from Richard Levitte's (richard@levitte.org) LP library. All - * symbol names have been changed, with permission from the author. - */ - -/* $LP: LPlib/source/LPdir.h,v 1.1 2004/06/14 08:56:04 _cvs_levitte Exp $ */ -/* - * Copyright (c) 2004, Richard Levitte - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - - -#ifndef O_DIR_H -#define O_DIR_H - -#ifdef __cplusplus -extern "C" { -#endif - - typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX; - - /* returns NULL on error or end-of-directory. - If it is end-of-directory, errno will be zero */ - const char *OPENSSL_DIR_read(OPENSSL_DIR_CTX **ctx, const char *directory); - /* returns 1 on success, 0 on error */ - int OPENSSL_DIR_end(OPENSSL_DIR_CTX **ctx); - -#ifdef __cplusplus -} -#endif - -#endif /* LPDIR_H */ diff --git a/libs/win32/openssl/include/o_str.h b/libs/win32/openssl/include/o_str.h deleted file mode 100644 index dfc98494c6..0000000000 --- a/libs/win32/openssl/include/o_str.h +++ /dev/null @@ -1,68 +0,0 @@ -/* crypto/o_str.h -*- mode:C; c-file-style: "eay" -*- */ -/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL - * project 2003. - */ -/* ==================================================================== - * Copyright (c) 2003 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * licensing@OpenSSL.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#ifndef HEADER_O_STR_H -#define HEADER_O_STR_H - -#include /* to get size_t */ - -int OPENSSL_strcasecmp(const char *str1, const char *str2); -int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n); -int OPENSSL_memcmp(const void *p1,const void *p2,size_t n); - -#endif diff --git a/libs/win32/openssl/include/opensslv.h b/libs/win32/openssl/include/opensslv.h index 71be3590af..b27a5bb8c0 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 0x1000103fL +#define OPENSSL_VERSION_NUMBER 0x1000106fL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1c-fips 10 May 2012" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f-fips 6 Jan 2014" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1c 10 May 2012" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1f 6 Jan 2014" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/libs/win32/openssl/include/pq_compat.h b/libs/win32/openssl/include/pq_compat.h deleted file mode 100644 index 8745d1d788..0000000000 --- a/libs/win32/openssl/include/pq_compat.h +++ /dev/null @@ -1,2 +0,0 @@ -/* file generated by 'generate-global-headers.bat' */ -#include "..\../crypto/pqueue/pq_compat.h" diff --git a/libs/win32/openssl/include/rand.h b/libs/win32/openssl/include/rand.h index dc8fcf94c5..bb5520e80a 100644 --- a/libs/win32/openssl/include/rand.h +++ b/libs/win32/openssl/include/rand.h @@ -138,6 +138,7 @@ void ERR_load_RAND_strings(void); #define RAND_F_SSLEAY_RAND_BYTES 100 /* Reason codes. */ +#define RAND_R_DUAL_EC_DRBG_DISABLED 104 #define RAND_R_ERROR_INITIALISING_DRBG 102 #define RAND_R_ERROR_INSTANTIATING_DRBG 103 #define RAND_R_NO_FIPS_RANDOM_METHOD_SET 101 diff --git a/libs/win32/openssl/include/rc5.h b/libs/win32/openssl/include/rc5.h deleted file mode 100644 index 4b3c153b50..0000000000 --- a/libs/win32/openssl/include/rc5.h +++ /dev/null @@ -1,118 +0,0 @@ -/* crypto/rc5/rc5.h */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#ifndef HEADER_RC5_H -#define HEADER_RC5_H - -#include /* OPENSSL_NO_RC5 */ - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef OPENSSL_NO_RC5 -#error RC5 is disabled. -#endif - -#define RC5_ENCRYPT 1 -#define RC5_DECRYPT 0 - -/* 32 bit. For Alpha, things may get weird */ -#define RC5_32_INT unsigned long - -#define RC5_32_BLOCK 8 -#define RC5_32_KEY_LENGTH 16 /* This is a default, max is 255 */ - -/* This are the only values supported. Tweak the code if you want more - * The most supported modes will be - * RC5-32/12/16 - * RC5-32/16/8 - */ -#define RC5_8_ROUNDS 8 -#define RC5_12_ROUNDS 12 -#define RC5_16_ROUNDS 16 - -typedef struct rc5_key_st - { - /* Number of rounds */ - int rounds; - RC5_32_INT data[2*(RC5_16_ROUNDS+1)]; - } RC5_32_KEY; - - -void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, - int rounds); -void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, - int enc); -void RC5_32_encrypt(unsigned long *data,RC5_32_KEY *key); -void RC5_32_decrypt(unsigned long *data,RC5_32_KEY *key); -void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out, - long length, RC5_32_KEY *ks, unsigned char *iv, - int enc); -void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out, - long length, RC5_32_KEY *schedule, - unsigned char *ivec, int *num, int enc); -void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out, - long length, RC5_32_KEY *schedule, - unsigned char *ivec, int *num); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/libs/win32/openssl/include/rsa.h b/libs/win32/openssl/include/rsa.h index 4814a2fc15..5f269e577a 100644 --- a/libs/win32/openssl/include/rsa.h +++ b/libs/win32/openssl/include/rsa.h @@ -280,7 +280,7 @@ struct rsa_st RSA * RSA_new(void); RSA * RSA_new_method(ENGINE *engine); -int RSA_size(const RSA *); +int RSA_size(const RSA *rsa); /* Deprecated version */ #ifndef OPENSSL_NO_DEPRECATED diff --git a/libs/win32/openssl/include/ssl.h b/libs/win32/openssl/include/ssl.h index 8b0c2a2dac..dece04de01 100644 --- a/libs/win32/openssl/include/ssl.h +++ b/libs/win32/openssl/include/ssl.h @@ -493,6 +493,9 @@ struct ssl_session_st char *psk_identity_hint; char *psk_identity; #endif + /* Used to indicate that session resumption is not allowed. + * Applications can also set this bit for a new session via + * not_resumable_session_cb to disable session caching and tickets. */ int not_resumable; /* The cert is the certificate used to establish this connection */ @@ -535,7 +538,7 @@ struct ssl_session_st #endif /* OPENSSL_NO_EC */ /* RFC4507 info */ unsigned char *tlsext_tick; /* Session ticket */ - size_t tlsext_ticklen; /* Session ticket length */ + size_t tlsext_ticklen; /* Session ticket length */ long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */ #endif #ifndef OPENSSL_NO_SRP @@ -552,11 +555,14 @@ struct ssl_session_st #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L -#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */ +#define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040L #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L #define SSL_OP_TLS_D5_BUG 0x00000100L #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L +/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */ +#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 + /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added * in OpenSSL 0.9.6d. Usually (depending on the application protocol) * the workaround is not needed. Unfortunately some broken SSL/TLS @@ -638,6 +644,12 @@ struct ssl_session_st * TLS only.) "Released" buffers are put onto a free-list in the context * or just freed (depending on the context's setting for freelist_max_len). */ #define SSL_MODE_RELEASE_BUFFERS 0x00000010L +/* Send the current time in the Random fields of the ClientHello and + * ServerHello records for compatibility with hypothetical implementations + * that require it. + */ +#define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020L +#define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040L /* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value, * they cannot be used to clear bits. */ @@ -927,6 +939,7 @@ struct ssl_ctx_st /* Callback for status request */ int (*tlsext_status_cb)(SSL *ssl, void *arg); void *tlsext_status_arg; + /* draft-rescorla-tls-opaque-prf-input-00.txt information */ int (*tlsext_opaque_prf_input_callback)(SSL *, void *peerinput, size_t len, void *arg); void *tlsext_opaque_prf_input_callback_arg; @@ -952,6 +965,7 @@ struct ssl_ctx_st #endif #ifndef OPENSSL_NO_TLSEXT + # ifndef OPENSSL_NO_NEXTPROTONEG /* Next protocol negotiation information */ /* (for experimental NPN extension). */ @@ -2206,6 +2220,7 @@ void ERR_load_SSL_strings(void); #define SSL_F_SSL_GET_NEW_SESSION 181 #define SSL_F_SSL_GET_PREV_SESSION 217 #define SSL_F_SSL_GET_SERVER_SEND_CERT 182 +#define SSL_F_SSL_GET_SERVER_SEND_PKEY 317 #define SSL_F_SSL_GET_SIGN_PKEY 183 #define SSL_F_SSL_INIT_WBIO_BUFFER 184 #define SSL_F_SSL_LOAD_CLIENT_CA_FILE 185 diff --git a/libs/win32/openssl/include/ssl3.h b/libs/win32/openssl/include/ssl3.h index 112e627de0..cb8b2492ec 100644 --- a/libs/win32/openssl/include/ssl3.h +++ b/libs/win32/openssl/include/ssl3.h @@ -539,6 +539,15 @@ typedef struct ssl3_state_st /* Set if we saw the Next Protocol Negotiation extension from our peer. */ int next_proto_neg_seen; #endif + +#ifndef OPENSSL_NO_TLSEXT +#ifndef OPENSSL_NO_EC + /* This is set to true if we believe that this is a version of Safari + * running on OS X 10.6 or newer. We wish to know this because Safari + * on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */ + char is_probably_safari; +#endif /* !OPENSSL_NO_EC */ +#endif /* !OPENSSL_NO_TLSEXT */ } SSL3_STATE; #endif @@ -578,8 +587,10 @@ typedef struct ssl3_state_st #define SSL3_ST_CW_CERT_VRFY_B (0x191|SSL_ST_CONNECT) #define SSL3_ST_CW_CHANGE_A (0x1A0|SSL_ST_CONNECT) #define SSL3_ST_CW_CHANGE_B (0x1A1|SSL_ST_CONNECT) +#ifndef OPENSSL_NO_NEXTPROTONEG #define SSL3_ST_CW_NEXT_PROTO_A (0x200|SSL_ST_CONNECT) #define SSL3_ST_CW_NEXT_PROTO_B (0x201|SSL_ST_CONNECT) +#endif #define SSL3_ST_CW_FINISHED_A (0x1B0|SSL_ST_CONNECT) #define SSL3_ST_CW_FINISHED_B (0x1B1|SSL_ST_CONNECT) /* read from server */ @@ -629,8 +640,10 @@ typedef struct ssl3_state_st #define SSL3_ST_SR_CERT_VRFY_B (0x1A1|SSL_ST_ACCEPT) #define SSL3_ST_SR_CHANGE_A (0x1B0|SSL_ST_ACCEPT) #define SSL3_ST_SR_CHANGE_B (0x1B1|SSL_ST_ACCEPT) +#ifndef OPENSSL_NO_NEXTPROTONEG #define SSL3_ST_SR_NEXT_PROTO_A (0x210|SSL_ST_ACCEPT) #define SSL3_ST_SR_NEXT_PROTO_B (0x211|SSL_ST_ACCEPT) +#endif #define SSL3_ST_SR_FINISHED_A (0x1C0|SSL_ST_ACCEPT) #define SSL3_ST_SR_FINISHED_B (0x1C1|SSL_ST_ACCEPT) /* write to client */ @@ -655,7 +668,9 @@ typedef struct ssl3_state_st #define SSL3_MT_CLIENT_KEY_EXCHANGE 16 #define SSL3_MT_FINISHED 20 #define SSL3_MT_CERTIFICATE_STATUS 22 +#ifndef OPENSSL_NO_NEXTPROTONEG #define SSL3_MT_NEXT_PROTO 67 +#endif #define DTLS1_MT_HELLO_VERIFY_REQUEST 3 diff --git a/libs/win32/openssl/include/store.h b/libs/win32/openssl/include/store.h deleted file mode 100644 index 0a28c7d5a2..0000000000 --- a/libs/win32/openssl/include/store.h +++ /dev/null @@ -1,561 +0,0 @@ -/* crypto/store/store.h -*- mode:C; c-file-style: "eay" -*- */ -/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL - * project 2003. - */ -/* ==================================================================== - * Copyright (c) 2003 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#ifndef HEADER_STORE_H -#define HEADER_STORE_H - -#include - -#ifdef OPENSSL_NO_STORE -#error STORE is disabled. -#endif - -#include -#ifndef OPENSSL_NO_DEPRECATED -#include -#include -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* Already defined in ossl_typ.h */ -/* typedef struct store_st STORE; */ -/* typedef struct store_method_st STORE_METHOD; */ - - -/* All the following functions return 0, a negative number or NULL on error. - When everything is fine, they return a positive value or a non-NULL - pointer, all depending on their purpose. */ - -/* Creators and destructor. */ -STORE *STORE_new_method(const STORE_METHOD *method); -STORE *STORE_new_engine(ENGINE *engine); -void STORE_free(STORE *ui); - - -/* Give a user interface parametrised control commands. This can be used to - send down an integer, a data pointer or a function pointer, as well as - be used to get information from a STORE. */ -int STORE_ctrl(STORE *store, int cmd, long i, void *p, void (*f)(void)); - -/* A control to set the directory with keys and certificates. Used by the - built-in directory level method. */ -#define STORE_CTRL_SET_DIRECTORY 0x0001 -/* A control to set a file to load. Used by the built-in file level method. */ -#define STORE_CTRL_SET_FILE 0x0002 -/* A control to set a configuration file to load. Can be used by any method - that wishes to load a configuration file. */ -#define STORE_CTRL_SET_CONF_FILE 0x0003 -/* A control to set a the section of the loaded configuration file. Can be - used by any method that wishes to load a configuration file. */ -#define STORE_CTRL_SET_CONF_SECTION 0x0004 - - -/* Some methods may use extra data */ -#define STORE_set_app_data(s,arg) STORE_set_ex_data(s,0,arg) -#define STORE_get_app_data(s) STORE_get_ex_data(s,0) -int STORE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, - CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); -int STORE_set_ex_data(STORE *r,int idx,void *arg); -void *STORE_get_ex_data(STORE *r, int idx); - -/* Use specific methods instead of the built-in one */ -const STORE_METHOD *STORE_get_method(STORE *store); -const STORE_METHOD *STORE_set_method(STORE *store, const STORE_METHOD *meth); - -/* The standard OpenSSL methods. */ -/* This is the in-memory method. It does everything except revoking and updating, - and is of course volatile. It's used by other methods that have an in-memory - cache. */ -const STORE_METHOD *STORE_Memory(void); -#if 0 /* Not yet implemented */ -/* This is the directory store. It does everything except revoking and updating, - and uses STORE_Memory() to cache things in memory. */ -const STORE_METHOD *STORE_Directory(void); -/* This is the file store. It does everything except revoking and updating, - and uses STORE_Memory() to cache things in memory. Certificates are added - to it with the store operation, and it will only get cached certificates. */ -const STORE_METHOD *STORE_File(void); -#endif - -/* Store functions take a type code for the type of data they should store - or fetch */ -typedef enum STORE_object_types - { - STORE_OBJECT_TYPE_X509_CERTIFICATE= 0x01, /* X509 * */ - STORE_OBJECT_TYPE_X509_CRL= 0x02, /* X509_CRL * */ - STORE_OBJECT_TYPE_PRIVATE_KEY= 0x03, /* EVP_PKEY * */ - STORE_OBJECT_TYPE_PUBLIC_KEY= 0x04, /* EVP_PKEY * */ - STORE_OBJECT_TYPE_NUMBER= 0x05, /* BIGNUM * */ - STORE_OBJECT_TYPE_ARBITRARY= 0x06, /* BUF_MEM * */ - STORE_OBJECT_TYPE_NUM= 0x06 /* The amount of known - object types */ - } STORE_OBJECT_TYPES; -/* List of text strings corresponding to the object types. */ -extern const char * const STORE_object_type_string[STORE_OBJECT_TYPE_NUM+1]; - -/* Some store functions take a parameter list. Those parameters come with - one of the following codes. The comments following the codes below indicate - what type the value should be a pointer to. */ -typedef enum STORE_params - { - STORE_PARAM_EVP_TYPE= 0x01, /* int */ - STORE_PARAM_BITS= 0x02, /* size_t */ - STORE_PARAM_KEY_PARAMETERS= 0x03, /* ??? */ - STORE_PARAM_KEY_NO_PARAMETERS= 0x04, /* N/A */ - STORE_PARAM_AUTH_PASSPHRASE= 0x05, /* char * */ - STORE_PARAM_AUTH_KRB5_TICKET= 0x06, /* void * */ - STORE_PARAM_TYPE_NUM= 0x06 /* The amount of known - parameter types */ - } STORE_PARAM_TYPES; -/* Parameter value sizes. -1 means unknown, anything else is the required size. */ -extern const int STORE_param_sizes[STORE_PARAM_TYPE_NUM+1]; - -/* Store functions take attribute lists. Those attributes come with codes. - The comments following the codes below indicate what type the value should - be a pointer to. */ -typedef enum STORE_attribs - { - STORE_ATTR_END= 0x00, - STORE_ATTR_FRIENDLYNAME= 0x01, /* C string */ - STORE_ATTR_KEYID= 0x02, /* 160 bit string (SHA1) */ - STORE_ATTR_ISSUERKEYID= 0x03, /* 160 bit string (SHA1) */ - STORE_ATTR_SUBJECTKEYID= 0x04, /* 160 bit string (SHA1) */ - STORE_ATTR_ISSUERSERIALHASH= 0x05, /* 160 bit string (SHA1) */ - STORE_ATTR_ISSUER= 0x06, /* X509_NAME * */ - STORE_ATTR_SERIAL= 0x07, /* BIGNUM * */ - STORE_ATTR_SUBJECT= 0x08, /* X509_NAME * */ - STORE_ATTR_CERTHASH= 0x09, /* 160 bit string (SHA1) */ - STORE_ATTR_EMAIL= 0x0a, /* C string */ - STORE_ATTR_FILENAME= 0x0b, /* C string */ - STORE_ATTR_TYPE_NUM= 0x0b, /* The amount of known - attribute types */ - STORE_ATTR_OR= 0xff /* This is a special - separator, which - expresses the OR - operation. */ - } STORE_ATTR_TYPES; -/* Attribute value sizes. -1 means unknown, anything else is the required size. */ -extern const int STORE_attr_sizes[STORE_ATTR_TYPE_NUM+1]; - -typedef enum STORE_certificate_status - { - STORE_X509_VALID= 0x00, - STORE_X509_EXPIRED= 0x01, - STORE_X509_SUSPENDED= 0x02, - STORE_X509_REVOKED= 0x03 - } STORE_CERTIFICATE_STATUS; - -/* Engine store functions will return a structure that contains all the necessary - * information, including revokation status for certificates. This is really not - * needed for application authors, as the ENGINE framework functions will extract - * the OpenSSL-specific information when at all possible. However, for engine - * authors, it's crucial to know this structure. */ -typedef struct STORE_OBJECT_st - { - STORE_OBJECT_TYPES type; - union - { - struct - { - STORE_CERTIFICATE_STATUS status; - X509 *certificate; - } x509; - X509_CRL *crl; - EVP_PKEY *key; - BIGNUM *number; - BUF_MEM *arbitrary; - } data; - } STORE_OBJECT; -DECLARE_STACK_OF(STORE_OBJECT) -STORE_OBJECT *STORE_OBJECT_new(void); -void STORE_OBJECT_free(STORE_OBJECT *data); - - - -/* The following functions handle the storage. They return 0, a negative number - or NULL on error, anything else on success. */ -X509 *STORE_get_certificate(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_store_certificate(STORE *e, X509 *data, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_modify_certificate(STORE *e, OPENSSL_ITEM search_attributes[], - OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[], - OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]); -int STORE_revoke_certificate(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_delete_certificate(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -void *STORE_list_certificate_start(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -X509 *STORE_list_certificate_next(STORE *e, void *handle); -int STORE_list_certificate_end(STORE *e, void *handle); -int STORE_list_certificate_endp(STORE *e, void *handle); -EVP_PKEY *STORE_generate_key(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -EVP_PKEY *STORE_get_private_key(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_store_private_key(STORE *e, EVP_PKEY *data, - OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]); -int STORE_modify_private_key(STORE *e, OPENSSL_ITEM search_attributes[], - OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[], - OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]); -int STORE_revoke_private_key(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_delete_private_key(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -void *STORE_list_private_key_start(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -EVP_PKEY *STORE_list_private_key_next(STORE *e, void *handle); -int STORE_list_private_key_end(STORE *e, void *handle); -int STORE_list_private_key_endp(STORE *e, void *handle); -EVP_PKEY *STORE_get_public_key(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_store_public_key(STORE *e, EVP_PKEY *data, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_modify_public_key(STORE *e, OPENSSL_ITEM search_attributes[], - OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[], - OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]); -int STORE_revoke_public_key(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_delete_public_key(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -void *STORE_list_public_key_start(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -EVP_PKEY *STORE_list_public_key_next(STORE *e, void *handle); -int STORE_list_public_key_end(STORE *e, void *handle); -int STORE_list_public_key_endp(STORE *e, void *handle); -X509_CRL *STORE_generate_crl(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -X509_CRL *STORE_get_crl(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_store_crl(STORE *e, X509_CRL *data, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_modify_crl(STORE *e, OPENSSL_ITEM search_attributes[], - OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[], - OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]); -int STORE_delete_crl(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -void *STORE_list_crl_start(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -X509_CRL *STORE_list_crl_next(STORE *e, void *handle); -int STORE_list_crl_end(STORE *e, void *handle); -int STORE_list_crl_endp(STORE *e, void *handle); -int STORE_store_number(STORE *e, BIGNUM *data, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_modify_number(STORE *e, OPENSSL_ITEM search_attributes[], - OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[], - OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]); -BIGNUM *STORE_get_number(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_delete_number(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_store_arbitrary(STORE *e, BUF_MEM *data, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_modify_arbitrary(STORE *e, OPENSSL_ITEM search_attributes[], - OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[], - OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]); -BUF_MEM *STORE_get_arbitrary(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); -int STORE_delete_arbitrary(STORE *e, OPENSSL_ITEM attributes[], - OPENSSL_ITEM parameters[]); - - -/* Create and manipulate methods */ -STORE_METHOD *STORE_create_method(char *name); -void STORE_destroy_method(STORE_METHOD *store_method); - -/* These callback types are use for store handlers */ -typedef int (*STORE_INITIALISE_FUNC_PTR)(STORE *); -typedef void (*STORE_CLEANUP_FUNC_PTR)(STORE *); -typedef STORE_OBJECT *(*STORE_GENERATE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]); -typedef STORE_OBJECT *(*STORE_GET_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]); -typedef void *(*STORE_START_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]); -typedef STORE_OBJECT *(*STORE_NEXT_OBJECT_FUNC_PTR)(STORE *, void *handle); -typedef int (*STORE_END_OBJECT_FUNC_PTR)(STORE *, void *handle); -typedef int (*STORE_HANDLE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]); -typedef int (*STORE_STORE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, STORE_OBJECT *data, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]); -typedef int (*STORE_MODIFY_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM search_attributes[], OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[], OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]); -typedef int (*STORE_GENERIC_FUNC_PTR)(STORE *, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]); -typedef int (*STORE_CTRL_FUNC_PTR)(STORE *, int cmd, long l, void *p, void (*f)(void)); - -int STORE_method_set_initialise_function(STORE_METHOD *sm, STORE_INITIALISE_FUNC_PTR init_f); -int STORE_method_set_cleanup_function(STORE_METHOD *sm, STORE_CLEANUP_FUNC_PTR clean_f); -int STORE_method_set_generate_function(STORE_METHOD *sm, STORE_GENERATE_OBJECT_FUNC_PTR generate_f); -int STORE_method_set_get_function(STORE_METHOD *sm, STORE_GET_OBJECT_FUNC_PTR get_f); -int STORE_method_set_store_function(STORE_METHOD *sm, STORE_STORE_OBJECT_FUNC_PTR store_f); -int STORE_method_set_modify_function(STORE_METHOD *sm, STORE_MODIFY_OBJECT_FUNC_PTR store_f); -int STORE_method_set_revoke_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR revoke_f); -int STORE_method_set_delete_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR delete_f); -int STORE_method_set_list_start_function(STORE_METHOD *sm, STORE_START_OBJECT_FUNC_PTR list_start_f); -int STORE_method_set_list_next_function(STORE_METHOD *sm, STORE_NEXT_OBJECT_FUNC_PTR list_next_f); -int STORE_method_set_list_end_function(STORE_METHOD *sm, STORE_END_OBJECT_FUNC_PTR list_end_f); -int STORE_method_set_update_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR); -int STORE_method_set_lock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR); -int STORE_method_set_unlock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR); -int STORE_method_set_ctrl_function(STORE_METHOD *sm, STORE_CTRL_FUNC_PTR ctrl_f); - -STORE_INITIALISE_FUNC_PTR STORE_method_get_initialise_function(STORE_METHOD *sm); -STORE_CLEANUP_FUNC_PTR STORE_method_get_cleanup_function(STORE_METHOD *sm); -STORE_GENERATE_OBJECT_FUNC_PTR STORE_method_get_generate_function(STORE_METHOD *sm); -STORE_GET_OBJECT_FUNC_PTR STORE_method_get_get_function(STORE_METHOD *sm); -STORE_STORE_OBJECT_FUNC_PTR STORE_method_get_store_function(STORE_METHOD *sm); -STORE_MODIFY_OBJECT_FUNC_PTR STORE_method_get_modify_function(STORE_METHOD *sm); -STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_revoke_function(STORE_METHOD *sm); -STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_delete_function(STORE_METHOD *sm); -STORE_START_OBJECT_FUNC_PTR STORE_method_get_list_start_function(STORE_METHOD *sm); -STORE_NEXT_OBJECT_FUNC_PTR STORE_method_get_list_next_function(STORE_METHOD *sm); -STORE_END_OBJECT_FUNC_PTR STORE_method_get_list_end_function(STORE_METHOD *sm); -STORE_GENERIC_FUNC_PTR STORE_method_get_update_store_function(STORE_METHOD *sm); -STORE_GENERIC_FUNC_PTR STORE_method_get_lock_store_function(STORE_METHOD *sm); -STORE_GENERIC_FUNC_PTR STORE_method_get_unlock_store_function(STORE_METHOD *sm); -STORE_CTRL_FUNC_PTR STORE_method_get_ctrl_function(STORE_METHOD *sm); - -/* Method helper structures and functions. */ - -/* This structure is the result of parsing through the information in a list - of OPENSSL_ITEMs. It stores all the necessary information in a structured - way.*/ -typedef struct STORE_attr_info_st STORE_ATTR_INFO; - -/* Parse a list of OPENSSL_ITEMs and return a pointer to a STORE_ATTR_INFO. - Note that we do this in the list form, since the list of OPENSSL_ITEMs can - come in blocks separated with STORE_ATTR_OR. Note that the value returned - by STORE_parse_attrs_next() must be freed with STORE_ATTR_INFO_free(). */ -void *STORE_parse_attrs_start(OPENSSL_ITEM *attributes); -STORE_ATTR_INFO *STORE_parse_attrs_next(void *handle); -int STORE_parse_attrs_end(void *handle); -int STORE_parse_attrs_endp(void *handle); - -/* Creator and destructor */ -STORE_ATTR_INFO *STORE_ATTR_INFO_new(void); -int STORE_ATTR_INFO_free(STORE_ATTR_INFO *attrs); - -/* Manipulators */ -char *STORE_ATTR_INFO_get0_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code); -unsigned char *STORE_ATTR_INFO_get0_sha1str(STORE_ATTR_INFO *attrs, - STORE_ATTR_TYPES code); -X509_NAME *STORE_ATTR_INFO_get0_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code); -BIGNUM *STORE_ATTR_INFO_get0_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code); -int STORE_ATTR_INFO_set_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, - char *cstr, size_t cstr_size); -int STORE_ATTR_INFO_set_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, - unsigned char *sha1str, size_t sha1str_size); -int STORE_ATTR_INFO_set_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, - X509_NAME *dn); -int STORE_ATTR_INFO_set_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, - BIGNUM *number); -int STORE_ATTR_INFO_modify_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, - char *cstr, size_t cstr_size); -int STORE_ATTR_INFO_modify_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, - unsigned char *sha1str, size_t sha1str_size); -int STORE_ATTR_INFO_modify_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, - X509_NAME *dn); -int STORE_ATTR_INFO_modify_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, - BIGNUM *number); - -/* Compare on basis of a bit pattern formed by the STORE_ATTR_TYPES values - in each contained attribute. */ -int STORE_ATTR_INFO_compare(const STORE_ATTR_INFO * const *a, - const STORE_ATTR_INFO * const *b); -/* Check if the set of attributes in a is within the range of attributes - set in b. */ -int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b); -/* Check if the set of attributes in a are also set in b. */ -int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b); -/* Same as STORE_ATTR_INFO_in(), but also checks the attribute values. */ -int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b); - - -/* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes - * made after this point may be overwritten when the script is next run. - */ -void ERR_load_STORE_strings(void); - -/* Error codes for the STORE functions. */ - -/* Function codes. */ -#define STORE_F_MEM_DELETE 134 -#define STORE_F_MEM_GENERATE 135 -#define STORE_F_MEM_LIST_END 168 -#define STORE_F_MEM_LIST_NEXT 136 -#define STORE_F_MEM_LIST_START 137 -#define STORE_F_MEM_MODIFY 169 -#define STORE_F_MEM_STORE 138 -#define STORE_F_STORE_ATTR_INFO_GET0_CSTR 139 -#define STORE_F_STORE_ATTR_INFO_GET0_DN 140 -#define STORE_F_STORE_ATTR_INFO_GET0_NUMBER 141 -#define STORE_F_STORE_ATTR_INFO_GET0_SHA1STR 142 -#define STORE_F_STORE_ATTR_INFO_MODIFY_CSTR 143 -#define STORE_F_STORE_ATTR_INFO_MODIFY_DN 144 -#define STORE_F_STORE_ATTR_INFO_MODIFY_NUMBER 145 -#define STORE_F_STORE_ATTR_INFO_MODIFY_SHA1STR 146 -#define STORE_F_STORE_ATTR_INFO_SET_CSTR 147 -#define STORE_F_STORE_ATTR_INFO_SET_DN 148 -#define STORE_F_STORE_ATTR_INFO_SET_NUMBER 149 -#define STORE_F_STORE_ATTR_INFO_SET_SHA1STR 150 -#define STORE_F_STORE_CERTIFICATE 170 -#define STORE_F_STORE_CTRL 161 -#define STORE_F_STORE_DELETE_ARBITRARY 158 -#define STORE_F_STORE_DELETE_CERTIFICATE 102 -#define STORE_F_STORE_DELETE_CRL 103 -#define STORE_F_STORE_DELETE_NUMBER 104 -#define STORE_F_STORE_DELETE_PRIVATE_KEY 105 -#define STORE_F_STORE_DELETE_PUBLIC_KEY 106 -#define STORE_F_STORE_GENERATE_CRL 107 -#define STORE_F_STORE_GENERATE_KEY 108 -#define STORE_F_STORE_GET_ARBITRARY 159 -#define STORE_F_STORE_GET_CERTIFICATE 109 -#define STORE_F_STORE_GET_CRL 110 -#define STORE_F_STORE_GET_NUMBER 111 -#define STORE_F_STORE_GET_PRIVATE_KEY 112 -#define STORE_F_STORE_GET_PUBLIC_KEY 113 -#define STORE_F_STORE_LIST_CERTIFICATE_END 114 -#define STORE_F_STORE_LIST_CERTIFICATE_ENDP 153 -#define STORE_F_STORE_LIST_CERTIFICATE_NEXT 115 -#define STORE_F_STORE_LIST_CERTIFICATE_START 116 -#define STORE_F_STORE_LIST_CRL_END 117 -#define STORE_F_STORE_LIST_CRL_ENDP 154 -#define STORE_F_STORE_LIST_CRL_NEXT 118 -#define STORE_F_STORE_LIST_CRL_START 119 -#define STORE_F_STORE_LIST_PRIVATE_KEY_END 120 -#define STORE_F_STORE_LIST_PRIVATE_KEY_ENDP 155 -#define STORE_F_STORE_LIST_PRIVATE_KEY_NEXT 121 -#define STORE_F_STORE_LIST_PRIVATE_KEY_START 122 -#define STORE_F_STORE_LIST_PUBLIC_KEY_END 123 -#define STORE_F_STORE_LIST_PUBLIC_KEY_ENDP 156 -#define STORE_F_STORE_LIST_PUBLIC_KEY_NEXT 124 -#define STORE_F_STORE_LIST_PUBLIC_KEY_START 125 -#define STORE_F_STORE_MODIFY_ARBITRARY 162 -#define STORE_F_STORE_MODIFY_CERTIFICATE 163 -#define STORE_F_STORE_MODIFY_CRL 164 -#define STORE_F_STORE_MODIFY_NUMBER 165 -#define STORE_F_STORE_MODIFY_PRIVATE_KEY 166 -#define STORE_F_STORE_MODIFY_PUBLIC_KEY 167 -#define STORE_F_STORE_NEW_ENGINE 133 -#define STORE_F_STORE_NEW_METHOD 132 -#define STORE_F_STORE_PARSE_ATTRS_END 151 -#define STORE_F_STORE_PARSE_ATTRS_ENDP 172 -#define STORE_F_STORE_PARSE_ATTRS_NEXT 152 -#define STORE_F_STORE_PARSE_ATTRS_START 171 -#define STORE_F_STORE_REVOKE_CERTIFICATE 129 -#define STORE_F_STORE_REVOKE_PRIVATE_KEY 130 -#define STORE_F_STORE_REVOKE_PUBLIC_KEY 131 -#define STORE_F_STORE_STORE_ARBITRARY 157 -#define STORE_F_STORE_STORE_CERTIFICATE 100 -#define STORE_F_STORE_STORE_CRL 101 -#define STORE_F_STORE_STORE_NUMBER 126 -#define STORE_F_STORE_STORE_PRIVATE_KEY 127 -#define STORE_F_STORE_STORE_PUBLIC_KEY 128 - -/* Reason codes. */ -#define STORE_R_ALREADY_HAS_A_VALUE 127 -#define STORE_R_FAILED_DELETING_ARBITRARY 132 -#define STORE_R_FAILED_DELETING_CERTIFICATE 100 -#define STORE_R_FAILED_DELETING_KEY 101 -#define STORE_R_FAILED_DELETING_NUMBER 102 -#define STORE_R_FAILED_GENERATING_CRL 103 -#define STORE_R_FAILED_GENERATING_KEY 104 -#define STORE_R_FAILED_GETTING_ARBITRARY 133 -#define STORE_R_FAILED_GETTING_CERTIFICATE 105 -#define STORE_R_FAILED_GETTING_KEY 106 -#define STORE_R_FAILED_GETTING_NUMBER 107 -#define STORE_R_FAILED_LISTING_CERTIFICATES 108 -#define STORE_R_FAILED_LISTING_KEYS 109 -#define STORE_R_FAILED_MODIFYING_ARBITRARY 138 -#define STORE_R_FAILED_MODIFYING_CERTIFICATE 139 -#define STORE_R_FAILED_MODIFYING_CRL 140 -#define STORE_R_FAILED_MODIFYING_NUMBER 141 -#define STORE_R_FAILED_MODIFYING_PRIVATE_KEY 142 -#define STORE_R_FAILED_MODIFYING_PUBLIC_KEY 143 -#define STORE_R_FAILED_REVOKING_CERTIFICATE 110 -#define STORE_R_FAILED_REVOKING_KEY 111 -#define STORE_R_FAILED_STORING_ARBITRARY 134 -#define STORE_R_FAILED_STORING_CERTIFICATE 112 -#define STORE_R_FAILED_STORING_KEY 113 -#define STORE_R_FAILED_STORING_NUMBER 114 -#define STORE_R_NOT_IMPLEMENTED 128 -#define STORE_R_NO_CONTROL_FUNCTION 144 -#define STORE_R_NO_DELETE_ARBITRARY_FUNCTION 135 -#define STORE_R_NO_DELETE_NUMBER_FUNCTION 115 -#define STORE_R_NO_DELETE_OBJECT_FUNCTION 116 -#define STORE_R_NO_GENERATE_CRL_FUNCTION 117 -#define STORE_R_NO_GENERATE_OBJECT_FUNCTION 118 -#define STORE_R_NO_GET_OBJECT_ARBITRARY_FUNCTION 136 -#define STORE_R_NO_GET_OBJECT_FUNCTION 119 -#define STORE_R_NO_GET_OBJECT_NUMBER_FUNCTION 120 -#define STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION 131 -#define STORE_R_NO_LIST_OBJECT_END_FUNCTION 121 -#define STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION 122 -#define STORE_R_NO_LIST_OBJECT_START_FUNCTION 123 -#define STORE_R_NO_MODIFY_OBJECT_FUNCTION 145 -#define STORE_R_NO_REVOKE_OBJECT_FUNCTION 124 -#define STORE_R_NO_STORE 129 -#define STORE_R_NO_STORE_OBJECT_ARBITRARY_FUNCTION 137 -#define STORE_R_NO_STORE_OBJECT_FUNCTION 125 -#define STORE_R_NO_STORE_OBJECT_NUMBER_FUNCTION 126 -#define STORE_R_NO_VALUE 130 - -#ifdef __cplusplus -} -#endif -#endif diff --git a/libs/win32/openssl/include/symhacks.h b/libs/win32/openssl/include/symhacks.h index 403f592dcd..07a412f845 100644 --- a/libs/win32/openssl/include/symhacks.h +++ b/libs/win32/openssl/include/symhacks.h @@ -193,17 +193,17 @@ #undef SSL_CTX_set_srp_username_callback #define SSL_CTX_set_srp_username_callback SSL_CTX_set_srp_un_cb #undef ssl_add_clienthello_use_srtp_ext -#define ssl_add_clienthello_use_srtp_ext ssl_add_clihello_use_srtp_ext +#define ssl_add_clienthello_use_srtp_ext ssl_add_clihello_use_srtp_ext #undef ssl_add_serverhello_use_srtp_ext -#define ssl_add_serverhello_use_srtp_ext ssl_add_serhello_use_srtp_ext +#define ssl_add_serverhello_use_srtp_ext ssl_add_serhello_use_srtp_ext #undef ssl_parse_clienthello_use_srtp_ext -#define ssl_parse_clienthello_use_srtp_ext ssl_parse_clihello_use_srtp_ext +#define ssl_parse_clienthello_use_srtp_ext ssl_parse_clihello_use_srtp_ext #undef ssl_parse_serverhello_use_srtp_ext -#define ssl_parse_serverhello_use_srtp_ext ssl_parse_serhello_use_srtp_ext +#define ssl_parse_serverhello_use_srtp_ext ssl_parse_serhello_use_srtp_ext #undef SSL_CTX_set_next_protos_advertised_cb -#define SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_protos_adv_cb +#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 +#define SSL_CTX_set_next_proto_select_cb SSL_CTX_set_next_proto_sel_cb /* Hack some long ENGINE names */ #undef ENGINE_get_default_BN_mod_exp_crt @@ -316,8 +316,6 @@ #define ec_GFp_simple_point_set_to_infinity ec_GFp_simple_pt_set_to_inf #undef ec_GFp_simple_points_make_affine #define ec_GFp_simple_points_make_affine ec_GFp_simple_pts_make_affine -#undef ec_GFp_simple_group_get_curve_GFp -#define ec_GFp_simple_group_get_curve_GFp ec_GFp_simple_grp_get_curve_GFp #undef ec_GFp_simple_set_Jprojective_coordinates_GFp #define ec_GFp_simple_set_Jprojective_coordinates_GFp \ ec_GFp_smp_set_Jproj_coords_GFp diff --git a/libs/win32/openssl/include/tmdiff.h b/libs/win32/openssl/include/tmdiff.h deleted file mode 100644 index 8eb8256a4f..0000000000 --- a/libs/win32/openssl/include/tmdiff.h +++ /dev/null @@ -1,2 +0,0 @@ -/* file generated by 'generate-global-headers.bat' */ -#include "..\../crypto/tmdiff.h" diff --git a/libs/win32/openssl/libeay32.2010.vcxproj b/libs/win32/openssl/libeay32.2010.vcxproj index 23119ab5c1..6cb7d673de 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.1c\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1c\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\" /C /Y /S + 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 /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\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) 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.1c\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1c\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def true true MachineX86 @@ -115,11 +115,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1c\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\" /C /Y /S + 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 @@ -129,7 +129,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\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) 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.1c\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1c\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def true true MachineX64 @@ -151,18 +151,18 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1c\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\" /C /Y /S + 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 /Gs0 %(AdditionalOptions) Full AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\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) 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.1c\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1c\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def true true MachineX86 @@ -185,11 +185,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1c\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\" /C /Y /S + 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 @@ -199,7 +199,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) Full AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\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) 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.1c\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1c\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def true true MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/win32/openssl/libeay32.2010.vcxproj.filters b/libs/win32/openssl/libeay32.2010.vcxproj.filters index 594e7558c4..b72363f920 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\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 ae276a866a..b74e567116 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.1c\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1c\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\" /C /Y /S + 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 /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\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) 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.1c\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1c\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def true true MachineX86 @@ -119,11 +119,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1c\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\" /C /Y /S + 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 @@ -133,7 +133,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\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) 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.1c\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1c\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def true true MachineX64 @@ -155,18 +155,18 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1c\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\" /C /Y /S + 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 /Gs0 %(AdditionalOptions) Full AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\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) 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.1c\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1c\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def true true MachineX86 @@ -189,11 +189,11 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ - copy /Y "$(ProjectDir)opensslconf.h" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\opensslconf.h" -copy /Y "$(ProjectDir)applink.c" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\applink.c" -copy /Y "$(ProjectDir)buildinf.h" "$(ProjectDir)..\..\openssl-1.0.1c\crypto\buildinf.h" -copy /Y "$(ProjectDir)libeay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\libeay32.def" -if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$(ProjectDir)\include\*.*" "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\" /C /Y /S + 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 @@ -203,7 +203,7 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ /Gs0 %(AdditionalOptions) Full AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c\crypto\aes;..\..\openssl-1.0.1c\crypto\asn1;..\..\openssl-1.0.1c\crypto\bf;..\..\openssl-1.0.1c\crypto\bio;..\..\openssl-1.0.1c\crypto\bn;..\..\openssl-1.0.1c\crypto\buffer;..\..\openssl-1.0.1c\crypto\camellia;..\..\openssl-1.0.1c\crypto\cast;..\..\openssl-1.0.1c\crypto\cms;..\..\openssl-1.0.1c\crypto\comp;..\..\openssl-1.0.1c\crypto\conf;..\..\openssl-1.0.1c\crypto\des;..\..\openssl-1.0.1c\crypto\dh;..\..\openssl-1.0.1c\crypto\dsa;..\..\openssl-1.0.1c\crypto\dso;..\..\openssl-1.0.1c\crypto\ec;..\..\openssl-1.0.1c\crypto\ecdh;..\..\openssl-1.0.1c\crypto\ecdsa;..\..\openssl-1.0.1c\crypto\engine;..\..\openssl-1.0.1c\crypto\err;..\..\openssl-1.0.1c\crypto\evp;..\..\openssl-1.0.1c\crypto\modes;..\..\openssl-1.0.1c\ms;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\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) 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,678 +217,679 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$ ws2_32.lib;%(AdditionalDependencies) - $(ProjectDir)..\..\openssl-1.0.1c\libeay32.def + $(ProjectDir)..\..\openssl-1.0.1f\libeay32.def true true MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/win32/openssl/libeay32.2012.vcxproj.filters b/libs/win32/openssl/libeay32.2012.vcxproj.filters index 0ec33e602d..b72363f920 100644 --- a/libs/win32/openssl/libeay32.2012.vcxproj.filters +++ b/libs/win32/openssl/libeay32.2012.vcxproj.filters @@ -185,1995 +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.def b/libs/win32/openssl/libeay32.def index f98701635b..a6ddea5fe6 100644 --- a/libs/win32/openssl/libeay32.def +++ b/libs/win32/openssl/libeay32.def @@ -745,6 +745,7 @@ EXPORTS CRYPTO_mem_leaks @190 CRYPTO_mem_leaks_cb @191 CRYPTO_mem_leaks_fp @192 + CRYPTO_memcmp @3906 CRYPTO_new_ex_data @1027 CRYPTO_nistcts128_decrypt @4645 CRYPTO_nistcts128_decrypt_block @4634 @@ -1467,6 +1468,7 @@ EXPORTS EVP_SealInit @288 EVP_SignFinal @289 EVP_VerifyFinal @290 + EVP_add_alg_module @4077 EVP_add_cipher @292 EVP_add_digest @293 EVP_aes_128_cbc @2927 diff --git a/libs/win32/openssl/openssl.2010.vcxproj b/libs/win32/openssl/openssl.2010.vcxproj index fcc3f9e41c..800b451809 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.1c\include;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(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.1c\include;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(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.1c\include;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(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.1c\include;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(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 293b866e4b..f415047bdc 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 3796388c02..d19f0a88ab 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.1c\include;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(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.1c\include;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(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.1c\include;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(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.1c\include;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f;%(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 293b866e4b..f415047bdc 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 18b05a6d66..12410c43ef 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.1c\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(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 @@ -107,13 +107,13 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(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 @@ -134,7 +134,7 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" X64 @@ -143,7 +143,7 @@ /Gs0 %(AdditionalOptions) Disabled AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(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 @@ -164,7 +164,7 @@ - copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1c\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" X64 @@ -173,7 +173,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(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 @@ -193,57 +193,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/libs/win32/openssl/ssleay32.2010.vcxproj.filters b/libs/win32/openssl/ssleay32.2010.vcxproj.filters index 5c2e2bfdd9..527c3a58fc 100644 --- a/libs/win32/openssl/ssleay32.2010.vcxproj.filters +++ b/libs/win32/openssl/ssleay32.2010.vcxproj.filters @@ -20,153 +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 b76afa5ba5..310a8691ff 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.1c\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(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.1c\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(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.1c\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" X64 @@ -149,7 +149,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(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.1c\ssleay32.def" + copy /Y "$(ProjectDir)ssleay32.def" "$(ProjectDir)..\..\openssl-1.0.1f\ssleay32.def" X64 @@ -180,7 +180,7 @@ /Gs0 %(AdditionalOptions) MaxSpeed AnySuitable - ..\..\openssl-1.0.1c\include;..\..\openssl-1.0.1c\crypto;..\..\openssl-1.0.1c;%(AdditionalIncludeDirectories) + ..\..\openssl-1.0.1f\include;..\..\openssl-1.0.1f\crypto;..\..\openssl-1.0.1f;%(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,57 +201,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/libs/win32/openssl/ssleay32.2012.vcxproj.filters b/libs/win32/openssl/ssleay32.2012.vcxproj.filters index 3b97d043dd..527c3a58fc 100644 --- a/libs/win32/openssl/ssleay32.2012.vcxproj.filters +++ b/libs/win32/openssl/ssleay32.2012.vcxproj.filters @@ -20,153 +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 041ff68ec6..1bd39b525c 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.1c\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.1f\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.1c\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.1f\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.1c\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.1f\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.1c\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.1f\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 fb962037cc..fbc38c2692 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.1c\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.1f\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.1c\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.1f\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.1c\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.1f\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.1c\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.1f\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 76e7eb0b29..854f48d3ef 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.1c\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.1f\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.1c\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.1f\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.1c\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.1f\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.1c\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.1f\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 631e4f783b..b643b781a2 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.1c\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.1f\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.1c\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.1f\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.1c\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.1f\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.1c\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.1f\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 227381f06d..47f3da525f 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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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.1c\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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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) 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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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.1c\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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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) 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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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.1c\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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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) 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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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.1c\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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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) 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 54afa46312..44f6608782 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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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.1c\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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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) _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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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.1c\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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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) _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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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.1c\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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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) _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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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.1c\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\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\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) _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