From: Frank Denis Date: Sun, 30 Jul 2017 12:46:10 +0000 (+0200) Subject: sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES X-Git-Tag: php-7.2.0beta2~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85895b2e5b739827926a122a5d9c6793eee6f1c5;p=php 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. --- diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index 617212a0d1..4a7453a7f2 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)