Skip to content

Commit fa5a25b

Browse files
kocsismatekocsismate
committed
Adjust ext/openssl parameter names
Closes GH-6121
1 parent c37a1cd commit fa5a25b

File tree

3 files changed

+54
-44
lines changed

3 files changed

+54
-44
lines changed

‎ext/openssl/openssl.stub.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function openssl_x509_read(OpenSSLCertificate|string $certificate): OpenSSLCerti
3737
function openssl_x509_free(OpenSSLCertificate $certificate): void {}
3838

3939
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string $private_key */
40-
function openssl_pkcs12_export_to_file(OpenSSLCertificate|string $certificate, string $filename, $private_key, string $passphrase, array $options = []): bool {}
40+
function openssl_pkcs12_export_to_file(OpenSSLCertificate|string $certificate, string $output_filename, $private_key, string $passphrase, array $options = []): bool {}
4141

4242
/**
4343
* @param string $output
@@ -57,7 +57,7 @@ function openssl_csr_export(OpenSSLCertificateSigningRequest|string $csr, &$outp
5757
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 */
60-
function openssl_csr_new(array $distinguished_names, &$private_key, ?array $options = null, ?array $extra_options = null): OpenSSLCertificateSigningRequest|false {}
60+
function openssl_csr_new(array $distinguished_names, &$private_key, ?array $options = null, ?array $extra_attributes = null): OpenSSLCertificateSigningRequest|false {}
6161

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

@@ -105,39 +105,39 @@ function openssl_pkey_get_details(OpenSSLAsymmetricKey $key): array|false {}
105105

106106
function openssl_pbkdf2(string $passphrase, string $salt, int $key_length, int $iterations, string $digest_algorithm = "sha1"): string|false {}
107107

108-
function openssl_pkcs7_verify(string $filename, int $flags, ?string $output_filename = null, array $ca_info = [], ?string $untrusted_certificates_filename = null, ?string $content = null, ?string $pk7_filename = null): bool|int {}
108+
function openssl_pkcs7_verify(string $input_filename, int $flags, ?string $signers_certificates_filename = null, array $ca_info = [], ?string $untrusted_certificates_filename = null, ?string $content = null, ?string $output_filename = null): bool|int {}
109109

110110
/** @param OpenSSLCertificate|array|string $certificate */
111-
function openssl_pkcs7_encrypt(string $filename, string $output_filename, $certificate, ?array $headers, int $flags = 0, int $cipher_algorithm = OPENSSL_CIPHER_RC2_40): bool {}
111+
function openssl_pkcs7_encrypt(string $input_filename, string $output_filename, $certificate, ?array $headers, int $flags = 0, int $cipher_algorithm = OPENSSL_CIPHER_RC2_40): bool {}
112112

113113
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string $private_key */
114-
function openssl_pkcs7_sign(string $filename, string $output_filename, OpenSSLCertificate|string $certificate, $private_key, ?array $headers, int $flags = PKCS7_DETACHED, ?string $untrusted_certificates_filename = null): bool {}
114+
function openssl_pkcs7_sign(string $input_filename, string $output_filename, OpenSSLCertificate|string $certificate, $private_key, ?array $headers, int $flags = PKCS7_DETACHED, ?string $untrusted_certificates_filename = null): bool {}
115115

116116
/**
117117
* @param OpenSSLCertificate|string $certificate
118118
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string|null $private_key
119119
*/
120-
function openssl_pkcs7_decrypt(string $filename, string $output_filename, $certificate, $private_key = null): bool {}
120+
function openssl_pkcs7_decrypt(string $input_filename, string $output_filename, $certificate, $private_key = null): bool {}
121121

122122
/** @param array $certificates */
123-
function openssl_pkcs7_read(string $filename, &$certificates): bool {}
123+
function openssl_pkcs7_read(string $input_filename, &$certificates): bool {}
124124

125-
function openssl_cms_verify(string $filename, int $flags = 0, ?string $certificates = null, array $ca_info = [], ?string $untrusted_certificates_filename = null, ?string $content = null, ?string $pk7 = null, ?string $sigfile = null, int $encoding = OPENSSL_ENCODING_SMIME): bool {}
125+
function openssl_cms_verify(string $input_filename, int $flags = 0, ?string $certificates = null, array $ca_info = [], ?string $untrusted_certificates_filename = null, ?string $content = null, ?string $pk7 = null, ?string $sigfile = null, int $encoding = OPENSSL_ENCODING_SMIME): bool {}
126126

127127
/** @param OpenSSLCertificate|array|string $certificate */
128-
function openssl_cms_encrypt(string $filename, string $output_filename, $certificate, ?array $headers, int $flags = 0, int $encoding = OPENSSL_ENCODING_SMIME, int $cipher_algorithm = OPENSSL_CIPHER_RC2_40): bool {}
128+
function openssl_cms_encrypt(string $input_filename, string $output_filename, $certificate, ?array $headers, int $flags = 0, int $encoding = OPENSSL_ENCODING_SMIME, int $cipher_algorithm = OPENSSL_CIPHER_RC2_40): bool {}
129129

