Upgrade top Open SSL 1.0.1h

hmailserver/source/Server/hMailServer/hMailServer.vcproj

@@ -55,7 +55,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Libraries\boost_1_52_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1g\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
+				AdditionalIncludeDirectories="..\..\..\..\Libraries\boost_1_52_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;UNICODE;_UNICODE;BOOST_DATE_TIME_NO_LIB"
 				MinimalRebuild="false"
 				ExceptionHandling="2"
@@ -87,7 +87,7 @@
 				ShowProgress="0"
 				OutputFile="$(OutDir)/hMailServer.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\..\Libraries\boost_libs;&quot;..\..\..\..\Libraries\openssl-1.0.1g\libs&quot;;..\..\..\..\Libraries\pgsql8.2.4"
+				AdditionalLibraryDirectories="..\..\..\..\Libraries\boost_libs;&quot;..\..\..\..\Libraries\openssl-1.0.1h\libs&quot;;..\..\..\..\Libraries\pgsql8.2.4"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
@@ -160,7 +160,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP&#x0D;&#x0A;"
-				AdditionalIncludeDirectories="..\..\..\..\Libraries/boost_1_52_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1g\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
+				AdditionalIncludeDirectories="..\..\..\..\Libraries/boost_1_52_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
 				PreprocessorDefinitions="WIN32;_WINDOWS;UNICODE;_UNICODE;NDEBUG;BOOST_DATE_TIME_NO_LIB"
 				ExceptionHandling="2"
 				RuntimeLibrary="0"
@@ -189,7 +189,7 @@
 				AdditionalDependencies="libeay32.lib ssleay32.lib Adsiid.lib activeds.lib IPHlpAPI.lib Dnsapi.lib Ws2_32.lib libpq.lib"
 				OutputFile="$(OutDir)/hMailServer.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\..\Libraries\boost_libs;&quot;..\..\..\..\Libraries\openssl-1.0.1g\libs&quot;;..\..\..\..\Libraries\pgsql8.2.4"
+				AdditionalLibraryDirectories="..\..\..\..\Libraries\boost_libs;&quot;..\..\..\..\Libraries\openssl-1.0.1h\libs&quot;;..\..\..\..\Libraries\pgsql8.2.4"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -561,11 +561,11 @@
 						>
 					</File>
 					<File
-						RelativePath=".\InterfaceClient.rgs"
+						RelativePath="..\Com\InterfaceClient.rgs"
 						>
 					</File>
 					<File
-						RelativePath="..\Com\InterfaceClient.rgs"
+						RelativePath=".\InterfaceClient.rgs"
 						>
 					</File>
 					<File
@@ -1085,11 +1085,11 @@
 						>
 					</File>
 					<File
-						RelativePath="..\COM\InterfaceResult.rgs"
+						RelativePath="..\Com\InterfaceResult.rgs"
 						>
 					</File>
 					<File
-						RelativePath="..\Com\InterfaceResult.rgs"
+						RelativePath="..\COM\InterfaceResult.rgs"
 						>
 					</File>
 					<File
@@ -1382,23 +1382,23 @@
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceAntiSpam.rgs"
+							RelativePath="..\COM\InterfaceAntiSpam.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceAntiSpam.rgs"
+							RelativePath=".\InterfaceAntiSpam.rgs"
 							>
 						</File>
 						<File
 							RelativePath="..\COM\InterfaceBackup.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceBlockedAttachment.rgs"
+							RelativePath=".\InterfaceBlockedAttachment.rgs"
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceBlockedAttachment.rgs"
+							RelativePath="..\COM\InterfaceBlockedAttachment.rgs"
 							>
 						</File>
 						<File
@@ -1422,19 +1422,19 @@
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceGreyListingWhiteAddress.rgs"
+							RelativePath="..\COM\InterfaceGreyListingWhiteAddress.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceGreyListingWhiteAddress.rgs"
+							RelativePath=".\InterfaceGreyListingWhiteAddress.rgs"
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceGreyListingWhiteAddresses.rgs"
+							RelativePath="..\COM\InterfaceGreyListingWhiteAddresses.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceGreyListingWhiteAddresses.rgs"
+							RelativePath=".\InterfaceGreyListingWhiteAddresses.rgs"
 							>
 						</File>
 						<File
