php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  ext/sodium: use correct constants and error messages (#20852)
This commit is contained in:
Frank Denis
2026-01-07 09:51:46 +01:00
parent 171b52c98f 83f3d5d487
commit a04fa6c1f0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/sodium/libsodium.c
View File

@@ -2603,7 +2603,7 @@ PHP_FUNCTION(sodium_crypto_scalarmult)
RETURN_THROWS();
}
if (p_len != crypto_scalarmult_BYTES) {
zend_argument_error(sodium_exception_ce, 2, "must be SODIUM_CRYPTO_SCALARMULT_SCALARBYTES bytes long");
zend_argument_error(sodium_exception_ce, 2, "must be SODIUM_CRYPTO_SCALARMULT_BYTES bytes long");
RETURN_THROWS();
}
q = zend_string_alloc(crypto_scalarmult_BYTES, 0);
@@ -2674,7 +2674,7 @@ PHP_FUNCTION(sodium_crypto_scalarmult_ristretto255_base)
zend_argument_error(sodium_exception_ce, 1, "must not be zero", 0);
RETURN_THROWS();
}
ZSTR_VAL(q)[crypto_scalarmult_BYTES] = 0;
ZSTR_VAL(q)[crypto_scalarmult_ristretto255_BYTES] = 0;
RETURN_NEW_STR(q);
}
@@ -3214,7 +3214,7 @@ PHP_FUNCTION(sodium_crypto_kdf_derive_from_key)
RETURN_THROWS();
}
if (key_len != crypto_kdf_KEYBYTES) {
zend_argument_error(sodium_exception_ce, 4, "must be SODIUM_CRYPTO_KDF_BYTES_MIN bytes long");
zend_argument_error(sodium_exception_ce, 4, "must be SODIUM_CRYPTO_KDF_KEYBYTES bytes long");
RETURN_THROWS();
}
memcpy(ctx_padded, ctx, crypto_kdf_CONTEXTBYTES);