com php-src: Fixed bug #69197 (openssl_pkcs7_sign han dles default value incorrectly): NEWS ext/openssl /openssl.c
| From: | Daniel Lowrey | Date: | Fri, 06 Mar 2015 18:29:56 +0000 |
| Subject: | com php-src: Fixed bug #69197 (openssl_pkcs7_sign han dles default value incorrectly): NEWS ext/openssl /openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85298@lists.php.net to get a copy of this message | ||
Commit: 0928bad9ac9110a8a321c334444b7026bffad5f7
Author: Daniel Lowrey <rdlowrey@php.net> Fri, 6 Mar 2015 11:29:56 -0700
Parents: 469b5a9584b1647fdccb37b663dd076ba991d764
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0928bad9ac9110a8a321c334444b7026bffad5f7
Log:
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
Bugs:
https://bugs.php.net/69197
Changed paths:
M NEWS
M ext/openssl/openssl.c
Diff:
diff --git a/NEWS b/NEWS
index d248f86..dd1a80e 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@
- OpenSSL
. Fixed bugs #68853, #65137 (Buffered crypto stream data breaks IO polling
in stream_select() contexts) (Chris Wright)
+ . Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
+ (Daniel Lowrey)
- Core:
. Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index e78d3b1..1603009 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4279,7 +4279,7 @@ PHP_FUNCTION(openssl_pkcs7_sign)
char * outfilename; int outfilename_len;
char * extracertsfilename = NULL; int extracertsfilename_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ppZZa!|lp",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ppZZa!|lp!",
&infilename, &infilename_len, &outfilename, &outfilename_len,
&zcert, &zprivkey, &zheaders, &flags, &extracertsfilename,
&extracertsfilename_len) == FAILURE) {