diff options
| author | Anatol Belski <ab@php.net> | 2017-06-09 23:48:25 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-06-09 23:48:25 +0200 |
| commit | b50fe893a7ae481f3a2bbd7fc06015c194389e91 (patch) | |
| tree | 52f4304808c29996683bfb825e436e04b55da18b /ext/openssl | |
| parent | e72970026d381ab250b5cc4f9e3ad5f0a384ddaf (diff) | |
| parent | 0fa40b054618317bfe5e076da614da27b4304fa4 (diff) | |
| download | php-git-b50fe893a7ae481f3a2bbd7fc06015c194389e91.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/openssl.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index e581d7dcc1..36be4b11dc 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -86,6 +86,14 @@ #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 @@ -5008,7 +5016,7 @@ PHP_FUNCTION(openssl_pkcs7_verify) goto clean_exit; } - in = BIO_new_file(filename, (flags & PKCS7_BINARY) ? "rb" : "r"); + in = BIO_new_file(filename, PHP_OPENSSL_BIO_MODE_R(flags)); if (in == NULL) { php_openssl_store_errors(); goto clean_exit; @@ -5120,7 +5128,7 @@ PHP_FUNCTION(openssl_pkcs7_encrypt) return; } - infile = BIO_new_file(infilename, (flags & PKCS7_BINARY) ? "rb" : "r"); + infile = BIO_new_file(infilename, PHP_OPENSSL_BIO_MODE_R(flags)); if (infile == NULL) { php_openssl_store_errors(); goto clean_exit; @@ -5278,7 +5286,7 @@ PHP_FUNCTION(openssl_pkcs7_sign) goto clean_exit; } - infile = BIO_new_file(infilename, (flags & PKCS7_BINARY) ? "rb" : "r"); + infile = BIO_new_file(infilename, PHP_OPENSSL_BIO_MODE_R(flags)); if (infile == NULL) { php_openssl_store_errors(); php_error_docref(NULL, E_WARNING, "error opening input file %s!", infilename); |