com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c
| From: | Daniel Lowrey | Date: | Fri, 06 Mar 2015 18:31:04 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85299@lists.php.net to get a copy of this message | ||
Commit: 00c35cb6a52b2898f79d91738094a4d711de2553
Author: Daniel Lowrey <rdlowrey@php.net> Fri, 6 Mar 2015 11:31:04 -0700
Parents: 9f9ffdd0a022138056608d1e21e57b09fb120fae 0928bad9ac9110a8a321c334444b7026bffad5f7
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=00c35cb6a52b2898f79d91738094a4d711de2553
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
Conflicts:
ext/openssl/openssl.c
Bugs:
https://bugs.php.net/69197
Changed paths:
MM ext/openssl/openssl.c
Diff:
diff --cc ext/openssl/openssl.c
index bce3f20,1603009..dff4ceb
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -4272,16 -4270,16 +4272,16 @@@ PHP_FUNCTION(openssl_pkcs7_sign
PKCS7 * p7 = NULL;
BIO * infile = NULL, * outfile = NULL;
STACK_OF(X509) *others = NULL;
- long certresource = -1, keyresource = -1;
- ulong intindex;
- uint strindexlen;
- HashPosition hpos;
- char * strindex;
- char * infilename; int infilename_len;
- char * outfilename; int outfilename_len;
- char * extracertsfilename = NULL; int extracertsfilename_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ppZZa!|lp!",
+ zend_resource *certresource = NULL, *keyresource = NULL;
+ zend_string * strindex;
+ char * infilename;
+ size_t infilename_len;
+ char * outfilename;
+ size_t outfilename_len;
+ char * extracertsfilename = NULL;
+ size_t extracertsfilename_len;
+
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "ppzza!|lp",
++ if (zend_parse_parameters(ZEND_NUM_ARGS(), "ppzza!|lp!",
&infilename, &infilename_len, &outfilename, &outfilename_len,
&zcert, &zprivkey, &zheaders, &flags, &extracertsfilename,
&extracertsfilename_len) == FAILURE) {