Skip to content

Commit f7c61c0

Browse files
cmb69cmb69
committed
Add ext/sodium arginfo stubs
1 parent 174ab25 commit f7c61c0

File tree

3 files changed

+661
-264
lines changed

3 files changed

+661
-264
lines changed

‎ext/sodium/libsodium.c

+87-264
Original file line numberDiff line numberDiff line change
@@ -32,190 +32,13 @@
3232

3333
static zend_class_entry *sodium_exception_ce;
3434

35-
ZEND_BEGIN_ARG_INFO_EX(AI_None, 0, 0, 0)
36-
ZEND_END_ARG_INFO()
37-
38-
ZEND_BEGIN_ARG_INFO_EX(AI_FirstArgByReference, 0, 0, 1)
39-
ZEND_ARG_INFO(1, reference)
40-
ZEND_END_ARG_INFO()
41-
42-
ZEND_BEGIN_ARG_INFO_EX(AI_String, 0, 0, 1)
43-
ZEND_ARG_INFO(0, string)
44-
ZEND_END_ARG_INFO()
45-
46-
ZEND_BEGIN_ARG_INFO_EX(AI_StringRef, 0, 0, 1)
47-
ZEND_ARG_INFO(1, string)
48-
ZEND_END_ARG_INFO()
49-
50-
ZEND_BEGIN_ARG_INFO_EX(AI_TwoStrings, 0, 0, 2)
51-
ZEND_ARG_INFO(0, string_1)
52-
ZEND_ARG_INFO(0, string_2)
53-
ZEND_END_ARG_INFO()
54-
55-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndMaybeString, 0, 0, 1)
56-
ZEND_ARG_INFO(0, string_1)
57-
/* optional */
58-
ZEND_ARG_INFO(0, string_2)
59-
ZEND_END_ARG_INFO()
60-
61-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndIdAndMaybeString, 0, 0, 2)
62-
ZEND_ARG_INFO(0, string_1)
63-
ZEND_ARG_INFO(0, id)
64-
/* optional */
65-
ZEND_ARG_INFO(0, string_2)
66-
ZEND_END_ARG_INFO()
67-
68-
ZEND_BEGIN_ARG_INFO_EX(AI_StringRefAndString, 0, 0, 2)
69-
ZEND_ARG_INFO(1, string_1)
70-
ZEND_ARG_INFO(0, string_2)
71-
ZEND_END_ARG_INFO()
72-
73-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndKey, 0, 0, 2)
74-
ZEND_ARG_INFO(0, string)
75-
ZEND_ARG_INFO(0, key)
76-
ZEND_END_ARG_INFO()
77-
78-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndLength, 0, 0, 2)
79-
ZEND_ARG_INFO(0, string)
80-
ZEND_ARG_INFO(0, length)
81-
ZEND_END_ARG_INFO()
82-
83-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndId, 0, 0, 2)
84-
ZEND_ARG_INFO(0, string)
85-
ZEND_ARG_INFO(0, id)
86-
ZEND_END_ARG_INFO()
87-
88-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndKeyPair, 0, 0, 2)
89-
ZEND_ARG_INFO(0, string)
90-
ZEND_ARG_INFO(0, keypair)
91-
ZEND_END_ARG_INFO()
92-
93-
ZEND_BEGIN_ARG_INFO_EX(AI_SignatureAndStringAndKey, 0, 0, 3)
94-
ZEND_ARG_INFO(0, signature)
95-
ZEND_ARG_INFO(0, string)
96-
ZEND_ARG_INFO(0, key)
97-
ZEND_END_ARG_INFO()
98-
99-
ZEND_BEGIN_ARG_INFO_EX(AI_Key, 0, 0, 1)
100-
ZEND_ARG_INFO(0, key)
101-
ZEND_END_ARG_INFO()
102-
103-
ZEND_BEGIN_ARG_INFO_EX(AI_SecretKeyAndPublicKey, 0, 0, 2)
104-
ZEND_ARG_INFO(0, secret_key)
105-
ZEND_ARG_INFO(0, public_key)
106-
ZEND_END_ARG_INFO()
107-
108-
ZEND_BEGIN_ARG_INFO_EX(AI_LengthAndNonceAndKey, 0, 0, 3)
109-
ZEND_ARG_INFO(0, length)
110-
ZEND_ARG_INFO(0, nonce)
111-
ZEND_ARG_INFO(0, key)
112-
ZEND_END_ARG_INFO()
113-
114-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndNonceAndKey, 0, 0, 3)
115-
ZEND_ARG_INFO(0, string)
116-
ZEND_ARG_INFO(0, nonce)
117-
ZEND_ARG_INFO(0, key)
118-
ZEND_END_ARG_INFO()
119-
120-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndNonceAndKeyPair, 0, 0, 3)
121-
ZEND_ARG_INFO(0, string)
122-
ZEND_ARG_INFO(0, nonce)
123-
ZEND_ARG_INFO(0, key)
124-
ZEND_END_ARG_INFO()
125-
126-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndMaybeKeyAndLength, 0, 0, 1)
127-
ZEND_ARG_INFO(0, string)
128-
/* optional */
129-
ZEND_ARG_INFO(0, key)
130-
ZEND_ARG_INFO(0, length)
131-
ZEND_END_ARG_INFO()
132-
133-
ZEND_BEGIN_ARG_INFO_EX(AI_LengthAndPasswordAndSaltAndOpsLimitAndMemLimit, 0, 0, 5)
134-
ZEND_ARG_INFO(0, length)
135-
ZEND_ARG_INFO(0, password)
136-
ZEND_ARG_INFO(0, salt)
137-
ZEND_ARG_INFO(0, opslimit)
138-
ZEND_ARG_INFO(0, memlimit)
139-
/* optional */
140-
ZEND_ARG_INFO(0, alg)
141-
ZEND_END_ARG_INFO()
142-
143-
ZEND_BEGIN_ARG_INFO_EX(AI_PasswordAndOpsLimitAndMemLimit, 0, 0, 3)
144-
ZEND_ARG_INFO(0, password)
145-
ZEND_ARG_INFO(0, opslimit)
146-
ZEND_ARG_INFO(0, memlimit)
147-
ZEND_END_ARG_INFO()
148-
149-
ZEND_BEGIN_ARG_INFO_EX(AI_HashAndPassword, 0, 0, 2)
150-
ZEND_ARG_INFO(0, hash)
151-
ZEND_ARG_INFO(0, password)
152-
ZEND_END_ARG_INFO()
153-
154-
ZEND_BEGIN_ARG_INFO_EX(AI_StringAndADAndNonceAndKey, 0, 0, 4)
155-
ZEND_ARG_INFO(0, string)
156-
ZEND_ARG_INFO(0, ad)
157-
ZEND_ARG_INFO(0, nonce)
158-
ZEND_ARG_INFO(0, key)
159-
ZEND_END_ARG_INFO()
160-
161-
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReference, 0, 0, 1)
162-
ZEND_ARG_INFO(1, state)
163-
ZEND_END_ARG_INFO()
164-
165-
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReferenceAndStringAndMaybeStringAndLong, 0, 0, 2)
166-
ZEND_ARG_INFO(1, state)
167-
ZEND_ARG_INFO(0, string)
168-
/* optional */
169-
ZEND_ARG_INFO(0, string)
170-
ZEND_ARG_INFO(0, long)
171-
ZEND_END_ARG_INFO()
172-
173-
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReferenceAndStringAndMaybeString, 0, 0, 2)
174-
ZEND_ARG_INFO(1, state)
175-
ZEND_ARG_INFO(0, string)
176-
/* optional */
177-
ZEND_ARG_INFO(0, string)
178-
ZEND_END_ARG_INFO()
179-
180-
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReferenceAndMaybeLength, 0, 0, 1)
181-
ZEND_ARG_INFO(1, state)
182-
/* optional */
183-
ZEND_ARG_INFO(0, length)
184-
ZEND_END_ARG_INFO()
185-
186-
ZEND_BEGIN_ARG_INFO_EX(AI_StateByReferenceAndString, 0, 0, 2)
187-
ZEND_ARG_INFO(1, state)
188-
ZEND_ARG_INFO(0, string)
189-
ZEND_END_ARG_INFO()
190-
191-
ZEND_BEGIN_ARG_INFO_EX(AI_MaybeKeyAndLength, 0, 0, 0)
192-
/* optional */
193-
ZEND_ARG_INFO(0, key)
194-
ZEND_ARG_INFO(0, length)
195-
ZEND_END_ARG_INFO()
196-
197-
ZEND_BEGIN_ARG_INFO_EX(AI_KXClientSession, 0, 0, 2)
198-
ZEND_ARG_INFO(0, client_keypair)
199-
ZEND_ARG_INFO(0, server_key)
200-
ZEND_END_ARG_INFO()
201-
202-
ZEND_BEGIN_ARG_INFO_EX(AI_KXServerSession, 0, 0, 2)
203-
ZEND_ARG_INFO(0, server_keypair)
204-
ZEND_ARG_INFO(0, client_key)
205-
ZEND_END_ARG_INFO()
206-
207-
ZEND_BEGIN_ARG_INFO_EX(AI_KDF, 0, 0, 4)
208-
ZEND_ARG_INFO(0, subkey_len)
209-
ZEND_ARG_INFO(0, subkey_id)
210-
ZEND_ARG_INFO(0, context)
211-
ZEND_ARG_INFO(0, key)
212-
ZEND_END_ARG_INFO()
213-
21435
#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64__) || defined(__i386__) || \
21536
defined(_M_AMD64) || defined(_M_IX86))
21637
# define HAVE_AESGCM 1
21738
#endif
21839

