Mercurial > hg > php_nacl
annotate nacl.c @ 10:130a6a714966 default tip
Use libsodium instead of libnacl
author | Ivo Smits <Ivo@UCIS.nl> |
---|---|
date | Thu, 10 Jul 2014 16:34:04 +0000 |
parents | 765303f4f2da |
children |
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 |
10 | 30 #include "sodium/crypto_box_curve25519xsalsa20poly1305.h" |
31 #include "sodium/crypto_scalarmult_curve25519.h" | |
32 #include "sodium/crypto_sign_edwards25519sha512batch.h" | |
33 #include "sodium/crypto_sign_ed25519.h" | |
0 | 34 |
35 #include "php.h" | |
36 #include "php_ini.h" | |
37 #include "php_nacl.h" | |
38 | |
8
a1fc155ca80b
Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents:
7
diff
changeset
|
39 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
|
40 ZEND_ARG_INFO(1, zsk) |
a1fc155ca80b
Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents:
7
diff
changeset
|
41 ZEND_ARG_INFO(0, rb) |
9
765303f4f2da
Attempt to fix randombytes.c for unpatched NaCl
Ivo Smits <Ivo@UCIS.nl>
parents:
8
diff
changeset
|
42 ZEND_END_ARG_INFO() |
8
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_sign_edwards25519sha512batch_keypair, 0, 0, 1) |
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) |
9
765303f4f2da
Attempt to fix randombytes.c for unpatched NaCl
Ivo Smits <Ivo@UCIS.nl>
parents:
8
diff
changeset
|
46 ZEND_END_ARG_INFO() |
10 | 47 ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_sign_ed25519_keypair, 0, 0, 1) |
48 ZEND_ARG_INFO(1, zsk) | |
49 ZEND_ARG_INFO(0, rb) | |
50 ZEND_END_ARG_INFO() | |
8
a1fc155ca80b
Fixed reference-output parameters in key generation functions
Ivo Smits <Ivo@UCIS.nl>
parents:
7
diff
changeset
|
51 |
10 | 52 static zend_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
|
53 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
|
54 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
|
55 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
|
56 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
|
57 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
|
58 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
|
59 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
|
60 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
|
61 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
|
62 PHP_FE(nacl_crypto_sign_edwards25519sha512batch_keypair, arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair) |
10 | 63 PHP_FE(nacl_crypto_sign_ed25519, NULL) |
64 PHP_FE(nacl_crypto_sign_ed25519_open, NULL) | |
65 PHP_FE(nacl_crypto_sign_ed25519_keypair, arginfo_nacl_crypto_sign_ed25519_keypair) | |
4
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
66 {NULL, NULL, NULL} |
0 | 67 }; |
68 | |
69 zend_module_entry nacl_module_entry = { | |
70 #if ZEND_MODULE_API_NO >= 20010901 | |
71 STANDARD_MODULE_HEADER, | |
72 #endif | |
73 PHP_NACL_EXTNAME, | |
74 nacl_functions, | |
75 PHP_MINIT(nacl), | |
76 NULL, | |
77 NULL, | |
78 NULL, | |
79 NULL, | |
80 #if ZEND_MODULE_API_NO >= 20010901 | |
81 PHP_NACL_VERSION, | |
82 #endif | |
83 STANDARD_MODULE_PROPERTIES | |
84 }; | |
85 | |
86 #ifdef COMPILE_DL_NACL | |
87 ZEND_GET_MODULE(nacl) | |
88 #endif | |
89 | |
90 PHP_MINIT_FUNCTION(nacl) { | |
91 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_PUBLICKEYBYTES", crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES, CONST_CS | CONST_PERSISTENT); | |
92 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_SECRETKEYBYTES", crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES, CONST_CS | CONST_PERSISTENT); | |
93 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_BEFORENMBYTES", crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES, CONST_CS | CONST_PERSISTENT); | |
94 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_NONCEBYTES", crypto_box_curve25519xsalsa20poly1305_NONCEBYTES, CONST_CS | CONST_PERSISTENT); | |
95 REGISTER_LONG_CONSTANT("NACL_CRYPTO_BOX_curve25519xsalsa20poly1305_ZEROBYTES", crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, CONST_CS | CONST_PERSISTENT); | |
96 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
|
97 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
|
98 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
|
99 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_edwards25519sha512batch_SECRETKEYBYTES", crypto_sign_edwards25519sha512batch_SECRETKEYBYTES, CONST_CS | CONST_PERSISTENT); |
10 | 100 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_ed25519_SECRETKEYBYTES", crypto_sign_ed25519_SECRETKEYBYTES, CONST_CS | CONST_PERSISTENT); |
101 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_ed25519_PUBLICKEYBYTES", crypto_sign_ed25519_PUBLICKEYBYTES, CONST_CS | CONST_PERSISTENT); | |
102 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_ed25519_SEEDBYTES", crypto_sign_ed25519_SEEDBYTES, CONST_CS | CONST_PERSISTENT); | |
103 REGISTER_LONG_CONSTANT("NACL_CRYPTO_SIGN_ed25519_BYTES", crypto_sign_ed25519_BYTES, CONST_CS | CONST_PERSISTENT); | |
0 | 104 } |
105 | |
106 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
|
107 unsigned char *m, *n, *pk, *sk; |
0 | 108 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
|
109 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss", &m, &lm, &n, &ln, &pk, &lpk, &sk, &lsk) == FAILURE) RETURN_NULL(); |
0 | 110 if (ln != crypto_box_curve25519xsalsa20poly1305_NONCEBYTES) RETURN_FALSE; |
111 if (lpk != crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES) RETURN_FALSE; | |
112 if (lsk != crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES) RETURN_FALSE; | |
113 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
|
114 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
|
115 unsigned char* cb = ecalloc(mlen, 1); |
0 | 116 memcpy(mb + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, m, lm); |
117 int ret = crypto_box_curve25519xsalsa20poly1305(cb, mb, mlen, n, pk, sk); | |
118 int clen = mlen - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES; | |
119 char* c = emalloc(clen); | |
120 memcpy(c, cb + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, clen); | |
121 efree(mb); | |
122 efree(cb); | |
123 if (ret == 0) RETURN_STRINGL(c, clen, 0); | |
124 efree(c); | |
125 RETURN_FALSE; | |
126 } | |
127 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
|
128 unsigned char *c, *n, *pk, *sk; |
0 | 129 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
|
130 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss", &c, &lc, &n, &ln, &pk, &lpk, &sk, &lsk) == FAILURE) RETURN_NULL(); |
0 | 131 if (ln != crypto_box_curve25519xsalsa20poly1305_NONCEBYTES) RETURN_FALSE; |
132 if (lpk != crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES) RETURN_FALSE; | |
133 if (lsk != crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES) RETURN_FALSE; | |
134 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
|
135 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
|
136 unsigned char* cb = ecalloc(clen, 1); |
0 | 137 memcpy(cb + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, c, lc); |
138 int ret = crypto_box_curve25519xsalsa20poly1305_open(mb, cb, clen, n, pk, sk); | |
139 int mlen = clen - crypto_box_curve25519xsalsa20poly1305_ZEROBYTES; | |
140 char* m = emalloc(mlen); | |
141 memcpy(m, mb + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, mlen); | |
142 efree(mb); | |
143 efree(cb); | |
144 if (ret == 0) RETURN_STRINGL(m, mlen, 0); | |
145 efree(m); | |
146 RETURN_FALSE; | |
147 } | |
148 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
|
149 unsigned char *pk, *sk; |
0 | 150 int lpk, lsk; |
151 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &pk, &lpk, &sk, &lsk) == FAILURE) RETURN_NULL(); | |
152 if (lpk != crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES) RETURN_FALSE; | |
153 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
|
154 unsigned char *k = emalloc(crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES); |
0 | 155 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
|
156 RETURN_STRINGL((char*)k, crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES, 0); |
0 | 157 } |
158 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
|
159 unsigned char *m, *n, *k; |
0 | 160 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
|
161 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &m, &lm, &n, &ln, &k, &lk) == FAILURE) RETURN_NULL(); |
0 | 162 if (ln != crypto_box_curve25519xsalsa20poly1305_NONCEBYTES) RETURN_FALSE; |
163 if (lk != crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES) RETURN_FALSE; | |
164 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
|
165 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
|
166 unsigned char *cb = ecalloc(mlen, 1); |
0 | 167 memcpy(mb + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, m, lm); |
168 int ret = crypto_box_curve25519xsalsa20poly1305_afternm(cb, mb, mlen, n, k); | |
169 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
|
170 char *c = emalloc(clen); |
0 | 171 memcpy(c, cb + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, clen); |
172 efree(mb); | |
173 efree(cb); | |
174 if (ret == 0) RETURN_STRINGL(c, clen, 0); | |
175 efree(c); | |
176 RETURN_FALSE; | |
177 } | |
178 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
|
179 unsigned char *c, *n, *k; |
0 | 180 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
|
181 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &c, &lc, &n, &ln, &k, &lk) == FAILURE) RETURN_NULL(); |
0 | 182 if (ln != crypto_box_curve25519xsalsa20poly1305_NONCEBYTES) RETURN_FALSE; |
183 if (lk != crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES) RETURN_FALSE; | |
184 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
|
185 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
|
186 unsigned char *cb = ecalloc(clen, 1); |
0 | 187 memcpy(cb + crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES, c, lc); |
188 int ret = crypto_box_curve25519xsalsa20poly1305_open_afternm(mb, cb, clen, n, k); | |
189 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
|
190 char *m = emalloc(mlen); |
0 | 191 memcpy(m, mb + crypto_box_curve25519xsalsa20poly1305_ZEROBYTES, mlen); |
192 efree(mb); | |
193 efree(cb); | |
194 if (ret == 0) RETURN_STRINGL(m, mlen, 0); | |
195 efree(m); | |
196 RETURN_FALSE; | |
197 } | |
198 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
|
199 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
|
200 unsigned char *sk; |
0 | 201 int lsk; |
202 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &sk, &lsk) == FAILURE) RETURN_NULL(); | |
203 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
|
204 unsigned char* pk = emalloc(crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES); |
0 | 205 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
|
206 RETURN_STRINGL((char*)pk, crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES, 0); |
0 | 207 } |
6
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
208 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
|
209 unsigned char *rb; |
6
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
210 int lrb; |
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
211 zval *zsk; |
7
a139bed53614
Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents:
6
diff
changeset
|
212 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
|
213 if (!zsk) RETURN_FALSE; |
a139bed53614
Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents:
6
diff
changeset
|
214 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
|
215 unsigned char *ssk = emalloc(crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES); |
10 | 216 int ret; |
217 if (rb) { | |
218 if (lrb < crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES) RETURN_FALSE; | |
219 unsigned char base[32] = {9}; | |
220 ret = crypto_scalarmult_curve25519(spk, ssk, base); | |
221 } else { | |
222 ret = crypto_box_curve25519xsalsa20poly1305_keypair(spk, ssk); | |
223 } | |
6
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
224 if (ret) RETURN_FALSE; |
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
225 zval_dtor(zsk); |
7
a139bed53614
Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents:
6
diff
changeset
|
226 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
|
227 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
|
228 } |
4
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
229 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
|
230 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
|
231 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
|
232 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
|
233 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
|
234 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
|
235 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
|
236 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
|
237 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
|
238 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
|
239 efree(smb); |
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
240 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
|
241 efree(sm); |
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
242 RETURN_FALSE; |
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
243 } |
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
244 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
|
245 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
|
246 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
|
247 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
|
248 if (lpk != crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES) RETURN_FALSE; |
10 | 249 if (lsm < crypto_sign_edwards25519sha512batch_BYTES) RETURN_FALSE; |
7
a139bed53614
Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents:
6
diff
changeset
|
250 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
|
251 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
|
252 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
|
253 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
|
254 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
|
255 efree(mb); |
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
256 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
|
257 efree(m); |
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
258 RETURN_FALSE; |
81aaf4ba1eaa
Added partial untested support for sign_edwards25519sha512batch, replaced some whitespaces with tabs
Ivo Smits <Ivo@UCIS.nl>
parents:
2
diff
changeset
|
259 } |
6
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
260 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
|
261 unsigned char *rb; |
6
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
262 int lrb; |
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
263 zval *zsk; |
7
a139bed53614
Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents:
6
diff
changeset
|
264 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
|
265 if (!zsk) RETURN_FALSE; |
a139bed53614
Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents:
6
diff
changeset
|
266 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
|
267 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
|
268 int ret = crypto_sign_edwards25519sha512batch_keypair(spk, ssk); |
6
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
269 if (ret) RETURN_FALSE; |
ded86f4d6275
Added keypair generation functions (with random data input)
Ivo Smits <Ivo@UCIS.nl>
parents:
5
diff
changeset
|
270 zval_dtor(zsk); |
7
a139bed53614
Fixed some compiler warnings, added support for unpatched nacl library
Ivo Smits <Ivo@UCIS.nl>
parents:
6
diff
changeset
|
271 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
|
272 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
|
273 } |
10 | 274 PHP_FUNCTION(nacl_crypto_sign_ed25519) { //(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); |
275 unsigned char *m, *sk; | |
276 int lm, lsk; | |
277 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &m, &lm, &sk, &lsk) == FAILURE) RETURN_NULL(); | |
278 if (lsk != crypto_sign_ed25519_SECRETKEYBYTES) RETURN_FALSE; | |
279 long long unsigned int smlen = lm + crypto_sign_ed25519_BYTES; | |
280 unsigned char* smb = emalloc(smlen); | |
281 int ret = crypto_sign_ed25519(smb, &smlen, m, lm, sk); | |
282 char* sm = emalloc(smlen); | |
283 memcpy(sm, smb, smlen); | |
284 efree(smb); | |
285 if (ret == 0) RETURN_STRINGL(sm, smlen, 0); | |
286 efree(sm); | |
287 RETURN_FALSE; | |
288 } | |
289 PHP_FUNCTION(nacl_crypto_sign_ed25519_open) { //(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *); | |
290 unsigned char *sm, *pk; | |
291 int lsm, lpk; | |
292 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &sm, &lsm, &pk, &lpk) == FAILURE) RETURN_NULL(); | |
293 if (lpk != crypto_sign_ed25519_PUBLICKEYBYTES) RETURN_FALSE; | |
294 if (lsm < crypto_sign_ed25519_BYTES) RETURN_FALSE; | |
295 long long unsigned int mlen = lsm; | |
296 unsigned char* mb = emalloc(mlen); | |
297 int ret = crypto_sign_ed25519_open(mb, &mlen, sm, lsm, pk); | |
298 char* m = emalloc(mlen); | |
299 memcpy(m, mb, mlen); | |
300 efree(mb); | |
301 if (ret == 0) RETURN_STRINGL(m, mlen, 0); | |
302 efree(m); | |
303 RETURN_FALSE; | |
304 } | |
305 PHP_FUNCTION(nacl_crypto_sign_ed25519_keypair) { //(unsigned char *,unsigned char *); | |
306 unsigned char *rb; | |
307 int lrb; | |
308 zval *zsk; | |
309 if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &zsk, &rb, &lrb) == FAILURE) RETURN_NULL(); | |
310 if (!zsk) RETURN_FALSE; | |
311 unsigned char *spk = emalloc(crypto_sign_ed25519_PUBLICKEYBYTES); | |
312 unsigned char *ssk = emalloc(crypto_sign_ed25519_SECRETKEYBYTES); | |
313 int ret; | |
314 if (rb) { | |
315 if (lrb < crypto_sign_ed25519_SEEDBYTES) RETURN_FALSE; | |
316 ret = crypto_sign_ed25519_seed_keypair(spk, ssk, rb); | |
317 } else { | |
318 ret = crypto_sign_ed25519_keypair(spk, ssk); | |
319 } | |
320 if (ret) RETURN_FALSE; | |
321 zval_dtor(zsk); | |
322 ZVAL_STRINGL(zsk, (char*)ssk, crypto_sign_ed25519_SECRETKEYBYTES, 0); | |
323 RETURN_STRINGL((char*)spk, crypto_sign_ed25519_PUBLICKEYBYTES, 0); | |
324 } |