Merge pull request livecode#3775 from livecodefraser/bugfix-17174

livecodefraser · livecodefraser · commit 14d025b8d36f · 2016-03-21T14:31:38.000Z
Use the system certificate store for Win32 server SSL verification
diff --git a/docs/notes/bugfix-17174.md b/docs/notes/bugfix-17174.md
@@ -0,0 +1 @@
+# Use the system certificate store for Win32 server SSL verification
diff --git a/engine/src/mcssl.cpp b/engine/src/mcssl.cpp
@@ -774,7 +774,7 @@ bool load_ssl_ctx_certs_from_file(SSL_CTX *p_ssl_ctx, const char *p_path)
 	return SSL_CTX_load_verify_locations(p_ssl_ctx, p_path, NULL) != 0;
 }
 
-#if defined(TARGET_PLATFORM_MACOS_X) || defined(TARGET_PLATFORM_WINDOWS)
+#if defined(TARGET_PLATFORM_MACOS_X) || defined(_WIN32)
 
 void free_x509_stack(STACK_OF(X509) *p_stack)
 {
@@ -958,7 +958,7 @@ bool export_system_crl_stack(STACK_OF(X509_CRL) *&r_crls)
 	return true;
 }
 
-#elif defined(TARGET_PLATFORM_WINDOWS)
+#elif defined(_WIN32)
 
 bool export_system_root_cert_stack(STACK_OF(X509) *&r_cert_stack)
 {
@@ -981,11 +981,7 @@ bool export_system_root_cert_stack(STACK_OF(X509) *&r_cert_stack)
 		if (t_valid)
 		{
 			X509 *t_x509 = NULL;
-#if defined(TARGET_PLATFORM_WINDOWS)
 			const unsigned char *t_data = (const unsigned char*) t_cert_enum->pbCertEncoded;
-#else
-			unsigned char *t_data = t_cert_enum->pbCertEncoded;
-#endif
 			long t_len = t_cert_enum->cbCertEncoded;
 
 			t_success = NULL != (t_x509 = d2i_X509(NULL, &t_data, t_len));
@@ -1027,11 +1023,7 @@ bool export_system_crl_stack(STACK_OF(X509_CRL) *&r_crls)
 		if (t_valid)
 		{
 			X509_CRL *t_crl = NULL;
-#if defined(TARGET_PLATFORM_WINDOWS)
 			const unsigned char *t_data = (const unsigned char*)t_crl_enum->pbCrlEncoded;
-#else
-			unsigned char *t_data = t_crl_enum->pbCrlEncoded;
-#endif
 			long t_len = t_crl_enum->cbCrlEncoded;
 
 			t_success = NULL != (t_crl = d2i_X509_CRL(NULL, &t_data, t_len));
diff --git a/engine/src/srvspec.cpp b/engine/src/srvspec.cpp
@@ -351,7 +351,7 @@ static void url_execute(MCStringRef p_url, MCUrlExecuteCallback p_callback, void
 		// IM-2014-07-28: [[ Bug 12822 ]] Override default ssl certificate loading.
 		if (curl_easy_setopt(t_url_handle, CURLOPT_SSL_VERIFYPEER, 1) != CURLE_OK ||
 			curl_easy_setopt(t_url_handle, CURLOPT_SSL_VERIFYHOST, 2) != CURLE_OK
-#if TARGET_PLATFORM_LINUX
+#if defined(_LINUX) || defined(_WIN32)
             // These options are not supported when using the OSX system libcurl
             // as it uses the OS' certificate database and not a cert file.
 			|| curl_easy_setopt(t_url_handle, CURLOPT_CAINFO, nil) != CURLE_OK

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Use the system certificate store for Win32 server SSL verification`
Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ bool load_ssl_ctx_certs_from_file(SSL_CTX p_ssl_ctx, const char p_path)`
`774`	`774`	`return SSL_CTX_load_verify_locations(p_ssl_ctx, p_path, NULL) != 0;`
`775`	`775`	`}`
`776`	`776`
`777`		`-#if defined(TARGET_PLATFORM_MACOS_X) \|\| defined(TARGET_PLATFORM_WINDOWS)`
	`777`	`+#if defined(TARGET_PLATFORM_MACOS_X) \|\| defined(_WIN32)`
`778`	`778`
`779`	`779`	`void free_x509_stack(STACK_OF(X509) *p_stack)`
`780`	`780`	`{`
`@@ -958,7 +958,7 @@ bool export_system_crl_stack(STACK_OF(X509_CRL) *&r_crls)`
`958`	`958`	`return true;`
`959`	`959`	`}`
`960`	`960`
`961`		`-#elif defined(TARGET_PLATFORM_WINDOWS)`
	`961`	`+#elif defined(_WIN32)`
`962`	`962`
`963`	`963`	`bool export_system_root_cert_stack(STACK_OF(X509) *&r_cert_stack)`
`964`	`964`	`{`
`@@ -981,11 +981,7 @@ bool export_system_root_cert_stack(STACK_OF(X509) *&r_cert_stack)`
`981`	`981`	`if (t_valid)`
`982`	`982`	`{`
`983`	`983`	`X509 *t_x509 = NULL;`
`984`		`-#if defined(TARGET_PLATFORM_WINDOWS)`
`985`	`984`	`const unsigned char t_data = (const unsigned char) t_cert_enum->pbCertEncoded;`
`986`		`-#else`
`987`		`- unsigned char *t_data = t_cert_enum->pbCertEncoded;`
`988`		`-#endif`
`989`	`985`	`long t_len = t_cert_enum->cbCertEncoded;`
`990`	`986`
`991`	`987`	`t_success = NULL != (t_x509 = d2i_X509(NULL, &t_data, t_len));`
`@@ -1027,11 +1023,7 @@ bool export_system_crl_stack(STACK_OF(X509_CRL) *&r_crls)`
`1027`	`1023`	`if (t_valid)`
`1028`	`1024`	`{`
`1029`	`1025`	`X509_CRL *t_crl = NULL;`
`1030`		`-#if defined(TARGET_PLATFORM_WINDOWS)`
`1031`	`1026`	`const unsigned char t_data = (const unsigned char)t_crl_enum->pbCrlEncoded;`
`1032`		`-#else`
`1033`		`- unsigned char *t_data = t_crl_enum->pbCrlEncoded;`
`1034`		`-#endif`
`1035`	`1027`	`long t_len = t_crl_enum->cbCrlEncoded;`
`1036`	`1028`
`1037`	`1029`	`t_success = NULL != (t_crl = d2i_X509_CRL(NULL, &t_data, t_len));`