clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

sodium ext: long -> zend_long

Browse Source
This commit is contained in:
Frank Denis 2017-08-08 17:36:06 +02:00
parent 3140d40421
commit 631fc3c9c1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/sodium/libsodium.c
View File

@ -2990,8 +2990,8 @@ PHP_FUNCTION(sodium_crypto_kdf_derive_from_key)
char *ctx; char *ctx;
char *key; char *key;
zend_string *subkey; zend_string *subkey;
long subkey_id; zend_long subkey_id;
long subkey_len; zend_long subkey_len;
size_t ctx_len; size_t ctx_len;
size_t key_len; size_t key_len;
@ -3006,7 +3006,7 @@ PHP_FUNCTION(sodium_crypto_kdf_derive_from_key)
zend_throw_exception(sodium_exception_ce, "subkey cannot be smaller than sodium_crypto_kdf_BYTES_MIN", 0); zend_throw_exception(sodium_exception_ce, "subkey cannot be smaller than sodium_crypto_kdf_BYTES_MIN", 0);
return; return;
} }
if (subkey_len > crypto_kdf_BYTES_MAX) { if (subkey_len > crypto_kdf_BYTES_MAX || subkey_len > SIZE_MAX) {
zend_throw_exception(sodium_exception_ce, "subkey cannot be larger than sodium_crypto_kdf_BYTES_MAX", 0); zend_throw_exception(sodium_exception_ce, "subkey cannot be larger than sodium_crypto_kdf_BYTES_MAX", 0);
return; return;
} }
@ -3033,7 +3033,7 @@ PHP_FUNCTION(sodium_crypto_kdf_derive_from_key)
salt[6] = (unsigned char) (((uint64_t) subkey_id) >> 48); salt[6] = (unsigned char) (((uint64_t) subkey_id) >> 48);
salt[7] = (unsigned char) (((uint64_t) subkey_id) >> 56); salt[7] = (unsigned char) (((uint64_t) subkey_id) >> 56);
memset(salt + 8, 0, (sizeof salt) - 8); memset(salt + 8, 0, (sizeof salt) - 8);
subkey = zend_string_alloc(subkey_len, 0); subkey = zend_string_alloc((size_t) subkey_len, 0);
if (crypto_generichash_blake2b_salt_personal((unsigned char *) ZSTR_VAL(subkey), if (crypto_generichash_blake2b_salt_personal((unsigned char *) ZSTR_VAL(subkey),
(size_t) subkey_len, (size_t) subkey_len,
NULL, 0, NULL, 0,