Followup on 0ec147d for another place

weltling · weltling · commit e2b61eccb9ff · 2017-07-24T16:33:12.000+02:00
which requires also to move the macros into the header (cherry picked from commit b7eb2c0)
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -87,14 +87,6 @@
 #define HAVE_EVP_PKEY_EC 1
 #endif
 
-#ifdef PHP_WIN32
-#define PHP_OPENSSL_BIO_MODE_R(flags) (((flags) & PKCS7_BINARY) ? "rb" : "r")
-#define PHP_OPENSSL_BIO_MODE_W(flags) (((flags) & PKCS7_BINARY) ? "wb" : "w")
-#else
-#define PHP_OPENSSL_BIO_MODE_R(flags) "r"
-#define PHP_OPENSSL_BIO_MODE_W(flags) "w"
-#endif
-
 ZEND_DECLARE_MODULE_GLOBALS(openssl)
 
 /* FIXME: Use the openssl constants instead of
diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h
@@ -127,6 +127,15 @@ PHP_FUNCTION(openssl_spki_export);
 PHP_FUNCTION(openssl_spki_export_challenge);
 
 PHP_FUNCTION(openssl_get_cert_locations);
+
+#ifdef PHP_WIN32
+#define PHP_OPENSSL_BIO_MODE_R(flags) (((flags) & PKCS7_BINARY) ? "rb" : "r")
+#define PHP_OPENSSL_BIO_MODE_W(flags) (((flags) & PKCS7_BINARY) ? "wb" : "w")
+#else
+#define PHP_OPENSSL_BIO_MODE_R(flags) "r"
+#define PHP_OPENSSL_BIO_MODE_W(flags) "w"
+#endif
+
 #else
 
 #define phpext_openssl_ptr NULL
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -1170,7 +1170,7 @@ static int set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* {{{ */
 	}
 
 	convert_to_string_ex(zdhpath);
-	bio = BIO_new_file(Z_STRVAL_P(zdhpath), "r");
+	bio = BIO_new_file(Z_STRVAL_P(zdhpath), PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));
 
 	if (bio == NULL) {
 		php_error_docref(NULL, E_WARNING, "invalid dh_param");

Original file line number	Diff line number	Diff line change
`@@ -1170,7 +1170,7 @@ static int set_server_dh_param(php_stream * stream, SSL_CTX ctx) / {{{ */`
`1170`	`1170`	`}`
`1171`	`1171`
`1172`	`1172`	`convert_to_string_ex(zdhpath);`
`1173`		`- bio = BIO_new_file(Z_STRVAL_P(zdhpath), "r");`
	`1173`	`+ bio = BIO_new_file(Z_STRVAL_P(zdhpath), PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));`
`1174`	`1174`
`1175`	`1175`	`if (bio == NULL) {`
`1176`	`1176`	`php_error_docref(NULL, E_WARNING, "invalid dh_param");`