Mercurial > hg > php_nacl
comparison nacl.c @ 8:a1fc155ca80b
Fixed reference-output parameters in key generation functions
author | Ivo Smits <Ivo@UCIS.nl> |
---|---|
date | Thu, 14 Jul 2011 16:32:23 +0200 |
parents | a139bed53614 |
children | 765303f4f2da |
comparison
equal
deleted
inserted
replaced
7:a139bed53614 | 8:a1fc155ca80b |
---|---|
37 | 37 |
38 #if !(defined crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES || defined crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES) | 38 #if !(defined crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES || defined crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES) |
39 #include "randombytes.c" | 39 #include "randombytes.c" |
40 #endif | 40 #endif |
41 | 41 |
42 #if defined crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES | |
43 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_box_curve25519xsalsa20poly1305_keypair, 0, 0, 2) | |
44 ZEND_ARG_INFO(1, zsk) | |
45 ZEND_ARG_INFO(0, rb) | |
46 ZEND_END_ARG_INFO() | |
47 #else | |
48 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_box_curve25519xsalsa20poly1305_keypair, 0, 0, 1) | |
49 ZEND_ARG_INFO(1, zsk) | |
50 ZEND_ARG_INFO(0, rb) | |
51 ZEND_END_ARG_INFO() | |
52 #endif | |
53 #if defined crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES | |
54 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair, 0, 0, 2) | |
55 ZEND_ARG_INFO(1, zsk) | |
56 ZEND_ARG_INFO(0, rb) | |
57 ZEND_END_ARG_INFO() | |
58 #else | |
59 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair, 0, 0, 1) | |
60 ZEND_ARG_INFO(1, zsk) | |
61 ZEND_ARG_INFO(0, rb) | |
62 ZEND_END_ARG_INFO() | |
63 #endif | |
64 | |
42 static function_entry nacl_functions[] = { | 65 static function_entry nacl_functions[] = { |
43 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305, NULL) | 66 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305, NULL) |
44 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_open, NULL) | 67 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_open, NULL) |
45 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_getpublickey, NULL) | 68 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_getpublickey, NULL) |
46 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_beforenm, NULL) | 69 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_beforenm, NULL) |
47 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_afternm, NULL) | 70 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_afternm, NULL) |
48 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_open_afternm, NULL) | 71 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_open_afternm, NULL) |
49 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_keypair, NULL) | 72 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_keypair, arginfo_nacl_crypto_box_curve25519xsalsa20poly1305_keypair) |
50 PHP_FE(nacl_crypto_sign_edwards25519sha512batch, NULL) | 73 PHP_FE(nacl_crypto_sign_edwards25519sha512batch, NULL) |
51 PHP_FE(nacl_crypto_sign_edwards25519sha512batch_open, NULL) | 74 PHP_FE(nacl_crypto_sign_edwards25519sha512batch_open, NULL) |
52 PHP_FE(nacl_crypto_sign_edwards25519sha512batch_keypair, NULL) | 75 PHP_FE(nacl_crypto_sign_edwards25519sha512batch_keypair, arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair) |
53 {NULL, NULL, NULL} | 76 {NULL, NULL, NULL} |
54 }; | 77 }; |
55 | 78 |
56 zend_module_entry nacl_module_entry = { | 79 zend_module_entry nacl_module_entry = { |
57 #if ZEND_MODULE_API_NO >= 20010901 | 80 #if ZEND_MODULE_API_NO >= 20010901 |