Skip to content

Commit e17d3a4

Browse files
kocsismatekocsismate
committed
Minor fixes
1 parent 69366ac commit e17d3a4

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎ext/openssl/openssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7292,7 +7292,7 @@ PHP_FUNCTION(openssl_decrypt)
72927292
size_t data_len, method_len, password_len, iv_len = 0, tag_len = 0, aad_len = 0;
72937293
zend_string *ret;
72947294

7295-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss|lss!s", &data, &data_len, &method, &method_len,
7295+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss|lsss", &data, &data_len, &method, &method_len,
72967296
&password, &password_len, &options, &iv, &iv_len, &tag, &tag_len, &aad, &aad_len) == FAILURE) {
72977297
RETURN_THROWS();
72987298
}

‎ext/openssl/openssl.stub.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ function openssl_pkcs12_export(OpenSSLCertificate|string $certificate, &$output,
4848
/** @param array $certificates */
4949
function openssl_pkcs12_read(string $pkcs12, &$certificates, string $passphrase): bool {}
5050

51-
function openssl_csr_export_to_file(OpenSSLCertificateSigningRequest|string $request, string $output_filename, bool $no_text = true): bool {}
51+
function openssl_csr_export_to_file(OpenSSLCertificateSigningRequest|string $csr, string $output_filename, bool $no_text = true): bool {}
5252

5353
/** @param OpenSSLAsymmetricKey $output */
54-
function openssl_csr_export(OpenSSLCertificateSigningRequest|string $request, &$output, bool $no_text = true): bool {}
54+
function openssl_csr_export(OpenSSLCertificateSigningRequest|string $csr, &$output, bool $no_text = true): bool {}
5555

5656
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string $private_key */
57-
function openssl_csr_sign(OpenSSLCertificateSigningRequest|string $request, OpenSSLCertificate|string|null $ca_certificate, $private_key, int $days, ?array $options = null, int $serial = 0): OpenSSLCertificate|false {}
57+
function openssl_csr_sign(OpenSSLCertificateSigningRequest|string $csr, OpenSSLCertificate|string|null $ca_certificate, $private_key, int $days, ?array $options = null, int $serial = 0): OpenSSLCertificate|false {}
5858

5959
/** @param OpenSSLAsymmetricKey $private_key */
6060
function openssl_csr_new(array $distinguished_names, &$private_key, ?array $options = null, ?array $extra_options = null): OpenSSLCertificateSigningRequest|false {}
6161

62-
function openssl_csr_get_subject(OpenSSLCertificateSigningRequest|string $request, bool $short_names = true): array|false {}
62+
function openssl_csr_get_subject(OpenSSLCertificateSigningRequest|string $csr, bool $short_names = true): array|false {}
6363

64-
function openssl_csr_get_public_key(OpenSSLCertificateSigningRequest|string $request, bool $short_names = true): OpenSSLAsymmetricKey|false {}
64+
function openssl_csr_get_public_key(OpenSSLCertificateSigningRequest|string $csr, bool $short_names = true): OpenSSLAsymmetricKey|false {}
6565

6666
function openssl_pkey_new(?array $options = null): OpenSSLAsymmetricKey|false {}
6767

@@ -200,7 +200,7 @@ function openssl_digest(string $data, string $digest_algorithm, bool $raw_output
200200
/** @param string $tag */
201201
function openssl_encrypt(string $data, string $cipher_algorithm, string $passphrase, int $options = 0, string $initialization_vector = "", &$tag = null, string $additional_authentication_data = "", int $tag_length = 16): string|false {}
202202

203-
function openssl_decrypt(string $data, string $cipher_algorithm, string $passphrase, int $options = 0, string $initialization_vector = "", ?string $tag = null, string $additional_authentication_data = ""): string|false {}
203+
function openssl_decrypt(string $data, string $cipher_algorithm, string $passphrase, int $options = 0, string $initialization_vector = "", string $tag = "", string $additional_authentication_data = ""): string|false {}
204204

205205
function openssl_cipher_iv_length(string $cipher_algorithm): int|false {}
206206

@@ -217,10 +217,10 @@ function openssl_random_pseudo_bytes(int $length, &$strong_result = null): strin
217217

218218
function openssl_spki_new(OpenSSLAsymmetricKey $private_key, string $challenge, int $digest_algorithm = OPENSSL_ALGO_MD5): string|false {}
219219

220-
function openssl_spki_verify(string $signed_public_key_and_challenge): bool {}
220+
function openssl_spki_verify(string $spki): bool {}
221221

222-
function openssl_spki_export(string $signed_public_key_and_challenge): string|false {}
222+
function openssl_spki_export(string $spki): string|false {}
223223

224-
function openssl_spki_export_challenge(string $signed_public_key_and_challenge): string|false {}
224+
function openssl_spki_export_challenge(string $spki): string|false {}
225225

226226
function openssl_get_cert_locations(): array {}

‎ext/openssl/openssl_arginfo.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 3a2f2302110e99bec8f5d254aa2fc9702d34bcf1 */
2+
* Stub hash: 1020153737b4c71f5811c0228fbcabb4c236e397 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_x509_export_to_file, 0, 2, _IS_BOOL, 0)
55
ZEND_ARG_OBJ_TYPE_MASK(0, certificate, OpenSSLCertificate, MAY_BE_STRING, NULL)
@@ -72,19 +72,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkcs12_read, 0, 3, _IS_B
7272
ZEND_END_ARG_INFO()
7373

7474
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_csr_export_to_file, 0, 2, _IS_BOOL, 0)
75-
ZEND_ARG_OBJ_TYPE_MASK(0, request, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
75+
ZEND_ARG_OBJ_TYPE_MASK(0, csr, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
7676
ZEND_ARG_TYPE_INFO(0, output_filename, IS_STRING, 0)
7777
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, no_text, _IS_BOOL, 0, "true")
7878
ZEND_END_ARG_INFO()
7979

8080
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_csr_export, 0, 2, _IS_BOOL, 0)
81-
ZEND_ARG_OBJ_TYPE_MASK(0, request, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
81+
ZEND_ARG_OBJ_TYPE_MASK(0, csr, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
8282
ZEND_ARG_INFO(1, output)
8383
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, no_text, _IS_BOOL, 0, "true")
8484
ZEND_END_ARG_INFO()
8585

8686
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_openssl_csr_sign, 0, 4, OpenSSLCertificate, MAY_BE_FALSE)
87-
ZEND_ARG_OBJ_TYPE_MASK(0, request, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
87+
ZEND_ARG_OBJ_TYPE_MASK(0, csr, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
8888
ZEND_ARG_OBJ_TYPE_MASK(0, ca_certificate, OpenSSLCertificate, MAY_BE_STRING|MAY_BE_NULL, NULL)
8989
ZEND_ARG_INFO(0, private_key)
9090
ZEND_ARG_TYPE_INFO(0, days, IS_LONG, 0)
@@ -100,12 +100,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_openssl_csr_new, 0, 2, OpenS
100100
ZEND_END_ARG_INFO()
101101

102102
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_csr_get_subject, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
103-
ZEND_ARG_OBJ_TYPE_MASK(0, request, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
103+
ZEND_ARG_OBJ_TYPE_MASK(0, csr, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
104104
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, short_names, _IS_BOOL, 0, "true")
105105
ZEND_END_ARG_INFO()
106106

107107
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_openssl_csr_get_public_key, 0, 1, OpenSSLAsymmetricKey, MAY_BE_FALSE)
108-
ZEND_ARG_OBJ_TYPE_MASK(0, request, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
108+
ZEND_ARG_OBJ_TYPE_MASK(0, csr, OpenSSLCertificateSigningRequest, MAY_BE_STRING, NULL)
109109
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, short_names, _IS_BOOL, 0, "true")
110110
ZEND_END_ARG_INFO()
111111

@@ -329,7 +329,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_decrypt, 0, 3, MAY_BE_ST
329329
ZEND_ARG_TYPE_INFO(0, passphrase, IS_STRING, 0)
330330
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
331331
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, initialization_vector, IS_STRING, 0, "\"\"")
332-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, tag, IS_STRING, 1, "null")
332+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, tag, IS_STRING, 0, "\"\"")
333333
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_authentication_data, IS_STRING, 0, "\"\"")
334334
ZEND_END_ARG_INFO()
335335

