com php-src: ext/sodium: checks for crypto_box_SEALBYTES are not required: ext/sodium/libsodium.c
| From: | Frank Denis | Date: | Mon, 02 Oct 2017 20:11:29 +0000 |
| Subject: | com php-src: ext/sodium: checks for crypto_box_SEALBYTES are not required: ext/sodium/libsodium.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99600@lists.php.net to get a copy of this message | ||
Commit: 986a9e879a10b8112a69c9095308dedecd534b3c
Author: Frank Denis <github@pureftpd.org> Mon, 2 Oct 2017 22:11:29 +0200
Parents: 4d1707b76401bc53c31789a785298826c6648ec9
Branches: PHP-7.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=986a9e879a10b8112a69c9095308dedecd534b3c
Log:
ext/sodium: checks for crypto_box_SEALBYTES are not required
Changed paths:
M ext/sodium/libsodium.c
Diff:
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium..c
index 68a85ef..8ad365c 100644
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@ -456,10 +456,8 @@ PHP_MINIT_FUNCTION(sodium)
crypto_auth_BYTES, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_AUTH_KEYBYTES",
crypto_auth_KEYBYTES, CONST_CS | CONST_PERSISTENT);
-#ifdef crypto_box_SEALBYTES
REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_BOX_SEALBYTES",
crypto_box_SEALBYTES, CONST_CS | CONST_PERSISTENT);
-#endif
REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_BOX_SECRETKEYBYTES",
crypto_box_SECRETKEYBYTES, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SODIUM_CRYPTO_BOX_PUBLICKEYBYTES",
@@ -1293,7 +1291,6 @@ PHP_FUNCTION(sodium_crypto_box_open)
}
}
-#ifdef crypto_box_SEALBYTES
PHP_FUNCTION(sodium_crypto_box_seal)
{
zend_string *ciphertext;
@@ -1368,7 +1365,6 @@ PHP_FUNCTION(sodium_crypto_box_seal_open)
RETURN_STR(msg);
}
}
-#endif
PHP_FUNCTION(sodium_crypto_sign_keypair)
{