130130
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string $private_key */
131-
function openssl_cms_sign(string $filename, string $output_filename, OpenSSLCertificate|string $certificate, $private_key, ?array $headers, int $flags = 0, int $encoding = OPENSSL_ENCODING_SMIME, ?string $untrusted_certificates_filename = null): bool {}
131+
function openssl_cms_sign(string $input_filename, string $output_filename, OpenSSLCertificate|string $certificate, $private_key, ?array $headers, int $flags = 0, int $encoding = OPENSSL_ENCODING_SMIME, ?string $untrusted_certificates_filename = null): bool {}
132132

133133
/**
134134
* @param OpenSSLCertificate|string $certificate
135135
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string|null $private_key
136136
*/
137-
function openssl_cms_decrypt(string $filename, string $output_filename, $certificate, $private_key = null, int $encoding = OPENSSL_ENCODING_SMIME): bool {}
137+
function openssl_cms_decrypt(string $input_filename, string $output_filename, $certificate, $private_key = null, int $encoding = OPENSSL_ENCODING_SMIME): bool {}
138138

139139
/** @param array $certificates */
140-
function openssl_cms_read(string $filename, &$certificates): bool {}
140+
function openssl_cms_read(string $input_filename, &$certificates): bool {}
141141

142142
/**
143143
* @param string $encrypted_data
@@ -146,10 +146,10 @@ function openssl_cms_read(string $filename, &$certificates): bool {}
146146
function openssl_private_encrypt(string $data, &$encrypted_data, $private_key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
147147

148148
/**
149-
* @param string $encrypted_data
149+
* @param string $decrypted_data
150150
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string $private_key
151151
*/
152-
function openssl_private_decrypt(string $data, &$encrypted_data, $private_key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
152+
function openssl_private_decrypt(string $data, &$decrypted_data, $private_key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
153153

154154
/**
155155
* @param string $encrypted_data
@@ -158,10 +158,10 @@ function openssl_private_decrypt(string $data, &$encrypted_data, $private_key, i
158158
function openssl_public_encrypt(string $data, &$encrypted_data, $public_key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
159159

160160
/**
161-
* @param string $encrypted_data
161+
* @param string $decrypted_data
162162
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string $public_key
163163
*/
164-
function openssl_public_decrypt(string $data, &$encrypted_data, $public_key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
164+
function openssl_public_decrypt(string $data, &$decrypted_data, $public_key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
165165

166166
function openssl_error_string(): string|false {}
167167

@@ -177,15 +177,15 @@ function openssl_verify(string $data, string $signature, $public_key, string|int
177177
/**
178178
* @param string $sealed_data
179179
* @param array $encrypted_keys
180-
* @param string $initialization_vector
180+
* @param string $iv
181181
*/
182-
function openssl_seal(string $data, &$sealed_data, &$encrypted_keys, array $public_key, string $cipher_algorithm, &$initialization_vector = null): int|false {}
182+
function openssl_seal(string $data, &$sealed_data, &$encrypted_keys, array $public_key, string $cipher_algorithm, &$iv = null): int|false {}
183183

184184
/**
185185
* @param string $output
186186
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|array|string $private_key
187187
*/
188-
function openssl_open(string $data, &$output, string $encrypted_key, $private_key, string $cipher_algorithm, ?string $initialization_vector = null): bool {}
188+
function openssl_open(string $data, &$output, string $encrypted_key, $private_key, string $cipher_algorithm, ?string $iv = null): bool {}
189189

190190
function openssl_get_md_methods(bool $aliases = false): array {}
191191

@@ -198,9 +198,9 @@ function openssl_get_curve_names(): array|false {}
198198
function openssl_digest(string $data, string $digest_algorithm, bool $raw_output = false): string|false {}
199199

200200
/** @param string $tag */
201-
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 {}
201+
function openssl_encrypt(string $data, string $cipher_algorithm, string $passphrase, int $options = 0, string $iv = "", &$tag = null, string $aad = "", 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 = "", string $additional_authentication_data = ""): string|false {}
203+
function openssl_decrypt(string $data, string $cipher_algorithm, string $passphrase, int $options = 0, string $iv = "", string $tag = "", string $aad = ""): string|false {}
204204

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

‎ext/openssl/openssl_arginfo.h‎

Lines changed: 32 additions & 22 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: 94b744d0176f126d491a9c385136708da124e332 */
2+
* Stub hash: 40f9897413f966bd483d8f133f6fa3b80910e3d5 */
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)
@@ -51,7 +51,7 @@ ZEND_END_ARG_INFO()
5151

5252
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkcs12_export_to_file, 0, 4, _IS_BOOL, 0)
5353
ZEND_ARG_OBJ_TYPE_MASK(0, certificate, OpenSSLCertificate, MAY_BE_STRING, NULL)
54-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
54+
ZEND_ARG_TYPE_INFO(0, output_filename, IS_STRING, 0)
5555
ZEND_ARG_INFO(0, private_key)
5656
ZEND_ARG_TYPE_INFO(0, passphrase, IS_STRING, 0)
5757
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
@@ -96,7 +96,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_openssl_csr_new, 0, 2, OpenS
9696
ZEND_ARG_TYPE_INFO(0, distinguished_names, IS_ARRAY, 0)
9797
ZEND_ARG_INFO(1, private_key)
9898
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
99-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, extra_options, IS_ARRAY, 1, "null")
99+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, extra_attributes, IS_ARRAY, 1, "null")
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)
@@ -159,17 +159,17 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_pbkdf2, 0, 4, MAY_BE_STR
159159
ZEND_END_ARG_INFO()
160160

