summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lowrey <rdlowrey@php.net>2015-03-06 11:29:56 -0700
committerDaniel Lowrey <rdlowrey@php.net>2015-03-06 11:29:56 -0700
commit0928bad9ac9110a8a321c334444b7026bffad5f7 (patch)
tree067bb281c47fe27de8cd039f276e438408dbc525
parent469b5a9584b1647fdccb37b663dd076ba991d764 (diff)
downloadphp-git-0928bad9ac9110a8a321c334444b7026bffad5f7.tar.gz
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
-rw-r--r--NEWS2
-rw-r--r--ext/openssl/openssl.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d248f86483..dd1a80e382 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 e78d3b15aa..1603009709 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) {