com php-src: sodium ext: No need for #ifdef crypto_aead_cha cha20poly1305_IETF_: ext/sodium/libsodium .c

Commit: 03314e3f699a3a89e35482423b81e967915f1b2d Author: Frank Denis <github@pureftpd.org> Tue, 8 Aug 2017 17:42:38 +0200 Parents: 596a892c5ead19d67c4be4ceba7056a841fd04cb Branches: PHP-7.2 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=03314e3f699a3a89e35482423b81e967915f1b2d Log: sodium ext: No need for #ifdef crypto_aead_chacha20poly1305_IETF_ chacha20poly1305_ietf was implemented in libsodium 1.0.4 which is way earlier than the minimum version we support. Changed paths: M ext/sodium/libsodium.c Diff: diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index 4dea01e..9651155 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -364,7 +364,6 @@ PHP_MINIT_FUNCTION(sodium) crypto_aead_chacha20poly1305_NPUBBYTES, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_ABYTES", crypto_aead_chacha20poly1305_ABYTES, CONST_CS | CONST_PERSISTENT); -#ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES", crypto_aead_chacha20poly1305_KEYBYTES, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES", @@ -373,7 +372,6 @@ PHP_MINIT_FUNCTION(sodium) crypto_aead_chacha20poly1305_IETF_NPUBBYTES, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES", crypto_aead_chacha20poly1305_ABYTES, CONST_CS | CONST_PERSISTENT); -#endif #ifdef crypto_aead_xchacha20poly1305_IETF_NPUBBYTES REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES", crypto_aead_xchacha20poly1305_IETF_KEYBYTES, CONST_CS | CONST_PERSISTENT);