161161
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_pkcs7_verify, 0, 2, MAY_BE_BOOL|MAY_BE_LONG)
162-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
162+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
163163
ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
164-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, output_filename, IS_STRING, 1, "null")
164+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, signers_certificates_filename, IS_STRING, 1, "null")
165165
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ca_info, IS_ARRAY, 0, "[]")
166166
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, untrusted_certificates_filename, IS_STRING, 1, "null")
167167
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, content, IS_STRING, 1, "null")
168-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pk7_filename, IS_STRING, 1, "null")
168+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, output_filename, IS_STRING, 1, "null")
169169
ZEND_END_ARG_INFO()
170170

171171
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkcs7_encrypt, 0, 4, _IS_BOOL, 0)
172-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
172+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
173173
ZEND_ARG_TYPE_INFO(0, output_filename, IS_STRING, 0)
174174
ZEND_ARG_INFO(0, certificate)
175175
ZEND_ARG_TYPE_INFO(0, headers, IS_ARRAY, 1)
@@ -178,7 +178,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkcs7_encrypt, 0, 4, _IS
178178
ZEND_END_ARG_INFO()
179179

180180
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkcs7_sign, 0, 5, _IS_BOOL, 0)
181-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
181+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
182182
ZEND_ARG_TYPE_INFO(0, output_filename, IS_STRING, 0)
183183
ZEND_ARG_OBJ_TYPE_MASK(0, certificate, OpenSSLCertificate, MAY_BE_STRING, NULL)
184184
ZEND_ARG_INFO(0, private_key)
@@ -188,19 +188,19 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkcs7_sign, 0, 5, _IS_BO
188188
ZEND_END_ARG_INFO()
189189

190190
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkcs7_decrypt, 0, 3, _IS_BOOL, 0)
191-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
191+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
192192
ZEND_ARG_TYPE_INFO(0, output_filename, IS_STRING, 0)
193193
ZEND_ARG_INFO(0, certificate)
194194
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, private_key, "null")
195195
ZEND_END_ARG_INFO()
196196

197197
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkcs7_read, 0, 2, _IS_BOOL, 0)
198-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
198+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
199199
ZEND_ARG_INFO(1, certificates)
200200
ZEND_END_ARG_INFO()
201201

202202
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_cms_verify, 0, 1, _IS_BOOL, 0)
203-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
203+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
204204
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
205205
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, certificates, IS_STRING, 1, "null")
206206
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ca_info, IS_ARRAY, 0, "[]")
@@ -212,7 +212,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_cms_verify, 0, 1, _IS_BO
212212
ZEND_END_ARG_INFO()
213213

214214
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_cms_encrypt, 0, 4, _IS_BOOL, 0)
215-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
215+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
216216
ZEND_ARG_TYPE_INFO(0, output_filename, IS_STRING, 0)
217217
ZEND_ARG_INFO(0, certificate)
218218
ZEND_ARG_TYPE_INFO(0, headers, IS_ARRAY, 1)
@@ -222,7 +222,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_cms_encrypt, 0, 4, _IS_B
222222
ZEND_END_ARG_INFO()
223223

224224
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_cms_sign, 0, 5, _IS_BOOL, 0)
225-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
225+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
226226
ZEND_ARG_TYPE_INFO(0, output_filename, IS_STRING, 0)
227227
ZEND_ARG_OBJ_TYPE_MASK(0, certificate, OpenSSLCertificate, MAY_BE_STRING, NULL)
228228
ZEND_ARG_INFO(0, private_key)
@@ -233,7 +233,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_cms_sign, 0, 5, _IS_BOOL
233233
ZEND_END_ARG_INFO()
234234

