com php-src: ext/sodium: sodium_compare() is always available: ext/sodium/libsodium.c
| From: | Frank Denis | Date: | Mon, 02 Oct 2017 20:23:53 +0000 |
| Subject: | com php-src: ext/sodium: sodium_compare() is always available: ext/sodium/libsodium.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99595@lists.php.net to get a copy of this message | ||
Commit: 6de12a5f1e466c7b965c1c16ecb9d39f351fd994
Author: Frank Denis <github@pureftpd.org> Mon, 2 Oct 2017 22:23:53 +0200
Parents: 40ab4c9d4ed4ed4370b0681f80258314d81cde8e
Branches: PHP-7.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6de12a5f1e466c7b965c1c16ecb9d39f351fd994
Log:
ext/sodium: sodium_compare() is always available
Changed paths:
M ext/sodium/libsodium.c
Diff:
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
index 0051b8e..f3e5d26 100644
--- 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)