@@ -360,11 +360,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_spki_new, 0, 2, MAY_BE_S
360360
ZEND_END_ARG_INFO()
361361

362362
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_spki_verify, 0, 1, _IS_BOOL, 0)
363-
ZEND_ARG_TYPE_INFO(0, signed_public_key_and_challenge, IS_STRING, 0)
363+
ZEND_ARG_TYPE_INFO(0, spki, IS_STRING, 0)
364364
ZEND_END_ARG_INFO()
365365

366366
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_spki_export, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
367-
ZEND_ARG_TYPE_INFO(0, signed_public_key_and_challenge, IS_STRING, 0)
367+
ZEND_ARG_TYPE_INFO(0, spki, IS_STRING, 0)
368368
ZEND_END_ARG_INFO()
369369

370370
#define arginfo_openssl_spki_export_challenge arginfo_openssl_spki_export

‎ext/openssl/tests/openssl_csr_export_to_file_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ JViHkCA9x6m8RJXAFvqmgLlWlUzbDv/cRrDfjWjR
7777

7878
Warning: openssl_csr_export_to_file(): X.509 Certificate Signing Request cannot be retrieved in %s on line %d
7979
bool(false)
80-
openssl_csr_export_to_file(): Argument #1 ($request) must be of type OpenSSLCertificateSigningRequest|string, OpenSSLAsymmetricKey given
80+
openssl_csr_export_to_file(): Argument #1 ($csr) must be of type OpenSSLCertificateSigningRequest|string, OpenSSLAsymmetricKey given
8181
bool(true)

‎ext/openssl/tests/openssl_csr_sign_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ bool(false)
7575

7676
Warning: openssl_csr_sign(): X.509 Certificate Signing Request cannot be retrieved in %s on line %d
7777
bool(false)
78-
openssl_csr_sign(): Argument #1 ($request) must be of type OpenSSLCertificateSigningRequest|string, array given
78+
openssl_csr_sign(): Argument #1 ($csr) must be of type OpenSSLCertificateSigningRequest|string, array given
7979
openssl_csr_sign(): Argument #2 ($ca_certificate) must be of type OpenSSLCertificate|string|null, array given
8080
Key array must be of the form array(0 => key, 1 => phrase)
8181
object(OpenSSLCertificate)#%d (0) {

0 commit comments

Comments
 (0)