235235
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_cms_decrypt, 0, 3, _IS_BOOL, 0)
236-
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
236+
ZEND_ARG_TYPE_INFO(0, input_filename, IS_STRING, 0)
237237
ZEND_ARG_TYPE_INFO(0, output_filename, IS_STRING, 0)
238238
ZEND_ARG_INFO(0, certificate)
239239
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, private_key, "null")
@@ -249,7 +249,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_private_encrypt, 0, 3, _
249249
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, padding, IS_LONG, 0, "OPENSSL_PKCS1_PADDING")
250250
ZEND_END_ARG_INFO()
251251

252-
#define arginfo_openssl_private_decrypt arginfo_openssl_private_encrypt
252+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_private_decrypt, 0, 3, _IS_BOOL, 0)
253+
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
254+
ZEND_ARG_INFO(1, decrypted_data)
255+
ZEND_ARG_INFO(0, private_key)
256+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, padding, IS_LONG, 0, "OPENSSL_PKCS1_PADDING")
257+
ZEND_END_ARG_INFO()
253258

254259
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_public_encrypt, 0, 3, _IS_BOOL, 0)
255260
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
@@ -258,7 +263,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_public_encrypt, 0, 3, _I
258263
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, padding, IS_LONG, 0, "OPENSSL_PKCS1_PADDING")
259264
ZEND_END_ARG_INFO()
260265

261-
#define arginfo_openssl_public_decrypt arginfo_openssl_public_encrypt
266+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_public_decrypt, 0, 3, _IS_BOOL, 0)
267+
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
268+
ZEND_ARG_INFO(1, decrypted_data)
269+
ZEND_ARG_INFO(0, public_key)
270+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, padding, IS_LONG, 0, "OPENSSL_PKCS1_PADDING")
271+
ZEND_END_ARG_INFO()
262272

263273
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_error_string, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
264274
ZEND_END_ARG_INFO()
@@ -283,7 +293,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_seal, 0, 5, MAY_BE_LONG|
283293
ZEND_ARG_INFO(1, encrypted_keys)
284294
ZEND_ARG_TYPE_INFO(0, public_key, IS_ARRAY, 0)
285295
ZEND_ARG_TYPE_INFO(0, cipher_algorithm, IS_STRING, 0)
286-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, initialization_vector, "null")
296+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, iv, "null")
287297
ZEND_END_ARG_INFO()
288298

289299
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_open, 0, 5, _IS_BOOL, 0)
@@ -292,7 +302,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_open, 0, 5, _IS_BOOL, 0)
292302
ZEND_ARG_TYPE_INFO(0, encrypted_key, IS_STRING, 0)
293303
ZEND_ARG_INFO(0, private_key)
294304
ZEND_ARG_TYPE_INFO(0, cipher_algorithm, IS_STRING, 0)
295-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, initialization_vector, IS_STRING, 1, "null")
305+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, iv, IS_STRING, 1, "null")
296306
ZEND_END_ARG_INFO()
297307

298308
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_get_md_methods, 0, 0, IS_ARRAY, 0)
@@ -317,9 +327,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_encrypt, 0, 3, MAY_BE_ST
317327
ZEND_ARG_TYPE_INFO(0, cipher_algorithm, IS_STRING, 0)
318328
ZEND_ARG_TYPE_INFO(0, passphrase, IS_STRING, 0)
319329
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
320-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, initialization_vector, IS_STRING, 0, "\"\"")
330+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, iv, IS_STRING, 0, "\"\"")
321331
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, tag, "null")
322-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_authentication_data, IS_STRING, 0, "\"\"")
332+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, aad, IS_STRING, 0, "\"\"")
323333
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, tag_length, IS_LONG, 0, "16")
324334
ZEND_END_ARG_INFO()
325335

@@ -328,9 +338,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_decrypt, 0, 3, MAY_BE_ST
328338
ZEND_ARG_TYPE_INFO(0, cipher_algorithm, IS_STRING, 0)
329339
ZEND_ARG_TYPE_INFO(0, passphrase, IS_STRING, 0)
330340
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
331-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, initialization_vector, IS_STRING, 0, "\"\"")
341+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, iv, IS_STRING, 0, "\"\"")
332342
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, tag, IS_STRING, 0, "\"\"")
333-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_authentication_data, IS_STRING, 0, "\"\"")
343+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, aad, IS_STRING, 0, "\"\"")
334344
ZEND_END_ARG_INFO()
335345

336346
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_cipher_iv_length, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)

‎ext/openssl/tests/bug60632.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ try {
2727
}
2828
?>
2929
--EXPECT--
30-
openssl_seal(): Argument #6 ($initialization_vector) cannot be null for the chosen cipher algorithm
30+
openssl_seal(): Argument #6 ($iv) cannot be null for the chosen cipher algorithm

0 commit comments

Comments
 (0)