Skip to content

Commit 276b573

Browse files
carusogabrielcmb69
authored andcommitted
Fix openssl_* arginfos
openssl_pkcs12_export and openssl_x509_parse had wrong arginfos
1 parent c28b03a commit 276b573

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ PHP NEWS
2323
. Fixed bug #75969 (Assertion failure in live range DCE due to block pass
2424
misoptimization). (Nikita)
2525

26+
- OpenSSL:
27+
. Fixed openssl_* arginfos. (carusogabriel)
28+
2629
- LDAP:
2730
. Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
2831

ext/openssl/openssl.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_check_private_key, 0)
155155
ZEND_ARG_INFO(0, key)
156156
ZEND_END_ARG_INFO()
157157

158-
ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_parse, 0)
158+
ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_parse, 0, 0, 1)
159159
ZEND_ARG_INFO(0, x509)
160160
ZEND_ARG_INFO(0, shortname)
161161
ZEND_END_ARG_INFO()
@@ -183,7 +183,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs12_export_to_file, 0, 0, 4)
183183
ZEND_ARG_INFO(0, args) /* array */
184184
ZEND_END_ARG_INFO()
185185

186-
ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkcs12_export, 0)
186+
ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs12_export, 0, 0, 4)
187187
ZEND_ARG_INFO(0, x509)
188188
ZEND_ARG_INFO(1, out)
189189
ZEND_ARG_INFO(0, priv_key)
@@ -6652,4 +6652,3 @@ PHP_FUNCTION(openssl_random_pseudo_bytes)
66526652
* vim600: sw=4 ts=4 fdm=marker
66536653
* vim<600: sw=4 ts=4
66546654
*/
6655-

0 commit comments

Comments
 (0)