From: Daniel Lowrey <rdlowrey@php.net>
Date: Fri, 6 Mar 2015 18:29:56 +0000 (-0700)
Subject: Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
X-Git-Tag: php-5.6.8RC1~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0928bad9ac9110a8a321c334444b7026bffad5f7;p=php

Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
---

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) {