ext/sodium: sodium_compare() is always available

jedisct1 · jedisct1 · commit 6de12a5f1e46 · 2017-10-02T22:23:53.000+02:00
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
@@ -3141,8 +3141,6 @@ PHP_FUNCTION(sodium_crypto_sign_ed25519_pk_to_curve25519)
 	RETURN_STR(ecdhkey);
 }
 
-#if SODIUM_LIBRARY_VERSION_MAJOR > 7 || \
-	(SODIUM_LIBRARY_VERSION_MAJOR == 7 && SODIUM_LIBRARY_VERSION_MINOR >= 6)
 PHP_FUNCTION(sodium_compare)
 {
 	char      *buf1;
@@ -3164,7 +3162,6 @@ PHP_FUNCTION(sodium_compare)
 								   (const unsigned char *) buf2, (size_t) len1));
 	}
 }
-#endif
 
 #ifdef HAVE_AESGCM
 PHP_FUNCTION(sodium_crypto_aead_aes256gcm_keygen)

Original file line number	Diff line number	Diff line change
`@@ -3141,8 +3141,6 @@ PHP_FUNCTION(sodium_crypto_sign_ed25519_pk_to_curve25519)`
`3141`	`3141`	`RETURN_STR(ecdhkey);`
`3142`	`3142`	`}`
`3143`	`3143`
`3144`		`-#if SODIUM_LIBRARY_VERSION_MAJOR > 7 \|\| \`
`3145`		`- (SODIUM_LIBRARY_VERSION_MAJOR == 7 && SODIUM_LIBRARY_VERSION_MINOR >= 6)`
`3146`	`3144`	`PHP_FUNCTION(sodium_compare)`
`3147`	`3145`	`{`
`3148`	`3146`	`char *buf1;`
`@@ -3164,7 +3162,6 @@ PHP_FUNCTION(sodium_compare)`
`3164`	`3162`	`(const unsigned char *) buf2, (size_t) len1));`
`3165`	`3163`	`}`
`3166`	`3164`	`}`
`3167`		`-#endif`
`3168`	`3165`
`3169`	`3166`	`#ifdef HAVE_AESGCM`
`3170`	`3167`	`PHP_FUNCTION(sodium_crypto_aead_aes256gcm_keygen)`