com php-src: sodium ext: no need for #ifdef crypto_aead_cha cha20poly1305_IETF_NPUBBYTES: ext/sodium/li bsodium.c
| From: | Frank Denis | Date: | Sun, 30 Jul 2017 12:47:49 +0000 |
| Subject: | com php-src: sodium ext: no need for #ifdef crypto_aead_cha cha20poly1305_IETF_NPUBBYTES: ext/sodium/li bsodium.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98863@lists.php.net to get a copy of this message | ||
Commit: 85895b2e5b739827926a122a5d9c6793eee6f1c5
Author: Frank Denis <github@pureftpd.org> Sun, 30 Jul 2017 14:46:10 +0200
Parents: 1d7e1f845f7becc34096792d667a0344d8c984c6
Branches: PHP-7.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=85895b2e5b739827926a122a5d9c6793eee6f1c5
Log:
sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES
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 617212a..4a7453a 100644
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@ -189,10 +189,8 @@ const zend_function_entry sodium_functions[] = {
#endif
PHP_FE(sodium_crypto_aead_chacha20poly1305_decrypt, AI_StringAndADAndNonceAndKey)
PHP_FE(sodium_crypto_aead_chacha20poly1305_encrypt, AI_StringAndADAndNonceAndKey)
-#ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES
PHP_FE(sodium_crypto_aead_chacha20poly1305_ietf_decrypt, AI_StringAndADAndNonceAndKey)
PHP_FE(sodium_crypto_aead_chacha20poly1305_ietf_encrypt, AI_StringAndADAndNonceAndKey)
-#endif
#ifdef crypto_aead_xchacha20poly1305_IETF_NPUBBYTES
PHP_FE(sodium_crypto_aead_xchacha20poly1305_ietf_decrypt, AI_StringAndADAndNonceAndKey)
PHP_FE(sodium_crypto_aead_xchacha20poly1305_ietf_encrypt, AI_StringAndADAndNonceAndKey)