com php-src: sodium ext: define crypto_aead_chacha20pol y1305_ietf_KEYBYTES if needed: ext/sodium/l ibsodium.c
| From: | Frank Denis | Date: | Sat, 22 Jul 2017 17:57:44 +0000 |
| Subject: | com php-src: sodium ext: define crypto_aead_chacha20pol y1305_ietf_KEYBYTES if needed: ext/sodium/l ibsodium.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98720@lists.php.net to get a copy of this message | ||
Commit: c499bd12f706df927bf3c6d6c21797aa065c4a52
Author: Frank Denis <github@pureftpd.org> Sat, 22 Jul 2017 19:57:44 +0200
Parents: 8a2e747a7b8cac880e0aa9635e0f70ce222f3c21
Branches: PHP-7.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c499bd12f706df927bf3c6d6c21797aa065c4a52
Log:
sodium ext: define crypto_aead_chacha20poly1305_ietf_KEYBYTES if needed
Some old libsodium versions didn't had a dedicated constant for the
IETF version of this construction.
Changed paths:
M ext/sodium/libsodium.c
Diff:
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
index b61c21d..139b807 100644
--- a/ext/sodium/libsodium.c
+++ b/ext/sodium/libsodium.c
@@ -175,6 +175,10 @@ ZEND_END_ARG_INFO()
# define HAVE_AESGCM 1
#endif
+#ifndef crypto_aead_chacha20poly1305_ietf_KEYBYTES
+# define crypto_aead_chacha20poly1305_ietf_KEYBYTES crypto_aead_chacha20poly1305_KEYBYTES
+#endif
+
const zend_function_entry sodium_functions[] = {
PHP_FE(sodium_crypto_aead_aes256gcm_is_available, AI_None)
#ifdef HAVE_AESGCM