Skip to content

Commit 268ebcb

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Fix argument number in sodium_crypto_stream_xchacha20_xor_ic() key length error (#25363)
2 parents 994a8f3 + 8413eaa commit 268ebcb

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

‎ext/sodium/libsodium.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,7 @@ PHP_FUNCTION(sodium_crypto_stream_xchacha20_xor_ic)
13911391
RETURN_THROWS();
13921392
}
13931393
if (key_len != crypto_stream_xchacha20_KEYBYTES) {
1394-
zend_argument_error(sodium_exception_ce, 3, "must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long");
1394+
zend_argument_error(sodium_exception_ce, 4, "must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long");
13951395
RETURN_THROWS();
13961396
}
13971397
ciphertext_len = msg_len;

‎ext/sodium/tests/crypto_stream_xchacha20.phpt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ try {
7575
} catch (SodiumException $ex) {
7676
echo $ex->getMessage(), "\n";
7777
}
78+
try {
79+
sodium_crypto_stream_xchacha20_xor_ic($stream, $nonce, 0, substr($key, 1));
80+
} catch (Throwable $ex) {
81+
echo $ex::class, ': ', $ex->getMessage(), "\n";
82+
}
7883

7984
?>
8085
--EXPECT--
@@ -94,3 +99,4 @@ sodium_crypto_stream_xchacha20(): Argument #2 ($nonce) must be SODIUM_CRYPTO_STR
9499
sodium_crypto_stream_xchacha20(): Argument #3 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long
95100
sodium_crypto_stream_xchacha20_xor(): Argument #2 ($nonce) must be SODIUM_CRYPTO_STREAM_XCHACHA20_NONCEBYTES bytes long
96101
sodium_crypto_stream_xchacha20_xor(): Argument #3 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long
102+
SodiumException: sodium_crypto_stream_xchacha20_xor_ic(): Argument #4 ($key) must be SODIUM_CRYPTO_STREAM_XCHACHA20_KEYBYTES bytes long

0 commit comments

Comments
 (0)