40+
#include "libsodium_arginfo.h"
41+
21942
#ifndef crypto_aead_chacha20poly1305_IETF_KEYBYTES
22043
# define crypto_aead_chacha20poly1305_IETF_KEYBYTES crypto_aead_chacha20poly1305_KEYBYTES
22144
#endif
@@ -244,114 +67,114 @@ ZEND_END_ARG_INFO()
24467
#endif
24568

24669
static const zend_function_entry sodium_functions[] = {
247-
PHP_FE(sodium_crypto_aead_aes256gcm_is_available, AI_None)
70+
PHP_FE(sodium_crypto_aead_aes256gcm_is_available, arginfo_sodium_crypto_aead_aes256gcm_is_available)
24871
#ifdef HAVE_AESGCM
249-
PHP_FE(sodium_crypto_aead_aes256gcm_decrypt, AI_StringAndADAndNonceAndKey)
250-
PHP_FE(sodium_crypto_aead_aes256gcm_encrypt, AI_StringAndADAndNonceAndKey)
251-
PHP_FE(sodium_crypto_aead_aes256gcm_keygen, AI_None)
72+
PHP_FE(sodium_crypto_aead_aes256gcm_decrypt, arginfo_sodium_crypto_aead_aes256gcm_decrypt)
73+
PHP_FE(sodium_crypto_aead_aes256gcm_encrypt, arginfo_sodium_crypto_aead_aes256gcm_encrypt)
74+
PHP_FE(sodium_crypto_aead_aes256gcm_keygen, arginfo_sodium_crypto_aead_aes256gcm_keygen)
25275
#endif
253-
PHP_FE(sodium_crypto_aead_chacha20poly1305_decrypt, AI_StringAndADAndNonceAndKey)
254-
PHP_FE(sodium_crypto_aead_chacha20poly1305_encrypt, AI_StringAndADAndNonceAndKey)
255-
PHP_FE(sodium_crypto_aead_chacha20poly1305_keygen, AI_None)
256-
PHP_FE(sodium_crypto_aead_chacha20poly1305_ietf_decrypt, AI_StringAndADAndNonceAndKey)
257-
PHP_FE(sodium_crypto_aead_chacha20poly1305_ietf_encrypt, AI_StringAndADAndNonceAndKey)
258-
PHP_FE(sodium_crypto_aead_chacha20poly1305_ietf_keygen, AI_None)
76+
PHP_FE(sodium_crypto_aead_chacha20poly1305_decrypt, arginfo_sodium_crypto_aead_chacha20poly1305_decrypt)
77+
PHP_FE(sodium_crypto_aead_chacha20poly1305_encrypt, arginfo_sodium_crypto_aead_chacha20poly1305_encrypt)
78+
PHP_FE(sodium_crypto_aead_chacha20poly1305_keygen, arginfo_sodium_crypto_aead_chacha20poly1305_keygen)
79+
PHP_FE(sodium_crypto_aead_chacha20poly1305_ietf_decrypt, arginfo_sodium_crypto_aead_chacha20poly1305_ietf_decrypt)
80+
PHP_FE(sodium_crypto_aead_chacha20poly1305_ietf_encrypt, arginfo_sodium_crypto_aead_chacha20poly1305_ietf_encrypt)
81+
PHP_FE(sodium_crypto_aead_chacha20poly1305_ietf_keygen, arginfo_sodium_crypto_aead_chacha20poly1305_ietf_keygen)
25982
#ifdef crypto_aead_xchacha20poly1305_IETF_NPUBBYTES
260-
PHP_FE(sodium_crypto_aead_xchacha20poly1305_ietf_decrypt, AI_StringAndADAndNonceAndKey)
261-
PHP_FE(sodium_crypto_aead_xchacha20poly1305_ietf_keygen, AI_None)
262-
PHP_FE(sodium_crypto_aead_xchacha20poly1305_ietf_encrypt, AI_StringAndADAndNonceAndKey)
83+
PHP_FE(sodium_crypto_aead_xchacha20poly1305_ietf_decrypt, arginfo_sodium_crypto_aead_xchacha20poly1305_ietf_decrypt)
84+
PHP_FE(sodium_crypto_aead_xchacha20poly1305_ietf_keygen, arginfo_sodium_crypto_aead_xchacha20poly1305_ietf_keygen)
85+
PHP_FE(sodium_crypto_aead_xchacha20poly1305_ietf_encrypt, arginfo_sodium_crypto_aead_xchacha20poly1305_ietf_encrypt)
26386
#endif
264-
PHP_FE(sodium_crypto_auth, AI_StringAndKey)
265-
PHP_FE(sodium_crypto_auth_keygen, AI_None)
266-
PHP_FE(sodium_crypto_auth_verify, AI_SignatureAndStringAndKey)
267-
PHP_FE(sodium_crypto_box, AI_StringAndNonceAndKeyPair)
268-
PHP_FE(sodium_crypto_box_keypair, AI_None)
269-
PHP_FE(sodium_crypto_box_seed_keypair, AI_Key)
270-
PHP_FE(sodium_crypto_box_keypair_from_secretkey_and_publickey, AI_SecretKeyAndPublicKey)
271-
PHP_FE(sodium_crypto_box_open, AI_StringAndNonceAndKey)
272-
PHP_FE(sodium_crypto_box_publickey, AI_Key)
273-
PHP_FE(sodium_crypto_box_publickey_from_secretkey, AI_Key)
274-
PHP_FE(sodium_crypto_box_seal, AI_StringAndKey)
275-
PHP_FE(sodium_crypto_box_seal_open, AI_StringAndKey)
276-
PHP_FE(sodium_crypto_box_secretkey, AI_Key)
277-
PHP_FE(sodium_crypto_kx_keypair, AI_None)
278-
PHP_FE(sodium_crypto_kx_publickey, AI_Key)
279-
PHP_FE(sodium_crypto_kx_secretkey, AI_Key)
280-
PHP_FE(sodium_crypto_kx_seed_keypair, AI_String)
281-
PHP_FE(sodium_crypto_kx_client_session_keys, AI_KXClientSession)
282-
PHP_FE(sodium_crypto_kx_server_session_keys, AI_KXServerSession)
283-
PHP_FE(sodium_crypto_generichash, AI_StringAndMaybeKeyAndLength)
284-
PHP_FE(sodium_crypto_generichash_keygen, AI_None)
285-
PHP_FE(sodium_crypto_generichash_init, AI_MaybeKeyAndLength)
286-
PHP_FE(sodium_crypto_generichash_update, AI_StateByReferenceAndString)
287-
PHP_FE(sodium_crypto_generichash_final, AI_StateByReferenceAndMaybeLength)
288-
PHP_FE(sodium_crypto_kdf_derive_from_key, AI_KDF)
289-
PHP_FE(sodium_crypto_kdf_keygen, AI_None)
87+
PHP_FE(sodium_crypto_auth, arginfo_sodium_crypto_auth)
88+
PHP_FE(sodium_crypto_auth_keygen, arginfo_sodium_crypto_auth_keygen)
89+
PHP_FE(sodium_crypto_auth_verify, arginfo_sodium_crypto_auth_verify)
90+
PHP_FE(sodium_crypto_box, arginfo_sodium_crypto_box)
91+
PHP_FE(sodium_crypto_box_keypair, arginfo_sodium_crypto_box_keypair)
92+
PHP_FE(sodium_crypto_box_seed_keypair, arginfo_sodium_crypto_box_seed_keypair)
93+
PHP_FE(sodium_crypto_box_keypair_from_secretkey_and_publickey, arginfo_sodium_crypto_box_keypair_from_secretkey_and_publickey)
94+
PHP_FE(sodium_crypto_box_open, arginfo_sodium_crypto_box_open)
95+
PHP_FE(sodium_crypto_box_publickey, arginfo_sodium_crypto_box_publickey)
96+
PHP_FE(sodium_crypto_box_publickey_from_secretkey, arginfo_sodium_crypto_box_publickey_from_secretkey)
97+
PHP_FE(sodium_crypto_box_seal, arginfo_sodium_crypto_box_seal)
98+
PHP_FE(sodium_crypto_box_seal_open, arginfo_sodium_crypto_box_seal_open)
99+
PHP_FE(sodium_crypto_box_secretkey, arginfo_sodium_crypto_box_secretkey)
100+
PHP_FE(sodium_crypto_kx_keypair, arginfo_sodium_crypto_kx_keypair)
101+
PHP_FE(sodium_crypto_kx_publickey, arginfo_sodium_crypto_kx_publickey)
102+
PHP_FE(sodium_crypto_kx_secretkey, arginfo_sodium_crypto_kx_secretkey)
103+
PHP_FE(sodium_crypto_kx_seed_keypair, arginfo_sodium_crypto_kx_seed_keypair)
104+
PHP_FE(sodium_crypto_kx_client_session_keys, arginfo_sodium_crypto_kx_client_session_keys)
105+
PHP_FE(sodium_crypto_kx_server_session_keys, arginfo_sodium_crypto_kx_server_session_keys)
106+
PHP_FE(sodium_crypto_generichash, arginfo_sodium_crypto_generichash)
107+
PHP_FE(sodium_crypto_generichash_keygen, arginfo_sodium_crypto_generichash_keygen)
108+
PHP_FE(sodium_crypto_generichash_init, arginfo_sodium_crypto_generichash_init)
109+
PHP_FE(sodium_crypto_generichash_update, arginfo_sodium_crypto_generichash_update)
110+
PHP_FE(sodium_crypto_generichash_final, arginfo_sodium_crypto_generichash_final)
111+
PHP_FE(sodium_crypto_kdf_derive_from_key, arginfo_sodium_crypto_kdf_derive_from_key)
112+
PHP_FE(sodium_crypto_kdf_keygen, arginfo_sodium_crypto_kdf_keygen)
290113
#ifdef crypto_pwhash_SALTBYTES
291-
PHP_FE(sodium_crypto_pwhash, AI_LengthAndPasswordAndSaltAndOpsLimitAndMemLimit)
292-
PHP_FE(sodium_crypto_pwhash_str, AI_PasswordAndOpsLimitAndMemLimit)
293-
PHP_FE(sodium_crypto_pwhash_str_verify, AI_HashAndPassword)
114+
PHP_FE(sodium_crypto_pwhash, arginfo_sodium_crypto_pwhash)
115+
PHP_FE(sodium_crypto_pwhash_str, arginfo_sodium_crypto_pwhash_str)
116+
PHP_FE(sodium_crypto_pwhash_str_verify, arginfo_sodium_crypto_pwhash_str_verify)
294117
#endif
295118
#if SODIUM_LIBRARY_VERSION_MAJOR > 9 || (SODIUM_LIBRARY_VERSION_MAJOR == 9 && SODIUM_LIBRARY_VERSION_MINOR >= 6)
296-
PHP_FE(sodium_crypto_pwhash_str_needs_rehash, AI_PasswordAndOpsLimitAndMemLimit)
119+
PHP_FE(sodium_crypto_pwhash_str_needs_rehash, arginfo_sodium_crypto_pwhash_str_needs_rehash)
297120
#endif
298121
#ifdef crypto_pwhash_scryptsalsa208sha256_SALTBYTES
299-
PHP_FE(sodium_crypto_pwhash_scryptsalsa208sha256, AI_LengthAndPasswordAndSaltAndOpsLimitAndMemLimit)
300-
PHP_FE(sodium_crypto_pwhash_scryptsalsa208sha256_str, AI_PasswordAndOpsLimitAndMemLimit)
301-
PHP_FE(sodium_crypto_pwhash_scryptsalsa208sha256_str_verify, AI_HashAndPassword)
122+
PHP_FE(sodium_crypto_pwhash_scryptsalsa208sha256, arginfo_sodium_crypto_pwhash_scryptsalsa208sha256)
123+
PHP_FE(sodium_crypto_pwhash_scryptsalsa208sha256_str, arginfo_sodium_crypto_pwhash_scryptsalsa208sha256_str)
124+
PHP_FE(sodium_crypto_pwhash_scryptsalsa208sha256_str_verify, arginfo_sodium_crypto_pwhash_scryptsalsa208sha256_str_verify)
302125
#endif
303-
PHP_FE(sodium_crypto_scalarmult, AI_TwoStrings)
304-
PHP_FE(sodium_crypto_secretbox, AI_StringAndNonceAndKey)
305-
PHP_FE(sodium_crypto_secretbox_keygen, AI_None)
306-
PHP_FE(sodium_crypto_secretbox_open, AI_StringAndNonceAndKey)
126+
PHP_FE(sodium_crypto_scalarmult, arginfo_sodium_crypto_scalarmult)
127+
PHP_FE(sodium_crypto_secretbox, arginfo_sodium_crypto_secretbox)
128+
PHP_FE(sodium_crypto_secretbox_keygen, arginfo_sodium_crypto_secretbox_keygen)
129+
PHP_FE(sodium_crypto_secretbox_open, arginfo_sodium_crypto_secretbox_open)
307130
#ifdef crypto_secretstream_xchacha20poly1305_ABYTES
308-
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_keygen, AI_None)
309-
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_init_push, AI_Key)
310-
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_push, AI_StateByReferenceAndStringAndMaybeStringAndLong)
311-
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_init_pull, AI_StringAndKey)
312-
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_pull, AI_StateByReferenceAndStringAndMaybeString)
313-
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_rekey, AI_StateByReference)
131+
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_keygen, arginfo_sodium_crypto_secretstream_xchacha20poly1305_keygen)
132+
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_init_push, arginfo_sodium_crypto_secretstream_xchacha20poly1305_init_push)
133+
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_push, arginfo_sodium_crypto_secretstream_xchacha20poly1305_push)
134+
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_init_pull, arginfo_sodium_crypto_secretstream_xchacha20poly1305_init_pull)
135+
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_pull, arginfo_sodium_crypto_secretstream_xchacha20poly1305_pull)
136+
PHP_FE(sodium_crypto_secretstream_xchacha20poly1305_rekey, arginfo_sodium_crypto_secretstream_xchacha20poly1305_rekey)
314137
#endif
315-
PHP_FE(sodium_crypto_shorthash, AI_StringAndKey)
316-
PHP_FE(sodium_crypto_shorthash_keygen, AI_None)
317-
PHP_FE(sodium_crypto_sign, AI_StringAndKeyPair)
318-
PHP_FE(sodium_crypto_sign_detached, AI_StringAndKeyPair)
319-
PHP_FE(sodium_crypto_sign_ed25519_pk_to_curve25519, AI_Key)
320-
PHP_FE(sodium_crypto_sign_ed25519_sk_to_curve25519, AI_Key)
321-
PHP_FE(sodium_crypto_sign_keypair, AI_None)
322-
PHP_FE(sodium_crypto_sign_keypair_from_secretkey_and_publickey, AI_SecretKeyAndPublicKey)
323-
PHP_FE(sodium_crypto_sign_open, AI_StringAndKeyPair)
324-
PHP_FE(sodium_crypto_sign_publickey, AI_Key)
325-
PHP_FE(sodium_crypto_sign_secretkey, AI_Key)
326-
PHP_FE(sodium_crypto_sign_publickey_from_secretkey, AI_Key)
327-
PHP_FE(sodium_crypto_sign_seed_keypair, AI_Key)
328-
PHP_FE(sodium_crypto_sign_verify_detached, AI_SignatureAndStringAndKey)
329-
PHP_FE(sodium_crypto_stream, AI_LengthAndNonceAndKey)
330-
PHP_FE(sodium_crypto_stream_keygen, AI_None)
331-
PHP_FE(sodium_crypto_stream_xor, AI_StringAndNonceAndKey)
138+
PHP_FE(sodium_crypto_shorthash, arginfo_sodium_crypto_shorthash)
139+
PHP_FE(sodium_crypto_shorthash_keygen, arginfo_sodium_crypto_shorthash_keygen)
140+
PHP_FE(sodium_crypto_sign, arginfo_sodium_crypto_sign)
141+
PHP_FE(sodium_crypto_sign_detached, arginfo_sodium_crypto_sign_detached)
142+
PHP_FE(sodium_crypto_sign_ed25519_pk_to_curve25519, arginfo_sodium_crypto_sign_ed25519_pk_to_curve25519)
143+
PHP_FE(sodium_crypto_sign_ed25519_sk_to_curve25519, arginfo_sodium_crypto_sign_ed25519_sk_to_curve25519)
144+
PHP_FE(sodium_crypto_sign_keypair, arginfo_sodium_crypto_sign_keypair)
145+
PHP_FE(sodium_crypto_sign_keypair_from_secretkey_and_publickey, arginfo_sodium_crypto_sign_keypair_from_secretkey_and_publickey)
146+
PHP_FE(sodium_crypto_sign_open, arginfo_sodium_crypto_sign_open)
147+
PHP_FE(sodium_crypto_sign_publickey, arginfo_sodium_crypto_sign_publickey)
148+
PHP_FE(sodium_crypto_sign_secretkey, arginfo_sodium_crypto_sign_secretkey)
149+
PHP_FE(sodium_crypto_sign_publickey_from_secretkey, arginfo_sodium_crypto_sign_publickey_from_secretkey)
150+
PHP_FE(sodium_crypto_sign_seed_keypair, arginfo_sodium_crypto_sign_seed_keypair)
151+
PHP_FE(sodium_crypto_sign_verify_detached, arginfo_sodium_crypto_sign_verify_detached)
152+
PHP_FE(sodium_crypto_stream, arginfo_sodium_crypto_stream)
153+
PHP_FE(sodium_crypto_stream_keygen, arginfo_sodium_crypto_stream_keygen)
154+
PHP_FE(sodium_crypto_stream_xor, arginfo_sodium_crypto_stream_xor)
332155

