annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
1 /* Copyright 2010 Ivo Smits <Ivo@UCIS.nl>. All rights reserved.
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
2 Redistribution and use in source and binary forms, with or without modification, are
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
3 permitted provided that the following conditions are met:
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
4
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
5 1. Redistributions of source code must retain the above copyright notice, this list of
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
6 conditions and the following disclaimer.
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
7
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
8 2. Redistributions in binary form must reproduce the above copyright notice, this list
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
9 of conditions and the following disclaimer in the documentation and/or other materials
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
10 provided with the distribution.
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
11
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
12 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
13 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
15 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
16 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
17 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
18 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
19 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
20 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
21
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
22 The views and conclusions contained in the software and documentation are those of the
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
23 authors and should not be interpreted as representing official policies, either expressed
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
24 or implied, of Ivo Smits.*/
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
25
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
26 #ifdef HAVE_CONFIG_H
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
27 #include "config.h"
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
28 #endif
2
04384d01b1d7 Added build script, changed header location
Ivo Smits <Ivo@UCIS.nl>
parents: 1
diff changeset
29
04384d01b1d7 Added build script, changed header location
Ivo Smits <Ivo@UCIS.nl>
parents: 1
diff changeset
30 #include "nacl/crypto_box_curve25519xsalsa20poly1305.h"
04384d01b1d7 Added build script, changed header location
Ivo Smits <Ivo@UCIS.nl>
parents: 1
diff changeset
31 #include "nacl/crypto_scalarmult_curve25519.h"
5
df71d49a6f98 Fixes to support crypto_sign_edwards25519sha512batch
Ivo Smits <Ivo@UCIS.nl>
parents: 4
diff changeset
32 #include "nacl/crypto_sign_edwards25519sha512batch.h"
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
33
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
34 #include "php.h"
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
35 #include "php_ini.h"
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
36 #include "php_nacl.h"
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
37
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
38 #if !(defined crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES || defined crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES)
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
39 #include "randombytes.c"
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
40 #endif
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
41
8
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
42 #if defined crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
43 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_box_curve25519xsalsa20poly1305_keypair, 0, 0, 2)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
44 ZEND_ARG_INFO(1, zsk)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
45 ZEND_ARG_INFO(0, rb)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
46 ZEND_END_ARG_INFO()
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
47 #else
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
48 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_box_curve25519xsalsa20poly1305_keypair, 0, 0, 1)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
49 ZEND_ARG_INFO(1, zsk)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
50 ZEND_ARG_INFO(0, rb)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
51 ZEND_END_ARG_INFO()
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
52 #endif
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
53 #if defined crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
54 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair, 0, 0, 2)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
55 ZEND_ARG_INFO(1, zsk)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
56 ZEND_ARG_INFO(0, rb)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
57 ZEND_END_ARG_INFO()
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
58 #else
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
59 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair, 0, 0, 1)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
60 ZEND_ARG_INFO(1, zsk)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
61 ZEND_ARG_INFO(0, rb)
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
62 ZEND_END_ARG_INFO()
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
63 #endif
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
64
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
65 static function_entry nacl_functions[] = {
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
66 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305, NULL)
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
67 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_open, NULL)
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
68 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_getpublickey, NULL)
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
69 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_beforenm, NULL)
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
70 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_afternm, NULL)
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
71 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_open_afternm, NULL)
8
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
72 PHP_FE(nacl_crypto_box_curve25519xsalsa20poly1305_keypair, arginfo_nacl_crypto_box_curve25519xsalsa20poly1305_keypair)
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
73 PHP_FE(nacl_crypto_sign_edwards25519sha512batch, NULL)
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
74 PHP_FE(nacl_crypto_sign_edwards25519sha512batch_open, NULL)
8
a1fc155ca80b Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents: 7
diff changeset
75 PHP_FE(nacl_crypto_sign_edwards25519sha512batch_keypair, arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair)
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
76 {NULL, NULL, NULL}
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
77 };
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
78
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
79 zend_module_entry nacl_module_entry = {
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
80 #if ZEND_MODULE_API_NO >= 20010901
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
81 STANDARD_MODULE_HEADER,
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
82 #endif
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
83 PHP_NACL_EXTNAME,
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
84 nacl_functions,
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
85 PHP_MINIT(nacl),
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
86 NULL,
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
87 NULL,
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
88 NULL,
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
89 NULL,
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
90 #if ZEND_MODULE_API_NO >= 20010901
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
91 PHP_NACL_VERSION,
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
92 #endif
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
93 STANDARD_MODULE_PROPERTIES
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
94 };
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
95
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
96 #ifdef COMPILE_DL_NACL
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
97 ZEND_GET_MODULE(nacl)
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
98 #endif
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
99
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
100 PHP_MINIT_FUNCTION(nacl) {
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
101 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_PUBLICKEYBYTES", crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES, CONST_CS | CONST_PERSISTENT);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
102 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_SECRETKEYBYTES", crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES, CONST_CS | CONST_PERSISTENT);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
103 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_BEFORENMBYTES", crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES, CONST_CS | CONST_PERSISTENT);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
104 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_NONCEBYTES", crypto_box_curve25519xsalsa20poly1305_NONCEBYTES, CONST_CS | CONST_PERSISTENT);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
105 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_ZEROBYTES", crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, CONST_CS | CONST_PERSISTENT);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
106 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_BOXZEROBYTES", crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, CONST_CS | CONST_PERSISTENT);
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
107 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_edwards25519sha512batch_BYTES", crypto_sign_edwards25519sha512batch_BYTES, CONST_CS | CONST_PERSISTENT);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
108 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_edwards25519sha512batch_PUBLICKEYBYTES", crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES, CONST_CS | CONST_PERSISTENT);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
109 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_edwards25519sha512batch_SECRETKEYBYTES", crypto_sign_edwards25519sha512batch_SECRETKEYBYTES, CONST_CS | CONST_PERSISTENT);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
110 #if defined crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
111 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES", crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES, CONST_CS | CONST_PERSISTENT);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
112 #endif
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
113 #if defined crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
114 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_edwards25519sha512batch_KEYPAIRRANDOMBYTES", crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES, CONST_CS | CONST_PERSISTENT);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
115 #endif
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
116 }
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
117
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
118 PHP_FUNCTION(nacl_crypto_box_curve25519xsalsa20poly1305) { //(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *)
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
119 unsigned char *m, *n, *pk, *sk;
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
120 int lm, ln, lpk, lsk;
1
84e0f7ead583 Changed the order of function arguments to match those of the original code
Ivo Smits <Ivo@UCIS.nl>
parents: 0
diff changeset
121 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss", &m, &lm, &n, &ln, &pk, &lpk, &sk, &lsk) == FAILURE) RETURN_NULL();
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
122 if (ln != crypto_box_curve25519xsalsa20poly1305_NONCEBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
123 if (lpk != crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
124 if (lsk != crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
125 int mlen = lm + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
126 unsigned char* mb = ecalloc(mlen, 1);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
127 unsigned char* cb = ecalloc(mlen, 1);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
128 memcpy(mb + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, m, lm);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
129 int ret = crypto_box_curve25519xsalsa20poly1305(cb, mb, mlen, n, pk, sk);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
130 int clen = mlen - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
131 char* c = emalloc(clen);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
132 memcpy(c, cb + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, clen);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
133 efree(mb);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
134 efree(cb);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
135 if (ret == 0) RETURN_STRINGL(c, clen, 0);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
136 efree(c);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
137 RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
138 }
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
139 PHP_FUNCTION(nacl_crypto_box_curve25519xsalsa20poly1305_open) { //(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *)
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
140 unsigned char *c, *n, *pk, *sk;
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
141 int lc, ln, lpk, lsk;
1
84e0f7ead583 Changed the order of function arguments to match those of the original code
Ivo Smits <Ivo@UCIS.nl>
parents: 0
diff changeset
142 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss", &c, &lc, &n, &ln, &pk, &lpk, &sk, &lsk) == FAILURE) RETURN_NULL();
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
143 if (ln != crypto_box_curve25519xsalsa20poly1305_NONCEBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
144 if (lpk != crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
145 if (lsk != crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
146 int clen = lc + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
147 unsigned char* mb = ecalloc(clen, 1);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
148 unsigned char* cb = ecalloc(clen, 1);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
149 memcpy(cb + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, c, lc);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
150 int ret = crypto_box_curve25519xsalsa20poly1305_open(mb, cb, clen, n, pk, sk);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
151 int mlen = clen - crypto_box_curve25519xsalsa20poly1305_ZEROBYTES;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
152 char* m = emalloc(mlen);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
153 memcpy(m, mb + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, mlen);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
154 efree(mb);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
155 efree(cb);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
156 if (ret == 0) RETURN_STRINGL(m, mlen, 0);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
157 efree(m);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
158 RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
159 }
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
160 PHP_FUNCTION(nacl_crypto_box_curve25519xsalsa20poly1305_beforenm) { //(unsigned char *,const unsigned char *,const unsigned char *)
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
161 unsigned char *pk, *sk;
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
162 int lpk, lsk;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
163 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &pk, &lpk, &sk, &lsk) == FAILURE) RETURN_NULL();
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
164 if (lpk != crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
165 if (lsk != crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES) RETURN_FALSE;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
166 unsigned char *k = emalloc(crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
167 crypto_box_curve25519xsalsa20poly1305_beforenm(k, pk, sk);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
168 RETURN_STRINGL((char*)k, crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES, 0);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
169 }
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
170 PHP_FUNCTION(nacl_crypto_box_curve25519xsalsa20poly1305_afternm) { //(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *)
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
171 unsigned char *m, *n, *k;
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
172 int lm, ln, lk;
1
84e0f7ead583 Changed the order of function arguments to match those of the original code
Ivo Smits <Ivo@UCIS.nl>
parents: 0
diff changeset
173 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &m, &lm, &n, &ln, &k, &lk) == FAILURE) RETURN_NULL();
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
174 if (ln != crypto_box_curve25519xsalsa20poly1305_NONCEBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
175 if (lk != crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
176 int mlen = lm + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
177 unsigned char *mb = ecalloc(mlen, 1);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
178 unsigned char *cb = ecalloc(mlen, 1);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
179 memcpy(mb + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, m, lm);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
180 int ret = crypto_box_curve25519xsalsa20poly1305_afternm(cb, mb, mlen, n, k);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
181 int clen = mlen - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
182 char *c = emalloc(clen);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
183 memcpy(c, cb + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, clen);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
184 efree(mb);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
185 efree(cb);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
186 if (ret == 0) RETURN_STRINGL(c, clen, 0);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
187 efree(c);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
188 RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
189 }
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
190 PHP_FUNCTION(nacl_crypto_box_curve25519xsalsa20poly1305_open_afternm) { //(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *)
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
191 unsigned char *c, *n, *k;
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
192 int lc, ln, lk;
1
84e0f7ead583 Changed the order of function arguments to match those of the original code
Ivo Smits <Ivo@UCIS.nl>
parents: 0
diff changeset
193 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &c, &lc, &n, &ln, &k, &lk) == FAILURE) RETURN_NULL();
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
194 if (ln != crypto_box_curve25519xsalsa20poly1305_NONCEBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
195 if (lk != crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES) RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
196 int clen = lc + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
197 unsigned char *mb = ecalloc(clen, 1);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
198 unsigned char *cb = ecalloc(clen, 1);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
199 memcpy(cb + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, c, lc);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
200 int ret = crypto_box_curve25519xsalsa20poly1305_open_afternm(mb, cb, clen, n, k);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
201 int mlen = clen - crypto_box_curve25519xsalsa20poly1305_ZEROBYTES;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
202 char *m = emalloc(mlen);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
203 memcpy(m, mb + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, mlen);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
204 efree(mb);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
205 efree(cb);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
206 if (ret == 0) RETURN_STRINGL(m, mlen, 0);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
207 efree(m);
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
208 RETURN_FALSE;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
209 }
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
210 PHP_FUNCTION(nacl_crypto_box_curve25519xsalsa20poly1305_getpublickey) {
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
211 unsigned char base[32] = {9};
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
212 unsigned char *sk;
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
213 int lsk;
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
214 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &sk, &lsk) == FAILURE) RETURN_NULL();
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
215 if (lsk != crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES) RETURN_FALSE;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
216 unsigned char* pk = emalloc(crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
217 crypto_scalarmult_curve25519(pk, sk, base);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
218 RETURN_STRINGL((char*)pk, crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES, 0);
0
96c976fb3c3d Initial commit
Ivo Smits <Ivo@UCIS.nl>
parents:
diff changeset
219 }
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
220 PHP_FUNCTION(nacl_crypto_box_curve25519xsalsa20poly1305_keypair) {
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
221 unsigned char *rb;
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
222 int lrb;
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
223 zval *zsk;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
224 #if defined crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
225 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs", &zsk, &rb, &lrb) == FAILURE) RETURN_NULL();
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
226 if (!zsk) RETURN_FALSE;
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
227 if (lrb != crypto_box_curve25519xsalsa20poly1305_KEYPAIRRANDOMBYTES) RETURN_FALSE;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
228 unsigned char *spk = emalloc(crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
229 unsigned char *ssk = emalloc(crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES);
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
230 int ret = crypto_box_curve25519xsalsa20poly1305_keypair(spk, ssk, rb);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
231 #else
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
232 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &zsk, &rb, &lrb) == FAILURE) RETURN_NULL();
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
233 if (!zsk) RETURN_FALSE;
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
234 unsigned char *spk = emalloc(crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
235 unsigned char *ssk = emalloc(crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
236 int ret = crypto_box_curve25519xsalsa20poly1305_keypair(spk, ssk);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
237 #endif
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
238 if (ret) RETURN_FALSE;
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
239 zval_dtor(zsk);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
240 ZVAL_STRINGL(zsk, (char*)ssk, crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES, 0);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
241 RETURN_STRINGL((char*)spk, crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES, 0);
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
242 }
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
243 PHP_FUNCTION(nacl_crypto_sign_edwards25519sha512batch) { //(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
244 unsigned char *m, *sk;
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
245 int lm, lsk;
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
246 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &m, &lm, &sk, &lsk) == FAILURE) RETURN_NULL();
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
247 if (lsk != crypto_sign_edwards25519sha512batch_SECRETKEYBYTES) RETURN_FALSE;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
248 long long unsigned int smlen = lm + crypto_sign_edwards25519sha512batch_BYTES;
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
249 unsigned char* smb = emalloc(smlen);
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
250 int ret = crypto_sign_edwards25519sha512batch(smb, &smlen, m, lm, sk);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
251 char* sm = emalloc(smlen);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
252 memcpy(sm, smb, smlen);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
253 efree(smb);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
254 if (ret == 0) RETURN_STRINGL(sm, smlen, 0);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
255 efree(sm);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
256 RETURN_FALSE;
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
257 }
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
258 PHP_FUNCTION(nacl_crypto_sign_edwards25519sha512batch_open) { //(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
259 unsigned char *sm, *pk;
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
260 int lsm, lpk;
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
261 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &sm, &lsm, &pk, &lpk) == FAILURE) RETURN_NULL();
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
262 if (lpk != crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES) RETURN_FALSE;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
263 long long unsigned int mlen = lsm;
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
264 unsigned char* mb = emalloc(mlen);
4
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
265 int ret = crypto_sign_edwards25519sha512batch_open(mb, &mlen, sm, lsm, pk);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
266 char* m = emalloc(mlen);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
267 memcpy(m, mb, mlen);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
268 efree(mb);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
269 if (ret == 0) RETURN_STRINGL(m, mlen, 0);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
270 efree(m);
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
271 RETURN_FALSE;
81aaf4ba1eaa Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents: 2
diff changeset
272 }
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
273 PHP_FUNCTION(nacl_crypto_sign_edwards25519sha512batch_keypair) { //(unsigned char *,unsigned char *);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
274 unsigned char *rb;
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
275 int lrb;
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
276 zval *zsk;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
277 #if defined crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
278 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs", &zsk, &rb, &lrb) == FAILURE) RETURN_NULL();
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
279 if (lrb != crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES) RETURN_FALSE;
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
280 if (!zsk) RETURN_FALSE;
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
281 unsigned char *spk = emalloc(crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
282 unsigned char *ssk = emalloc(crypto_sign_edwards25519sha512batch_SECRETKEYBYTES);
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
283 int ret = crypto_sign_edwards25519sha512batch_keypair(spk, ssk, rb);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
284 #else
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
285 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &zsk, &rb, &lrb) == FAILURE) RETURN_NULL();
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
286 if (!zsk) RETURN_FALSE;
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
287 unsigned char *spk = emalloc(crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
288 unsigned char *ssk = emalloc(crypto_sign_edwards25519sha512batch_SECRETKEYBYTES);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
289 int ret = crypto_sign_edwards25519sha512batch_keypair(spk, ssk);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
290 #endif
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
291 if (ret) RETURN_FALSE;
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
292 zval_dtor(zsk);
7
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
293 ZVAL_STRINGL(zsk, (char*)ssk, crypto_sign_edwards25519sha512batch_SECRETKEYBYTES, 0);
a139bed53614 Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents: 6
diff changeset
294 RETURN_STRINGL((char*)spk, crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES, 0);
6
ded86f4d6275 Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents: 5
diff changeset
295 }