diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-09 15:30:28 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-09 15:30:28 +0200 |
| commit | 8ead77936e68554d47033c5c90d2c48d96db0212 (patch) | |
| tree | 1e143e85e6fd01061c3d2d9cf298ff726c7e7e37 | |
| parent | 41a4379cb45419a376043ca5f8c5a2bca82cea7c (diff) | |
| download | php-git-8ead77936e68554d47033c5c90d2c48d96db0212.tar.gz | |
Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init()
Backport jedisct1/libsodium.php@28d13bf437cb969a0583031fc7ac54c5a8dc8116.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/sodium/libsodium.c | 1 | ||||
| -rw-r--r-- | ext/sodium/tests/bug78510.phpt | 14 |
3 files changed, 19 insertions, 0 deletions
@@ -21,6 +21,10 @@ PHP NEWS - PDO_MySQL: . Fixed bug #41997 (SP call yields additional empty result set). (cmb) +- sodium: + . Fixed bug #78510 (Partially uninitialized buffer returned by + sodium_crypto_generichash_init()). (Frank Denis, cmb) + 29 Aug 2019, PHP 7.2.22 - Core: diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index f7b3ea4dca..584a918b6e 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -934,6 +934,7 @@ PHP_FUNCTION(sodium_crypto_generichash_init) zend_throw_exception(sodium_exception_ce, "unsupported key length", 0); return; } + memset(&state_tmp, 0, sizeof state_tmp); if (crypto_generichash_init((void *) &state_tmp, key, (size_t) key_len, (size_t) hash_len) != 0) { zend_throw_exception(sodium_exception_ce, "internal error", 0); diff --git a/ext/sodium/tests/bug78510.phpt b/ext/sodium/tests/bug78510.phpt new file mode 100644 index 0000000000..dc7e478424 --- /dev/null +++ b/ext/sodium/tests/bug78510.phpt @@ -0,0 +1,14 @@ +--TEST-- +Bug #78510 (Partially uninitialized buffer returned by sodium_crypto_generichash_init()) +--SKIPIF-- +<?php +if (!extension_loaded("sodium")) print "skip extension not loaded"; +?> +--FILE-- +<?php +$key = hex2bin('36be2998c85757e98c1abf3687c8db3a849a393701c05454023d9aba1096fd47'); +$y = sodium_crypto_generichash_init($key, 64); +var_dump(bin2hex($y)); +?> +--EXPECT-- +string(768) "48e9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b000000000000000000000000000000000000000000000000000000000000000036be2998c85757e98c1abf3687c8db3a849a393701c05454023d9aba1096fd4700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000" |