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