archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/sodium: add arginfo definitions that will be required later

Browse source 
Don't check for existence of aesgcm symbols, since we only support
libsodium >= 1.0.8
This commit is contained in:
Frank Denis 2017-10-02 21:40:38 +02:00
parent 519ca1d53b
commit ad120c5ae9
1 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

34
ext/sodium/libsodium.c
View file

@ -60,6 +60,13 @@ ZEND_BEGIN_ARG_INFO_EX(AI_StringAndMaybeString, 0, 0, 1)
ZEND_ARG_INFO(0, string_2) ZEND_ARG_INFO(0, string_2)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndIdAndMaybeString, 0, 0, 2)
ZEND_ARG_INFO(0, string_1)
ZEND_ARG_INFO(0, id)
/* optional */
ZEND_ARG_INFO(0, string_2)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(AI_StringRefAndString, 0, 0, 2) ZEND_BEGIN_ARG_INFO_EX(AI_StringRefAndString, 0, 0, 2)
ZEND_ARG_INFO(1, string_1) ZEND_ARG_INFO(1, string_1)
ZEND_ARG_INFO(0, string_2) ZEND_ARG_INFO(0, string_2)
@ -75,6 +82,11 @@ ZEND_BEGIN_ARG_INFO_EX(AI_StringAndLength, 0, 0, 2)
ZEND_ARG_INFO(0, length) ZEND_ARG_INFO(0, length)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndId, 0, 0, 2)
ZEND_ARG_INFO(0, string)
ZEND_ARG_INFO(0, id)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndKeyPair, 0, 0, 2) ZEND_BEGIN_ARG_INFO_EX(AI_StringAndKeyPair, 0, 0, 2)
ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, string)
ZEND_ARG_INFO(0, keypair) ZEND_ARG_INFO(0, keypair)
@ -148,6 +160,25 @@ ZEND_BEGIN_ARG_INFO_EX(AI_StringAndADAndNonceAndKey, 0, 0, 4)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReference, 0, 0, 1)
ZEND_ARG_INFO(1, state)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReferenceAndStringAndMaybeStringAndLong, 0, 0, 2)
ZEND_ARG_INFO(1, state)
ZEND_ARG_INFO(0, string)
/* optional */
ZEND_ARG_INFO(0, string)
ZEND_ARG_INFO(0, long)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReferenceAndStringAndMaybeString, 0, 0, 2)
ZEND_ARG_INFO(1, state)
ZEND_ARG_INFO(0, string)
/* optional */
ZEND_ARG_INFO(0, string)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReferenceAndMaybeLength, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(AI_StateByReferenceAndMaybeLength, 0, 0, 1)
ZEND_ARG_INFO(1, state) ZEND_ARG_INFO(1, state)
/* optional */ /* optional */
@ -182,8 +213,7 @@ ZEND_BEGIN_ARG_INFO_EX(AI_KDF, 0, 0, 4)
ZEND_ARG_INFO(0, key) ZEND_ARG_INFO(0, key)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
#if defined(HAVE_CRYPTO_AEAD_AES256GCM) && defined(crypto_aead_aes256gcm_KEYBYTES) && \ #if (defined(__amd64) || defined(__amd64__) || defined(__x86_64__) || defined(__i386__) || \
(defined(__amd64) || defined(__amd64__) || defined(__x86_64__) || defined(__i386__) || \
defined(_M_AMD64) || defined(_M_IX86)) defined(_M_AMD64) || defined(_M_IX86))
# define HAVE_AESGCM 1 # define HAVE_AESGCM 1
#endif #endif