333156
/* helpers */
334157

335-
PHP_FE(sodium_add, AI_StringRefAndString)
336-
PHP_FE(sodium_compare, AI_TwoStrings)
337-
PHP_FE(sodium_increment, AI_StringRef)
338-
PHP_FE(sodium_memcmp, AI_TwoStrings)
339-
PHP_FE(sodium_memzero, AI_FirstArgByReference)
340-
PHP_FE(sodium_pad, AI_StringAndLength)
341-
PHP_FE(sodium_unpad, AI_StringAndLength)
158+
PHP_FE(sodium_add, arginfo_sodium_add)
159+
PHP_FE(sodium_compare, arginfo_sodium_compare)
160+
PHP_FE(sodium_increment, arginfo_sodium_increment)
161+
PHP_FE(sodium_memcmp, arginfo_sodium_memcmp)
162+
PHP_FE(sodium_memzero, arginfo_sodium_memzero)
163+
PHP_FE(sodium_pad, arginfo_sodium_pad)
164+
PHP_FE(sodium_unpad, arginfo_sodium_unpad)
342165

343166
/* codecs */
344167

345-
PHP_FE(sodium_bin2hex, AI_String)
346-
PHP_FE(sodium_hex2bin, AI_StringAndMaybeString)
168+
PHP_FE(sodium_bin2hex, arginfo_sodium_bin2hex)
169+
PHP_FE(sodium_hex2bin, arginfo_sodium_hex2bin)
347170
#ifdef sodium_base64_VARIANT_ORIGINAL
348-
PHP_FE(sodium_bin2base64, AI_StringAndId)
349-
PHP_FE(sodium_base642bin, AI_StringAndIdAndMaybeString)
171+
PHP_FE(sodium_bin2base64, arginfo_sodium_bin2base64)
172+
PHP_FE(sodium_base642bin, arginfo_sodium_base642bin)
350173
#endif
351174

352175
/* aliases */
353176

354-
PHP_FALIAS(sodium_crypto_scalarmult_base, sodium_crypto_box_publickey_from_secretkey, AI_TwoStrings)
177+
PHP_FALIAS(sodium_crypto_scalarmult_base, sodium_crypto_box_publickey_from_secretkey, arginfo_sodium_crypto_scalarmult_base)
355178

356179
PHP_FE_END
357180
};

0 commit comments

Comments
 (0)