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.
php · Aug 8, 2017 · 03314e3 · 03314e3
1 parent 596a892
commit 03314e3
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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);