@@ -1446,11 +1446,11 @@
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceIMAPFolders.rgs"
+							RelativePath="..\COM\InterfaceIMAPFolders.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceIMAPFolders.rgs"
+							RelativePath=".\InterfaceIMAPFolders.rgs"
 							>
 						</File>
 						<File
@@ -1462,19 +1462,19 @@
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceServerMessage.rgs"
+							RelativePath="..\COM\InterfaceServerMessage.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceServerMessage.rgs"
+							RelativePath=".\InterfaceServerMessage.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceServerMessages.rgs"
+							RelativePath=".\InterfaceServerMessages.rgs"
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceServerMessages.rgs"
+							RelativePath="..\COM\InterfaceServerMessages.rgs"
 							>
 						</File>
 						<File
@@ -1486,19 +1486,19 @@
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceTCPIPPort.rgs"
+							RelativePath="..\COM\InterfaceTCPIPPort.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceTCPIPPort.rgs"
+							RelativePath=".\InterfaceTCPIPPort.rgs"
 							>
 						</File>
 						<File
-							RelativePath=".\InterfaceTCPIPPorts.rgs"
+							RelativePath="..\COM\InterfaceTCPIPPorts.rgs"
 							>
 						</File>
 						<File
-							RelativePath="..\COM\InterfaceTCPIPPorts.rgs"
+							RelativePath=".\InterfaceTCPIPPorts.rgs"
 							>
 						</File>
 						<File

libraries/openssl-1.0.1g/include/openssl/opensslv.h → libraries/openssl-1.0.1h/include/openssl/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	0x1000107fL
+#define OPENSSL_VERSION_NUMBER	0x1000108fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g-fips 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h-fips 5 Jun 2014"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h 5 Jun 2014"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 

libraries/openssl-1.0.1g/include/openssl/pkcs7.h → libraries/openssl-1.0.1h/include/openssl/pkcs7.h

@@ -453,6 +453,7 @@ void ERR_load_PKCS7_strings(void);
 #define PKCS7_R_ERROR_SETTING_CIPHER			 121
 #define PKCS7_R_INVALID_MIME_TYPE			 131
 #define PKCS7_R_INVALID_NULL_POINTER			 143
+#define PKCS7_R_INVALID_SIGNED_DATA_TYPE		 155
 #define PKCS7_R_MIME_NO_CONTENT_TYPE			 132
 #define PKCS7_R_MIME_PARSE_ERROR			 133
 #define PKCS7_R_MIME_SIG_PARSE_ERROR			 134

libraries/openssl-1.0.1g/include/openssl/ssl.h → libraries/openssl-1.0.1h/include/openssl/ssl.h

@@ -553,7 +553,7 @@ struct ssl_session_st
 /* Allow initial connection to servers that don't support RI */
 #define SSL_OP_LEGACY_SERVER_CONNECT			0x00000004L
 #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L
-#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		0x00000010L
+#define SSL_OP_TLSEXT_PADDING				0x00000010L
 #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER		0x00000020L
 #define SSL_OP_SAFARI_ECDHE_ECDSA_BUG			0x00000040L
 #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG			0x00000080L
@@ -562,6 +562,8 @@ struct ssl_session_st
 
 /* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
 #define SSL_OP_MSIE_SSLV2_RSA_PADDING			0x0
+/* Refers to ancient SSLREF and SSLv2, retained for compatibility */
+#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		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)

libraries/openssl-1.0.1g/include/openssl/ssl3.h → libraries/openssl-1.0.1h/include/openssl/ssl3.h

@@ -388,6 +388,7 @@ typedef struct ssl3_buffer_st
 #define TLS1_FLAGS_TLS_PADDING_BUG		0x0008
 #define TLS1_FLAGS_SKIP_CERT_VERIFY		0x0010
 #define TLS1_FLAGS_KEEP_HANDSHAKE		0x0020
+#define SSL3_FLAGS_CCS_OK			0x0080
 
 /* SSL3_FLAGS_SGC_RESTART_DONE is set when we
  * restart a handshake because of MS SGC and so prevents us