diff options
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 5a1764ee01..071b5027a6 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -52,10 +52,12 @@ #define DEBUG_SMIME 0 -static unsigned char arg2_force_ref[] = - { 2, BYREF_NONE, BYREF_FORCE }; -static unsigned char arg2and3_force_ref[] = - { 3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; +static + ZEND_BEGIN_ARG_INFO(arg2and3_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); enum php_openssl_key_type { OPENSSL_KEYTYPE_RSA, @@ -80,7 +82,7 @@ function_entry openssl_functions[] = { /* public/private key functions */ PHP_FE(openssl_pkey_free, NULL) PHP_FE(openssl_pkey_new, NULL) - PHP_FE(openssl_pkey_export, arg2_force_ref) + PHP_FE(openssl_pkey_export, second_arg_force_ref) PHP_FE(openssl_pkey_export_to_file, NULL) PHP_FE(openssl_pkey_get_private, NULL) PHP_FE(openssl_pkey_get_public, NULL) @@ -95,19 +97,19 @@ function_entry openssl_functions[] = { PHP_FE(openssl_x509_parse, NULL) PHP_FE(openssl_x509_checkpurpose, NULL) PHP_FE(openssl_x509_check_private_key, NULL) - PHP_FE(openssl_x509_export, arg2_force_ref) + PHP_FE(openssl_x509_export, second_arg_force_ref) PHP_FE(openssl_x509_export_to_file, NULL) /* CSR funcs */ - PHP_FE(openssl_csr_new, arg2_force_ref) - PHP_FE(openssl_csr_export, arg2_force_ref) + PHP_FE(openssl_csr_new, second_arg_force_ref) + PHP_FE(openssl_csr_export, second_arg_force_ref) PHP_FE(openssl_csr_export_to_file, NULL) PHP_FE(openssl_csr_sign, NULL) - PHP_FE(openssl_sign, arg2_force_ref) + PHP_FE(openssl_sign, second_arg_force_ref) PHP_FE(openssl_verify, NULL) PHP_FE(openssl_seal, arg2and3_force_ref) - PHP_FE(openssl_open, arg2_force_ref) + PHP_FE(openssl_open, second_arg_force_ref) /* for S/MIME handling */ PHP_FE(openssl_pkcs7_verify, NULL) @@ -115,10 +117,10 @@ function_entry openssl_functions[] = { PHP_FE(openssl_pkcs7_sign, NULL) PHP_FE(openssl_pkcs7_encrypt, NULL) - PHP_FE(openssl_private_encrypt, arg2_force_ref) - PHP_FE(openssl_private_decrypt, arg2_force_ref) - PHP_FE(openssl_public_encrypt, arg2_force_ref) - PHP_FE(openssl_public_decrypt, arg2_force_ref) + PHP_FE(openssl_private_encrypt, second_arg_force_ref) + PHP_FE(openssl_private_decrypt, second_arg_force_ref) + PHP_FE(openssl_public_encrypt, second_arg_force_ref) + PHP_FE(openssl_public_decrypt, second_arg_force_ref) PHP_FE(openssl_error_string, NULL) {NULL, NULL, NULL} |