Merge branch 'PHP-7.4'

* PHP-7.4:
  Null terminate the sodium_crypto_kx_keypair() result

diff --cc ext/sodium/libsodium.c
index 7a1751b394b9ddba3a0e5deba73d84586fe919ca,abde3b89945a899a993b3bbf04e39230dee7b940..18f7d3db1ddd1d7f2c3fc77e571e86c3885cf47a
--- 1/ext/sodium/libsodium.c
--- 2/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@@ -2493,8 -2900,9 +2493,9 @@@ PHP_FUNCTION(sodium_crypto_kx_keypair
        randombytes_buf(sk, crypto_kx_SECRETKEYBYTES);
        if (crypto_scalarmult_base(pk, sk) != 0) {
                zend_throw_exception(sodium_exception_ce, "internal error", 0);
 -              return;
 +              RETURN_THROWS();
        }
+       ZSTR_VAL(keypair)[crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES] = 0;
        RETURN_STR(keypair);
  }