]> granicus.if.org Git - php/commitdiff
sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES
authorFrank Denis <github@pureftpd.org>
Sun, 30 Jul 2017 12:46:10 +0000 (14:46 +0200)
committerFrank Denis <github@pureftpd.org>
Sun, 30 Jul 2017 12:47:49 +0000 (14:47 +0200)
chacha20poly1305_ietf was implemented in libsodium 1.0.4 which is way earlier
than the minimum version we support.

ext/sodium/libsodium.c

index 617212a0d19bc657315c733d827362baf654ff08..4a7453a7f20ee44c5740e4a57cede9642fe74a9d 100644 (file)
@@ -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)