Skip to content

Commit a9695aa

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Correct the argument names for ext/sodium functions
2 parents 39fa55a + 0c57ebb commit a9695aa

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

ext/sodium/libsodium.stub.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function sodium_crypto_box_publickey(string $key_pair): string {}
5252

5353
function sodium_crypto_box_publickey_from_secretkey(string $secret_key): string {}
5454

55-
function sodium_crypto_box_seal(string $message, string $key_pair): string {}
55+
function sodium_crypto_box_seal(string $message, string $public_key): string {}
5656

5757
function sodium_crypto_box_seal_open(string $ciphertext, string $key_pair): string|false {}
5858

@@ -176,7 +176,7 @@ function sodium_crypto_sign_keypair(): string {}
176176

177177
function sodium_crypto_sign_keypair_from_secretkey_and_publickey(string $secret_key, string $public_key): string {}
178178

179-
function sodium_crypto_sign_open(string $ciphertext, string $public_key): string|false {}
179+
function sodium_crypto_sign_open(string $signed_message, string $public_key): string|false {}
180180

181181
function sodium_crypto_sign_publickey(string $key_pair): string {}
182182

@@ -212,7 +212,7 @@ function sodium_memcmp(string $string1, string $string2): int {}
212212

213213
function sodium_memzero(string &$string): void {}
214214

215-
function sodium_pad(string $string, int $length): string {}
215+
function sodium_pad(string $string, int $block_size): string {}
216216

217217
function sodium_unpad(string $string, int $block_size): string {}
218218

ext/sodium/libsodium_arginfo.h

Lines changed: 5 additions & 8 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: 286436656e37c5d71de69ed6365b5202e0965f19 */
2+
* Stub hash: 7213518d1b2e9322194d677f13634f61c5f71af8 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sodium_crypto_aead_aes256gcm_is_available, 0, 0, _IS_BOOL, 0)
55
ZEND_END_ARG_INFO()
@@ -119,7 +119,7 @@ ZEND_END_ARG_INFO()
119119

120120
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sodium_crypto_box_seal, 0, 2, IS_STRING, 0)
121121
ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
122-
ZEND_ARG_TYPE_INFO(0, key_pair, IS_STRING, 0)
122+
ZEND_ARG_TYPE_INFO(0, public_key, IS_STRING, 0)
123123
ZEND_END_ARG_INFO()
124124

125125
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_sodium_crypto_box_seal_open, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
@@ -396,7 +396,7 @@ ZEND_END_ARG_INFO()
396396
#define arginfo_sodium_crypto_sign_keypair_from_secretkey_and_publickey arginfo_sodium_crypto_box_keypair_from_secretkey_and_publickey
397397

398398
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_sodium_crypto_sign_open, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
399-
ZEND_ARG_TYPE_INFO(0, ciphertext, IS_STRING, 0)
399+
ZEND_ARG_TYPE_INFO(0, signed_message, IS_STRING, 0)
400400
ZEND_ARG_TYPE_INFO(0, public_key, IS_STRING, 0)
401401
ZEND_END_ARG_INFO()
402402

@@ -464,15 +464,12 @@ ZEND_END_ARG_INFO()
464464
#define arginfo_sodium_memzero arginfo_sodium_increment
465465

466466
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sodium_pad, 0, 2, IS_STRING, 0)
467-
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
468-
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
469-
ZEND_END_ARG_INFO()
470-
471-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sodium_unpad, 0, 2, IS_STRING, 0)
472467
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
473468
ZEND_ARG_TYPE_INFO(0, block_size, IS_LONG, 0)
474469
ZEND_END_ARG_INFO()
475470

471+
#define arginfo_sodium_unpad arginfo_sodium_pad
472+
476473
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sodium_bin2hex, 0, 1, IS_STRING, 0)
477474
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
478475
ZEND_END_ARG_INFO()

0 commit comments

Comments
 (0)