Updated to OpenSSL 1.0.1f in Windows build

01e3eb45 · Peter Olsson · b33d50c0 · 01e3eb45 · 01e3eb45 · 01e3eb45
--- a/libs/win32/Download OPENSSL.2010.vcxproj
+++ b/libs/win32/Download OPENSSL.2010.vcxproj
@@ -51,11 +51,11 @@
    <CustomBuild Include="OPENSSL\cleancount">
      <FileType>Document</FileType>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading OPENSSL</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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).."
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\OPENSSL;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading OPENSSL</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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).."
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\OPENSSL;%(Outputs)</Outputs>
    </CustomBuild>

--- a/libs/win32/Download OPENSSL.2012.vcxproj
+++ b/libs/win32/Download OPENSSL.2012.vcxproj
@@ -53,11 +53,11 @@
    <CustomBuild Include="cleancount">
      <FileType>Document</FileType>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading OPENSSL</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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).."
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\OPENSSL;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading OPENSSL</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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).."
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\OPENSSL;%(Outputs)</Outputs>
    </CustomBuild>

--- a/libs/win32/curl/curllib.2010.vcxproj
+++ b/libs/win32/curl/curllib.2010.vcxproj
@@ -80,7 +80,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -111,7 +111,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -141,7 +141,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -171,7 +171,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

--- a/libs/win32/curl/curllib.2012.vcxproj
+++ b/libs/win32/curl/curllib.2012.vcxproj
@@ -84,7 +84,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -115,7 +115,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -145,7 +145,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -175,7 +175,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

--- a/libs/win32/iksemel/iksemel.2010.vcxproj
+++ b/libs/win32/iksemel/iksemel.2010.vcxproj
@@ -69,7 +69,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +79,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <WarningLevel>TurnOffAllWarnings</WarningLevel>
@@ -91,7 +91,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +104,7 @@
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <WarningLevel>TurnOffAllWarnings</WarningLevel>

--- a/libs/win32/iksemel/iksemel.2012.vcxproj
+++ b/libs/win32/iksemel/iksemel.2012.vcxproj
@@ -73,7 +73,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -83,7 +83,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <WarningLevel>TurnOffAllWarnings</WarningLevel>
@@ -95,7 +95,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -108,7 +108,7 @@
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\iksemel\include;.;..\..\openssl-1.0.1f\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <WarningLevel>TurnOffAllWarnings</WarningLevel>

--- 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);

--- 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.

--- 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 <openssl/buffer.h>
 #include <openssl/pqueue.h>
@@ -72,8 +72,12 @@
 #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
 #include <sys/timeval.h>
 #else
+#if defined(OPENSSL_SYS_VXWORKS)
+#include <sys/times.h>
+#else
 #include <sys/time.h>
 #endif
