From ad120c5ae93b49aeb4661b84f981beda2b31cde8 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 2 Oct 2017 21:40:38 +0200 Subject: [PATCH] ext/sodium: add arginfo definitions that will be required later Don't check for existence of aesgcm symbols, since we only support libsodium >= 1.0.8 --- ext/sodium/libsodium.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index edef5f3681..62245d5604 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -60,6 +60,13 @@ ZEND_BEGIN_ARG_INFO_EX(AI_StringAndMaybeString, 0, 0, 1) ZEND_ARG_INFO(0, string_2) 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_ARG_INFO(1, string_1) 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_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_ARG_INFO(0, string) 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_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_ARG_INFO(1, state) /* optional */ @@ -182,8 +213,7 @@ ZEND_BEGIN_ARG_INFO_EX(AI_KDF, 0, 0, 4) ZEND_ARG_INFO(0, key) ZEND_END_ARG_INFO() -#if defined(HAVE_CRYPTO_AEAD_AES256GCM) && defined(crypto_aead_aes256gcm_KEYBYTES) && \ - (defined(__amd64) || defined(__amd64__) || defined(__x86_64__) || defined(__i386__) || \ +#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64__) || defined(__i386__) || \ defined(_M_AMD64) || defined(_M_IX86)) # define HAVE_AESGCM 1 #endif -- 2.40.0