diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-14 15:52:15 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-14 15:52:15 +0200 |
| commit | 5885eecf23dac47778da664f14010b6f1979fbfd (patch) | |
| tree | ab95daea05c8aafff17f29ed2991eb3638da3c05 | |
| parent | a0c231c0f5b99e326d3082e67fe8bcd49ac09cb4 (diff) | |
| parent | f6d7af21a399979952ac4b4f066c42c7e167f5bf (diff) | |
| download | php-git-5885eecf23dac47778da664f14010b6f1979fbfd.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Null terminate the sodium_crypto_kx_keypair() result
| -rw-r--r-- | ext/sodium/libsodium.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index 60bdd29aca..abde3b8994 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -2902,6 +2902,7 @@ PHP_FUNCTION(sodium_crypto_kx_keypair) zend_throw_exception(sodium_exception_ce, "internal error", 0); return; } + ZSTR_VAL(keypair)[crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES] = 0; RETURN_STR(keypair); } |