+#endif

 #ifdef  __cplusplus
 extern "C" {

--- 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.

--- 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

--- a/libs/win32/openssl/include/md2.h
+++ b/libs/win32/openssl/include/md2.h
-/* 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/opensslconf.h> /* OPENSSL_NO_MD2, MD2_INT */
-#ifdef OPENSSL_NO_MD2
-#error MD2 is disabled.
-#endif
-#include <stddef.h>
-
-#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
--- a/libs/win32/openssl/include/o_dir.h
+++ b/libs/win32/openssl/include/o_dir.h
-/* 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 <richard@levitte.org>
- * 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 */
--- a/libs/win32/openssl/include/o_str.h
+++ b/libs/win32/openssl/include/o_str.h
-/* 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 <stddef.h>		/* 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
--- 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


--- a/libs/win32/openssl/include/pq_compat.h
+++ b/libs/win32/openssl/include/pq_compat.h
-/* file generated by 'generate-global-headers.bat' */  
-#include "..\../crypto/pqueue/pq_compat.h"                
--- 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

--- a/libs/win32/openssl/include/rc5.h
+++ b/libs/win32/openssl/include/rc5.h
-/* 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/opensslconf.h> /* 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
--- 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

--- 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

--- 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



--- a/libs/win32/openssl/include/store.h
+++ b/libs/win32/openssl/include/store.h
--- 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

--- a/libs/win32/openssl/include/tmdiff.h
+++ b/libs/win32/openssl/include/tmdiff.h
-/* file generated by 'generate-global-headers.bat' */  
-#include "..\../crypto/tmdiff.h"                
--- a/libs/win32/openssl/libeay32.2010.vcxproj
+++ b/libs/win32/openssl/libeay32.2010.vcxproj
--- a/libs/win32/openssl/libeay32.2010.vcxproj.filters
+++ b/libs/win32/openssl/libeay32.2010.vcxproj.filters
--- a/libs/win32/openssl/libeay32.2012.vcxproj
+++ b/libs/win32/openssl/libeay32.2012.vcxproj
--- a/libs/win32/openssl/libeay32.2012.vcxproj.filters
+++ b/libs/win32/openssl/libeay32.2012.vcxproj.filters
--- 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

--- a/libs/win32/openssl/openssl.2010.vcxproj
+++ b/libs/win32/openssl/openssl.2010.vcxproj
--- a/libs/win32/openssl/openssl.2010.vcxproj.filters
+++ b/libs/win32/openssl/openssl.2010.vcxproj.filters
@@ -17,165 +17,165 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\app_rand.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\app_rand.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\apps.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\apps.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\asn1pars.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\asn1pars.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ca.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ca.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ciphers.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ciphers.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\cms.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\cms.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\crl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\crl.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\crl2p7.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\crl2p7.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dgst.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dgst.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dh.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dh.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dhparam.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dhparam.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dsa.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dsaparam.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dsaparam.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ec.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ec.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ecparam.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ecparam.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\enc.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\engine.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\engine.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\errstr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\errstr.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\gendh.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\gendh.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\gendsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\gendsa.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\genpkey.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\genpkey.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\genrsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\genrsa.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\nseq.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\nseq.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ocsp.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ocsp.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\openssl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\openssl.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\passwd.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\passwd.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkcs12.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkcs12.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkcs7.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkcs7.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkcs8.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkcs8.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkey.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkey.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkeyparam.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkeyparam.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkeyutl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkeyutl.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\prime.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\prime.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\rand.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\rand.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\req.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\req.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\rsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\rsa.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\rsautl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\rsautl.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_cb.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_cb.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_client.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_client.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_server.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_server.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_socket.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_socket.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_time.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_time.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\sess_id.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\sess_id.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\smime.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\smime.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\speed.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\speed.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\spkac.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\spkac.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ts.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ts.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\verify.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\verify.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\version.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\version.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\winrand.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\winrand.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\x509.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\x509.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\srp.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\srp.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1c\apps\apps.h">
+    <ClInclude Include="..\..\openssl-1.0.1f\apps\apps.h">
      <Filter>Header Files\apps</Filter>
    </ClInclude>
  </ItemGroup>

--- a/libs/win32/openssl/openssl.2012.vcxproj
+++ b/libs/win32/openssl/openssl.2012.vcxproj
--- a/libs/win32/openssl/openssl.2012.vcxproj.filters
+++ b/libs/win32/openssl/openssl.2012.vcxproj.filters
@@ -17,165 +17,165 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\app_rand.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\app_rand.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\apps.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\apps.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\asn1pars.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\asn1pars.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ca.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ca.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ciphers.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ciphers.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\cms.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\cms.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\crl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\crl.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\crl2p7.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\crl2p7.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dgst.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dgst.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dh.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dh.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dhparam.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dhparam.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dsa.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\dsaparam.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\dsaparam.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ec.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ec.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ecparam.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ecparam.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\enc.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\engine.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\engine.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\errstr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\errstr.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\gendh.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\gendh.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\gendsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\gendsa.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\genpkey.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\genpkey.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\genrsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\genrsa.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\nseq.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\nseq.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ocsp.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ocsp.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\openssl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\openssl.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\passwd.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\passwd.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkcs12.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkcs12.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkcs7.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkcs7.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkcs8.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkcs8.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkey.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkey.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkeyparam.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkeyparam.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\pkeyutl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\pkeyutl.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\prime.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\prime.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\rand.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\rand.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\req.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\req.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\rsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\rsa.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\rsautl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\rsautl.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_cb.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_cb.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_client.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_client.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_server.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_server.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_socket.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_socket.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\s_time.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\s_time.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\sess_id.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\sess_id.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\smime.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\smime.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\speed.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\speed.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\spkac.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\spkac.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\ts.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\ts.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\verify.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\verify.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\version.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\version.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\winrand.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\winrand.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\x509.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\x509.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\apps\srp.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\apps\srp.c">
      <Filter>Source Files\apps</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1c\apps\apps.h">
+    <ClInclude Include="..\..\openssl-1.0.1f\apps\apps.h">
      <Filter>Header Files\apps</Filter>
    </ClInclude>
  </ItemGroup>

--- a/libs/win32/openssl/ssleay32.2010.vcxproj
+++ b/libs/win32/openssl/ssleay32.2010.vcxproj
--- a/libs/win32/openssl/ssleay32.2010.vcxproj.filters
+++ b/libs/win32/openssl/ssleay32.2010.vcxproj.filters
@@ -20,153 +20,156 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\bio_ssl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\bio_ssl.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_both.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_both.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_enc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_pkt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_pkt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\kssl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\kssl.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_pkt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_pkt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_enc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_pkt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_pkt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_both.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_both.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_enc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_pkt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_pkt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_algs.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_algs.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_asn1.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_asn1.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_cert.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_cert.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_ciph.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_ciph.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_err.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_err.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_err2.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_err2.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_rsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_rsa.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_sess.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_sess.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_stat.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_stat.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_txt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_txt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_enc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_reneg.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_reneg.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\tls_srp.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\tls_srp.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_srtp.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_srtp.c">
+      <Filter>Source Files\ssl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_cbc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1a\crypto\cryptlib.h">
+    <ClInclude Include="..\..\openssl-1.0.1f\crypto\cryptlib.h">
      <Filter>Header Files\crypto</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1a\crypto\o_dir.h">
+    <ClInclude Include="..\..\openssl-1.0.1f\crypto\o_dir.h">
      <Filter>Header Files\crypto</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1a\crypto\evp\evp_locl.h">
+    <ClInclude Include="..\..\openssl-1.0.1f\crypto\evp\evp_locl.h">
      <Filter>Header Files\crypto\evp</Filter>
    </ClInclude>
  </ItemGroup>

--- a/libs/win32/openssl/ssleay32.2012.vcxproj
+++ b/libs/win32/openssl/ssleay32.2012.vcxproj
--- a/libs/win32/openssl/ssleay32.2012.vcxproj.filters
+++ b/libs/win32/openssl/ssleay32.2012.vcxproj.filters
@@ -20,153 +20,156 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\bio_ssl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\bio_ssl.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_both.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_both.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_enc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_pkt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_pkt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\kssl.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\kssl.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_pkt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_pkt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s23_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s23_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_enc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_pkt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_pkt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s2_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s2_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_both.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_both.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_enc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_pkt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_pkt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\s3_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_algs.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_algs.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_asn1.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_asn1.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_cert.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_cert.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_ciph.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_ciph.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_err.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_err.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_err2.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_err2.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_rsa.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_rsa.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_sess.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_sess.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_stat.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_stat.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\ssl_txt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\ssl_txt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_clnt.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_clnt.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_enc.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_enc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_lib.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_lib.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_meth.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_meth.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_reneg.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_reneg.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\t1_srvr.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\t1_srvr.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\tls_srp.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\tls_srp.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\openssl-1.0.1c\ssl\d1_srtp.c">
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\d1_srtp.c">
+      <Filter>Source Files\ssl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\openssl-1.0.1f\ssl\s3_cbc.c">
      <Filter>Source Files\ssl</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\openssl-1.0.1c\crypto\cryptlib.h">
+    <ClInclude Include="..\..\openssl-1.0.1f\crypto\cryptlib.h">
      <Filter>Header Files\crypto</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1c\crypto\o_dir.h">
+    <ClInclude Include="..\..\openssl-1.0.1f\crypto\o_dir.h">
      <Filter>Header Files\crypto</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\openssl-1.0.1c\crypto\evp\evp_locl.h">
+    <ClInclude Include="..\..\openssl-1.0.1f\crypto\evp\evp_locl.h">
      <Filter>Header Files\crypto\evp</Filter>
    </ClInclude>
  </ItemGroup>

--- 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"
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <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.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -114,7 +114,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <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.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -148,7 +148,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <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.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <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.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

--- 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"
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <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.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -119,7 +119,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <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.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <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.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -192,7 +192,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd"
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <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.1c\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

--- 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 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>
      </PrecompiledHeader>
@@ -83,7 +83,7 @@
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>
      </PrecompiledHeader>
@@ -98,7 +98,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>
      </PrecompiledHeader>
@@ -115,7 +115,7 @@
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>
      </PrecompiledHeader>

--- 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 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>
      </PrecompiledHeader>
@@ -105,7 +105,7 @@
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>
      </PrecompiledHeader>
@@ -122,7 +122,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>
      </PrecompiledHeader>
@@ -141,7 +141,7 @@
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>ABYSS_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>
      </PrecompiledHeader>

--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -88,7 +88,7 @@
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <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.1c\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>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)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -147,7 +147,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <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.1c\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>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)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -199,7 +199,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <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.1c\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>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)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -249,7 +249,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <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.1c\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>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)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>Use</PrecompiledHeader>

--- a/w32/Library/FreeSwitchCore.2012.vcxproj
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj
@@ -92,7 +92,7 @@
    </PreBuildEvent>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <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.1c\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -155,7 +155,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <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.1c\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -209,7 +209,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
    </PreBuildEvent>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <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.1c\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>Create</PrecompiledHeader>
@@ -260,7 +260,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <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.1c\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_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)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>Create</PrecompiledHeader>