diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-29 21:20:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-29 21:20:01 +0200 |
| commit | b617a5b2eac47228472479f1a72b12189c41cca0 (patch) | |
| tree | 689e439d043fe52bc82d7fd05b02c9c829b24847 /ext/sodium | |
| parent | 8b8b625d088c859a3dc42f31acd7ec95b780158e (diff) | |
| parent | 950c338f8012f8ca4a2928cc833fb7efa05a905e (diff) | |
| download | php-git-b617a5b2eac47228472479f1a72b12189c41cca0.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'ext/sodium')
| -rw-r--r-- | ext/sodium/libsodium.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index 490e872008..f9276b4aac 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -37,9 +37,8 @@ static zend_class_entry *sodium_exception_ce; ZEND_BEGIN_ARG_INFO_EX(AI_None, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(AI_FirstArgByReferenceSecondLength, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(AI_FirstArgByReference, 0, 0, 1) ZEND_ARG_INFO(1, reference) - ZEND_ARG_INFO(0, length) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(AI_String, 0, 0, 1) @@ -339,7 +338,7 @@ static const zend_function_entry sodium_functions[] = { PHP_FE(sodium_compare, AI_TwoStrings) PHP_FE(sodium_increment, AI_StringRef) PHP_FE(sodium_memcmp, AI_TwoStrings) - PHP_FE(sodium_memzero, AI_FirstArgByReferenceSecondLength) + PHP_FE(sodium_memzero, AI_FirstArgByReference) PHP_FE(sodium_pad, AI_StringAndLength) PHP_FE(sodium_unpad, AI_StringAndLength) |