]> granicus.if.org Git - php/commitdiff
sodium ext: No need for #ifdef crypto_aead_chacha20poly1305_IETF_
authorFrank Denis <github@pureftpd.org>
Tue, 8 Aug 2017 15:42:38 +0000 (17:42 +0200)
committerFrank Denis <github@pureftpd.org>
Tue, 8 Aug 2017 15:42:38 +0000 (17:42 +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 4dea01ea8757170ca903d0457d3fadaad5799ee4..9651155d30a5893edba161729c782d64cc6cae73 100644 (file)
@@ -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);