diff options
author | cvs2svn <admin@example.com> | 2014-02-27 21:04:58 +0000 |
---|---|---|
committer | cvs2svn <admin@example.com> | 2014-02-27 21:04:58 +0000 |
commit | 726818f36b5221c023cd04c4b90bdbc08e94cd96 (patch) | |
tree | cf8221f3aa5bf5a578ddf1ecf5677ad08c04d342 /src/lib/libcrypto/ecdsa | |
parent | 3b6d92e82b1421b811bcdec7f7fdfb31eeef18de (diff) | |
download | openbsd-OPENBSD_5_5_BASE.tar.gz openbsd-OPENBSD_5_5_BASE.tar.bz2 openbsd-OPENBSD_5_5_BASE.zip |
This commit was manufactured by cvs2git to create tag 'OPENBSD_5_5_BASE'.OPENBSD_5_5_BASE
Diffstat (limited to 'src/lib/libcrypto/ecdsa')
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecdsa.h | 260 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_asn1.c | 67 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_err.c | 106 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_lib.c | 278 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_locl.h | 115 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_ossl.c | 483 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_sign.c | 106 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_vrf.c | 96 |
8 files changed, 0 insertions, 1511 deletions
diff --git a/src/lib/libcrypto/ecdsa/ecdsa.h b/src/lib/libcrypto/ecdsa/ecdsa.h deleted file mode 100644 index 7fb5254b62..0000000000 --- a/src/lib/libcrypto/ecdsa/ecdsa.h +++ /dev/null | |||
@@ -1,260 +0,0 @@ | |||
1 | /* crypto/ecdsa/ecdsa.h */ | ||
2 | /** | ||
3 | * \file crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions | ||
4 | * \author Written by Nils Larsch for the OpenSSL project | ||
5 | */ | ||
6 | /* ==================================================================== | ||
7 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. | ||
8 | * | ||
9 | * Redistribution and use in source and binary forms, with or without | ||
10 | * modification, are permitted provided that the following conditions | ||
11 | * are met: | ||
12 | * | ||
13 | * 1. Redistributions of source code must retain the above copyright | ||
14 | * notice, this list of conditions and the following disclaimer. | ||
15 | * | ||
16 | * 2. Redistributions in binary form must reproduce the above copyright | ||
17 | * notice, this list of conditions and the following disclaimer in | ||
18 | * the documentation and/or other materials provided with the | ||
19 | * distribution. | ||
20 | * | ||
21 | * 3. All advertising materials mentioning features or use of this | ||
22 | * software must display the following acknowledgment: | ||
23 | * "This product includes software developed by the OpenSSL Project | ||
24 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
25 | * | ||
26 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
27 | * endorse or promote products derived from this software without | ||
28 | * prior written permission. For written permission, please contact | ||
29 | * licensing@OpenSSL.org. | ||
30 | * | ||
31 | * 5. Products derived from this software may not be called "OpenSSL" | ||
32 | * nor may "OpenSSL" appear in their names without prior written | ||
33 | * permission of the OpenSSL Project. | ||
34 | * | ||
35 | * 6. Redistributions of any form whatsoever must retain the following | ||
36 | * acknowledgment: | ||
37 | * "This product includes software developed by the OpenSSL Project | ||
38 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
39 | * | ||
40 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
41 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
42 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
43 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
44 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
45 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
46 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
47 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
49 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
50 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
51 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
52 | * ==================================================================== | ||
53 | * | ||
54 | * This product includes cryptographic software written by Eric Young | ||
55 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
56 | * Hudson (tjh@cryptsoft.com). | ||
57 | * | ||
58 | */ | ||
59 | #ifndef HEADER_ECDSA_H | ||
60 | #define HEADER_ECDSA_H | ||
61 | |||
62 | #include <openssl/opensslconf.h> | ||
63 | |||
64 | #ifdef OPENSSL_NO_ECDSA | ||
65 | #error ECDSA is disabled. | ||
66 | #endif | ||
67 | |||
68 | #include <openssl/ec.h> | ||
69 | #include <openssl/ossl_typ.h> | ||
70 | #ifndef OPENSSL_NO_DEPRECATED | ||
71 | #include <openssl/bn.h> | ||
72 | #endif | ||
73 | |||
74 | #ifdef __cplusplus | ||
75 | extern "C" { | ||
76 | #endif | ||
77 | |||
78 | typedef struct ECDSA_SIG_st | ||
79 | { | ||
80 | BIGNUM *r; | ||
81 | BIGNUM *s; | ||
82 | } ECDSA_SIG; | ||
83 | |||
84 | /** Allocates and initialize a ECDSA_SIG structure | ||
85 | * \return pointer to a ECDSA_SIG structure or NULL if an error occurred | ||
86 | */ | ||
87 | ECDSA_SIG *ECDSA_SIG_new(void); | ||
88 | |||
89 | /** frees a ECDSA_SIG structure | ||
90 | * \param sig pointer to the ECDSA_SIG structure | ||
91 | */ | ||
92 | void ECDSA_SIG_free(ECDSA_SIG *sig); | ||
93 | |||
94 | /** DER encode content of ECDSA_SIG object (note: this function modifies *pp | ||
95 | * (*pp += length of the DER encoded signature)). | ||
96 | * \param sig pointer to the ECDSA_SIG object | ||
97 | * \param pp pointer to a unsigned char pointer for the output or NULL | ||
98 | * \return the length of the DER encoded ECDSA_SIG object or 0 | ||
99 | */ | ||
100 | int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp); | ||
101 | |||
102 | /** Decodes a DER encoded ECDSA signature (note: this function changes *pp | ||
103 | * (*pp += len)). | ||
104 | * \param sig pointer to ECDSA_SIG pointer (may be NULL) | ||
105 | * \param pp memory buffer with the DER encoded signature | ||
106 | * \param len length of the buffer | ||
107 | * \return pointer to the decoded ECDSA_SIG structure (or NULL) | ||
108 | */ | ||
109 | ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, long len); | ||
110 | |||
111 | /** Computes the ECDSA signature of the given hash value using | ||
112 | * the supplied private key and returns the created signature. | ||
113 | * \param dgst pointer to the hash value | ||
114 | * \param dgst_len length of the hash value | ||
115 | * \param eckey EC_KEY object containing a private EC key | ||
116 | * \return pointer to a ECDSA_SIG structure or NULL if an error occurred | ||
117 | */ | ||
118 | ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst,int dgst_len,EC_KEY *eckey); | ||
119 | |||
120 | /** Computes ECDSA signature of a given hash value using the supplied | ||
121 | * private key (note: sig must point to ECDSA_size(eckey) bytes of memory). | ||
122 | * \param dgst pointer to the hash value to sign | ||
123 | * \param dgstlen length of the hash value | ||
124 | * \param kinv BIGNUM with a pre-computed inverse k (optional) | ||
125 | * \param rp BIGNUM with a pre-computed rp value (optioanl), | ||
126 | * see ECDSA_sign_setup | ||
127 | * \param eckey EC_KEY object containing a private EC key | ||
128 | * \return pointer to a ECDSA_SIG structure or NULL if an error occurred | ||
129 | */ | ||
130 | ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen, | ||
131 | const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey); | ||
132 | |||
133 | /** Verifies that the supplied signature is a valid ECDSA | ||
134 | * signature of the supplied hash value using the supplied public key. | ||
135 | * \param dgst pointer to the hash value | ||
136 | * \param dgst_len length of the hash value | ||
137 | * \param sig ECDSA_SIG structure | ||
138 | * \param eckey EC_KEY object containing a public EC key | ||
139 | * \return 1 if the signature is valid, 0 if the signature is invalid | ||
140 | * and -1 on error | ||
141 | */ | ||
142 | int ECDSA_do_verify(const unsigned char *dgst, int dgst_len, | ||
143 | const ECDSA_SIG *sig, EC_KEY* eckey); | ||
144 | |||
145 | const ECDSA_METHOD *ECDSA_OpenSSL(void); | ||
146 | |||
147 | /** Sets the default ECDSA method | ||
148 | * \param meth new default ECDSA_METHOD | ||
149 | */ | ||
150 | void ECDSA_set_default_method(const ECDSA_METHOD *meth); | ||
151 | |||
152 | /** Returns the default ECDSA method | ||
153 | * \return pointer to ECDSA_METHOD structure containing the default method | ||
154 | */ | ||
155 | const ECDSA_METHOD *ECDSA_get_default_method(void); | ||
156 | |||
157 | /** Sets method to be used for the ECDSA operations | ||
158 | * \param eckey EC_KEY object | ||
159 | * \param meth new method | ||
160 | * \return 1 on success and 0 otherwise | ||
161 | */ | ||
162 | int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth); | ||
163 | |||
164 | /** Returns the maximum length of the DER encoded signature | ||
165 | * \param eckey EC_KEY object | ||
166 | * \return numbers of bytes required for the DER encoded signature | ||
167 | */ | ||
168 | int ECDSA_size(const EC_KEY *eckey); | ||
169 | |||
170 | /** Precompute parts of the signing operation | ||
171 | * \param eckey EC_KEY object containing a private EC key | ||
172 | * \param ctx BN_CTX object (optional) | ||
173 | * \param kinv BIGNUM pointer for the inverse of k | ||
174 | * \param rp BIGNUM pointer for x coordinate of k * generator | ||
175 | * \return 1 on success and 0 otherwise | ||
176 | */ | ||
177 | int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, | ||
178 | BIGNUM **rp); | ||
179 | |||
180 | /** Computes ECDSA signature of a given hash value using the supplied | ||
181 | * private key (note: sig must point to ECDSA_size(eckey) bytes of memory). | ||
182 | * \param type this parameter is ignored | ||
183 | * \param dgst pointer to the hash value to sign | ||
184 | * \param dgstlen length of the hash value | ||
185 | * \param sig memory for the DER encoded created signature | ||
186 | * \param siglen pointer to the length of the returned signature | ||
187 | * \param eckey EC_KEY object containing a private EC key | ||
188 | * \return 1 on success and 0 otherwise | ||
189 | */ | ||
190 | int ECDSA_sign(int type, const unsigned char *dgst, int dgstlen, | ||
191 | unsigned char *sig, unsigned int *siglen, EC_KEY *eckey); | ||
192 | |||
193 | |||
194 | /** Computes ECDSA signature of a given hash value using the supplied | ||
195 | * private key (note: sig must point to ECDSA_size(eckey) bytes of memory). | ||
196 | * \param type this parameter is ignored | ||
197 | * \param dgst pointer to the hash value to sign | ||
198 | * \param dgstlen length of the hash value | ||
199 | * \param sig buffer to hold the DER encoded signature | ||
200 | * \param siglen pointer to the length of the returned signature | ||
201 | * \param kinv BIGNUM with a pre-computed inverse k (optional) | ||
202 | * \param rp BIGNUM with a pre-computed rp value (optioanl), | ||
203 | * see ECDSA_sign_setup | ||
204 | * \param eckey EC_KEY object containing a private EC key | ||
205 | * \return 1 on success and 0 otherwise | ||
206 | */ | ||
207 | int ECDSA_sign_ex(int type, const unsigned char *dgst, int dgstlen, | ||
208 | unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv, | ||
209 | const BIGNUM *rp, EC_KEY *eckey); | ||
210 | |||
211 | /** Verifies that the given signature is valid ECDSA signature | ||
212 | * of the supplied hash value using the specified public key. | ||
213 | * \param type this parameter is ignored | ||
214 | * \param dgst pointer to the hash value | ||
215 | * \param dgstlen length of the hash value | ||
216 | * \param sig pointer to the DER encoded signature | ||
217 | * \param siglen length of the DER encoded signature | ||
218 | * \param eckey EC_KEY object containing a public EC key | ||
219 | * \return 1 if the signature is valid, 0 if the signature is invalid | ||
220 | * and -1 on error | ||
221 | */ | ||
222 | int ECDSA_verify(int type, const unsigned char *dgst, int dgstlen, | ||
223 | const unsigned char *sig, int siglen, EC_KEY *eckey); | ||
224 | |||
225 | /* the standard ex_data functions */ | ||
226 | int ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new | ||
227 | *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); | ||
228 | int ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg); | ||
229 | void *ECDSA_get_ex_data(EC_KEY *d, int idx); | ||
230 | |||
231 | |||
232 | /* BEGIN ERROR CODES */ | ||
233 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
234 | * made after this point may be overwritten when the script is next run. | ||
235 | */ | ||
236 | void ERR_load_ECDSA_strings(void); | ||
237 | |||
238 | /* Error codes for the ECDSA functions. */ | ||
239 | |||
240 | /* Function codes. */ | ||
241 | #define ECDSA_F_ECDSA_CHECK 104 | ||
242 | #define ECDSA_F_ECDSA_DATA_NEW_METHOD 100 | ||
243 | #define ECDSA_F_ECDSA_DO_SIGN 101 | ||
244 | #define ECDSA_F_ECDSA_DO_VERIFY 102 | ||
245 | #define ECDSA_F_ECDSA_SIGN_SETUP 103 | ||
246 | |||
247 | /* Reason codes. */ | ||
248 | #define ECDSA_R_BAD_SIGNATURE 100 | ||
249 | #define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE 101 | ||
250 | #define ECDSA_R_ERR_EC_LIB 102 | ||
251 | #define ECDSA_R_MISSING_PARAMETERS 103 | ||
252 | #define ECDSA_R_NEED_NEW_SETUP_VALUES 106 | ||
253 | #define ECDSA_R_NON_FIPS_METHOD 107 | ||
254 | #define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED 104 | ||
255 | #define ECDSA_R_SIGNATURE_MALLOC_FAILED 105 | ||
256 | |||
257 | #ifdef __cplusplus | ||
258 | } | ||
259 | #endif | ||
260 | #endif | ||
diff --git a/src/lib/libcrypto/ecdsa/ecs_asn1.c b/src/lib/libcrypto/ecdsa/ecs_asn1.c deleted file mode 100644 index b295489400..0000000000 --- a/src/lib/libcrypto/ecdsa/ecs_asn1.c +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | /* crypto/ecdsa/ecs_asn1.c */ | ||
2 | /* ==================================================================== | ||
3 | * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * | ||
12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer in | ||
14 | * the documentation and/or other materials provided with the | ||
15 | * distribution. | ||
16 | * | ||
17 | * 3. All advertising materials mentioning features or use of this | ||
18 | * software must display the following acknowledgment: | ||
19 | * "This product includes software developed by the OpenSSL Project | ||
20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
21 | * | ||
22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
23 | * endorse or promote products derived from this software without | ||
24 | * prior written permission. For written permission, please contact | ||
25 | * licensing@OpenSSL.org. | ||
26 | * | ||
27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
28 | * nor may "OpenSSL" appear in their names without prior written | ||
29 | * permission of the OpenSSL Project. | ||
30 | * | ||
31 | * 6. Redistributions of any form whatsoever must retain the following | ||
32 | * acknowledgment: | ||
33 | * "This product includes software developed by the OpenSSL Project | ||
34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
35 | * | ||
36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
48 | * ==================================================================== | ||
49 | * | ||
50 | * This product includes cryptographic software written by Eric Young | ||
51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
52 | * Hudson (tjh@cryptsoft.com). | ||
53 | * | ||
54 | */ | ||
55 | |||
56 | #include "ecs_locl.h" | ||
57 | #include <openssl/err.h> | ||
58 | #include <openssl/asn1t.h> | ||
59 | |||
60 | ASN1_SEQUENCE(ECDSA_SIG) = { | ||
61 | ASN1_SIMPLE(ECDSA_SIG, r, CBIGNUM), | ||
62 | ASN1_SIMPLE(ECDSA_SIG, s, CBIGNUM) | ||
63 | } ASN1_SEQUENCE_END(ECDSA_SIG) | ||
64 | |||
65 | DECLARE_ASN1_FUNCTIONS_const(ECDSA_SIG) | ||
66 | DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECDSA_SIG, ECDSA_SIG) | ||
67 | IMPLEMENT_ASN1_FUNCTIONS_const(ECDSA_SIG) | ||
diff --git a/src/lib/libcrypto/ecdsa/ecs_err.c b/src/lib/libcrypto/ecdsa/ecs_err.c deleted file mode 100644 index 81542e6d15..0000000000 --- a/src/lib/libcrypto/ecdsa/ecs_err.c +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | /* crypto/ecdsa/ecs_err.c */ | ||
2 | /* ==================================================================== | ||
3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * | ||
12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer in | ||
14 | * the documentation and/or other materials provided with the | ||
15 | * distribution. | ||
16 | * | ||
17 | * 3. All advertising materials mentioning features or use of this | ||
18 | * software must display the following acknowledgment: | ||
19 | * "This product includes software developed by the OpenSSL Project | ||
20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
21 | * | ||
22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
23 | * endorse or promote products derived from this software without | ||
24 | * prior written permission. For written permission, please contact | ||
25 | * openssl-core@OpenSSL.org. | ||
26 | * | ||
27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
28 | * nor may "OpenSSL" appear in their names without prior written | ||
29 | * permission of the OpenSSL Project. | ||
30 | * | ||
31 | * 6. Redistributions of any form whatsoever must retain the following | ||
32 | * acknowledgment: | ||
33 | * "This product includes software developed by the OpenSSL Project | ||
34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
35 | * | ||
36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
48 | * ==================================================================== | ||
49 | * | ||
50 | * This product includes cryptographic software written by Eric Young | ||
51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
52 | * Hudson (tjh@cryptsoft.com). | ||
53 | * | ||
54 | */ | ||
55 | |||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
57 | * made to it will be overwritten when the script next updates this file, | ||
58 | * only reason strings will be preserved. | ||
59 | */ | ||
60 | |||
61 | #include <stdio.h> | ||
62 | #include <openssl/err.h> | ||
63 | #include <openssl/ecdsa.h> | ||
64 | |||
65 | /* BEGIN ERROR CODES */ | ||
66 | #ifndef OPENSSL_NO_ERR | ||
67 | |||
68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDSA,func,0) | ||
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDSA,0,reason) | ||
70 | |||
71 | static ERR_STRING_DATA ECDSA_str_functs[]= | ||
72 | { | ||
73 | {ERR_FUNC(ECDSA_F_ECDSA_CHECK), "ECDSA_CHECK"}, | ||
74 | {ERR_FUNC(ECDSA_F_ECDSA_DATA_NEW_METHOD), "ECDSA_DATA_NEW_METHOD"}, | ||
75 | {ERR_FUNC(ECDSA_F_ECDSA_DO_SIGN), "ECDSA_do_sign"}, | ||
76 | {ERR_FUNC(ECDSA_F_ECDSA_DO_VERIFY), "ECDSA_do_verify"}, | ||
77 | {ERR_FUNC(ECDSA_F_ECDSA_SIGN_SETUP), "ECDSA_sign_setup"}, | ||
78 | {0,NULL} | ||
79 | }; | ||
80 | |||
81 | static ERR_STRING_DATA ECDSA_str_reasons[]= | ||
82 | { | ||
83 | {ERR_REASON(ECDSA_R_BAD_SIGNATURE) ,"bad signature"}, | ||
84 | {ERR_REASON(ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),"data too large for key size"}, | ||
85 | {ERR_REASON(ECDSA_R_ERR_EC_LIB) ,"err ec lib"}, | ||
86 | {ERR_REASON(ECDSA_R_MISSING_PARAMETERS) ,"missing parameters"}, | ||
87 | {ERR_REASON(ECDSA_R_NEED_NEW_SETUP_VALUES),"need new setup values"}, | ||
88 | {ERR_REASON(ECDSA_R_NON_FIPS_METHOD) ,"non fips method"}, | ||
89 | {ERR_REASON(ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED),"random number generation failed"}, | ||
90 | {ERR_REASON(ECDSA_R_SIGNATURE_MALLOC_FAILED),"signature malloc failed"}, | ||
91 | {0,NULL} | ||
92 | }; | ||
93 | |||
94 | #endif | ||
95 | |||
96 | void ERR_load_ECDSA_strings(void) | ||
97 | { | ||
98 | #ifndef OPENSSL_NO_ERR | ||
99 | |||
100 | if (ERR_func_error_string(ECDSA_str_functs[0].error) == NULL) | ||
101 | { | ||
102 | ERR_load_strings(0,ECDSA_str_functs); | ||
103 | ERR_load_strings(0,ECDSA_str_reasons); | ||
104 | } | ||
105 | #endif | ||
106 | } | ||
diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c deleted file mode 100644 index e477da430b..0000000000 --- a/src/lib/libcrypto/ecdsa/ecs_lib.c +++ /dev/null | |||
@@ -1,278 +0,0 @@ | |||
1 | /* crypto/ecdsa/ecs_lib.c */ | ||
2 | /* ==================================================================== | ||
3 | * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * | ||
12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer in | ||
14 | * the documentation and/or other materials provided with the | ||
15 | * distribution. | ||
16 | * | ||
17 | * 3. All advertising materials mentioning features or use of this | ||
18 | * software must display the following acknowledgment: | ||
19 | * "This product includes software developed by the OpenSSL Project | ||
20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
21 | * | ||
22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
23 | * endorse or promote products derived from this software without | ||
24 | * prior written permission. For written permission, please contact | ||
25 | * openssl-core@OpenSSL.org. | ||
26 | * | ||
27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
28 | * nor may "OpenSSL" appear in their names without prior written | ||
29 | * permission of the OpenSSL Project. | ||
30 | * | ||
31 | * 6. Redistributions of any form whatsoever must retain the following | ||
32 | * acknowledgment: | ||
33 | * "This product includes software developed by the OpenSSL Project | ||
34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
35 | * | ||
36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
48 | * ==================================================================== | ||
49 | * | ||
50 | * This product includes cryptographic software written by Eric Young | ||
51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
52 | * Hudson (tjh@cryptsoft.com). | ||
53 | * | ||
54 | */ | ||
55 | |||
56 | #include <string.h> | ||
57 | #include "ecs_locl.h" | ||
58 | #ifndef OPENSSL_NO_ENGINE | ||
59 | #include <openssl/engine.h> | ||
60 | #endif | ||
61 | #include <openssl/err.h> | ||
62 | #include <openssl/bn.h> | ||
63 | #ifdef OPENSSL_FIPS | ||
64 | #include <openssl/fips.h> | ||
65 | #endif | ||
66 | |||
67 | const char ECDSA_version[]="ECDSA" OPENSSL_VERSION_PTEXT; | ||
68 | |||
69 | static const ECDSA_METHOD *default_ECDSA_method = NULL; | ||
70 | |||
71 | static void *ecdsa_data_new(void); | ||
72 | static void *ecdsa_data_dup(void *); | ||
73 | static void ecdsa_data_free(void *); | ||
74 | |||
75 | void ECDSA_set_default_method(const ECDSA_METHOD *meth) | ||
76 | { | ||
77 | default_ECDSA_method = meth; | ||
78 | } | ||
79 | |||
80 | const ECDSA_METHOD *ECDSA_get_default_method(void) | ||
81 | { | ||
82 | if(!default_ECDSA_method) | ||
83 | { | ||
84 | #ifdef OPENSSL_FIPS | ||
85 | if (FIPS_mode()) | ||
86 | return FIPS_ecdsa_openssl(); | ||
87 | else | ||
88 | return ECDSA_OpenSSL(); | ||
89 | #else | ||
90 | default_ECDSA_method = ECDSA_OpenSSL(); | ||
91 | #endif | ||
92 | } | ||
93 | return default_ECDSA_method; | ||
94 | } | ||
95 | |||
96 | int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth) | ||
97 | { | ||
98 | ECDSA_DATA *ecdsa; | ||
99 | |||
100 | ecdsa = ecdsa_check(eckey); | ||
101 | |||
102 | if (ecdsa == NULL) | ||
103 | return 0; | ||
104 | |||
105 | #ifndef OPENSSL_NO_ENGINE | ||
106 | if (ecdsa->engine) | ||
107 | { | ||
108 | ENGINE_finish(ecdsa->engine); | ||
109 | ecdsa->engine = NULL; | ||
110 | } | ||
111 | #endif | ||
112 | ecdsa->meth = meth; | ||
113 | |||
114 | return 1; | ||
115 | } | ||
116 | |||
117 | static ECDSA_DATA *ECDSA_DATA_new_method(ENGINE *engine) | ||
118 | { | ||
119 | ECDSA_DATA *ret; | ||
120 | |||
121 | ret=(ECDSA_DATA *)OPENSSL_malloc(sizeof(ECDSA_DATA)); | ||
122 | if (ret == NULL) | ||
123 | { | ||
124 | ECDSAerr(ECDSA_F_ECDSA_DATA_NEW_METHOD, ERR_R_MALLOC_FAILURE); | ||
125 | return(NULL); | ||
126 | } | ||
127 | |||
128 | ret->init = NULL; | ||
129 | |||
130 | ret->meth = ECDSA_get_default_method(); | ||
131 | ret->engine = engine; | ||
132 | #ifndef OPENSSL_NO_ENGINE | ||
133 | if (!ret->engine) | ||
134 | ret->engine = ENGINE_get_default_ECDSA(); | ||
135 | if (ret->engine) | ||
136 | { | ||
137 | ret->meth = ENGINE_get_ECDSA(ret->engine); | ||
138 | if (!ret->meth) | ||
139 | { | ||
140 | ECDSAerr(ECDSA_F_ECDSA_DATA_NEW_METHOD, ERR_R_ENGINE_LIB); | ||
141 | ENGINE_finish(ret->engine); | ||
142 | OPENSSL_free(ret); | ||
143 | return NULL; | ||
144 | } | ||
145 | } | ||
146 | #endif | ||
147 | |||
148 | ret->flags = ret->meth->flags; | ||
149 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDSA, ret, &ret->ex_data); | ||
150 | #if 0 | ||
151 | if ((ret->meth->init != NULL) && !ret->meth->init(ret)) | ||
152 | { | ||
153 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDSA, ret, &ret->ex_data); | ||
154 | OPENSSL_free(ret); | ||
155 | ret=NULL; | ||
156 | } | ||
157 | #endif | ||
158 | return(ret); | ||
159 | } | ||
160 | |||
161 | static void *ecdsa_data_new(void) | ||
162 | { | ||
163 | return (void *)ECDSA_DATA_new_method(NULL); | ||
164 | } | ||
165 | |||
166 | static void *ecdsa_data_dup(void *data) | ||
167 | { | ||
168 | ECDSA_DATA *r = (ECDSA_DATA *)data; | ||
169 | |||
170 | /* XXX: dummy operation */ | ||
171 | if (r == NULL) | ||
172 | return NULL; | ||
173 | |||
174 | return ecdsa_data_new(); | ||
175 | } | ||
176 | |||
177 | static void ecdsa_data_free(void *data) | ||
178 | { | ||
179 | ECDSA_DATA *r = (ECDSA_DATA *)data; | ||
180 | |||
181 | #ifndef OPENSSL_NO_ENGINE | ||
182 | if (r->engine) | ||
183 | ENGINE_finish(r->engine); | ||
184 | #endif | ||
185 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDSA, r, &r->ex_data); | ||
186 | |||
187 | OPENSSL_cleanse((void *)r, sizeof(ECDSA_DATA)); | ||
188 | |||
189 | OPENSSL_free(r); | ||
190 | } | ||
191 | |||
192 | ECDSA_DATA *ecdsa_check(EC_KEY *key) | ||
193 | { | ||
194 | ECDSA_DATA *ecdsa_data; | ||
195 | |||
196 | void *data = EC_KEY_get_key_method_data(key, ecdsa_data_dup, | ||
197 | ecdsa_data_free, ecdsa_data_free); | ||
198 | if (data == NULL) | ||
199 | { | ||
200 | ecdsa_data = (ECDSA_DATA *)ecdsa_data_new(); | ||
201 | if (ecdsa_data == NULL) | ||
202 | return NULL; | ||
203 | EC_KEY_insert_key_method_data(key, (void *)ecdsa_data, | ||
204 | ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free); | ||
205 | } | ||
206 | else | ||
207 | ecdsa_data = (ECDSA_DATA *)data; | ||
208 | #ifdef OPENSSL_FIPS | ||
209 | if (FIPS_mode() && !(ecdsa_data->flags & ECDSA_FLAG_FIPS_METHOD) | ||
210 | && !(EC_KEY_get_flags(key) & EC_FLAG_NON_FIPS_ALLOW)) | ||
211 | { | ||
212 | ECDSAerr(ECDSA_F_ECDSA_CHECK, ECDSA_R_NON_FIPS_METHOD); | ||
213 | return NULL; | ||
214 | } | ||
215 | #endif | ||
216 | |||
217 | return ecdsa_data; | ||
218 | } | ||
219 | |||
220 | int ECDSA_size(const EC_KEY *r) | ||
221 | { | ||
222 | int ret,i; | ||
223 | ASN1_INTEGER bs; | ||
224 | BIGNUM *order=NULL; | ||
225 | unsigned char buf[4]; | ||
226 | const EC_GROUP *group; | ||
227 | |||
228 | if (r == NULL) | ||
229 | return 0; | ||
230 | group = EC_KEY_get0_group(r); | ||
231 | if (group == NULL) | ||
232 | return 0; | ||
233 | |||
234 | if ((order = BN_new()) == NULL) return 0; | ||
235 | if (!EC_GROUP_get_order(group,order,NULL)) | ||
236 | { | ||
237 | BN_clear_free(order); | ||
238 | return 0; | ||
239 | } | ||
240 | i=BN_num_bits(order); | ||
241 | bs.length=(i+7)/8; | ||
242 | bs.data=buf; | ||
243 | bs.type=V_ASN1_INTEGER; | ||
244 | /* If the top bit is set the asn1 encoding is 1 larger. */ | ||
245 | buf[0]=0xff; | ||
246 | |||
247 | i=i2d_ASN1_INTEGER(&bs,NULL); | ||
248 | i+=i; /* r and s */ | ||
249 | ret=ASN1_object_size(1,i,V_ASN1_SEQUENCE); | ||
250 | BN_clear_free(order); | ||
251 | return(ret); | ||
252 | } | ||
253 | |||
254 | |||
255 | int ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | ||
256 | CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) | ||
257 | { | ||
258 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ECDSA, argl, argp, | ||
259 | new_func, dup_func, free_func); | ||
260 | } | ||
261 | |||
262 | int ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg) | ||
263 | { | ||
264 | ECDSA_DATA *ecdsa; | ||
265 | ecdsa = ecdsa_check(d); | ||
266 | if (ecdsa == NULL) | ||
267 | return 0; | ||
268 | return(CRYPTO_set_ex_data(&ecdsa->ex_data,idx,arg)); | ||
269 | } | ||
270 | |||
271 | void *ECDSA_get_ex_data(EC_KEY *d, int idx) | ||
272 | { | ||
273 | ECDSA_DATA *ecdsa; | ||
274 | ecdsa = ecdsa_check(d); | ||
275 | if (ecdsa == NULL) | ||
276 | return NULL; | ||
277 | return(CRYPTO_get_ex_data(&ecdsa->ex_data,idx)); | ||
278 | } | ||
diff --git a/src/lib/libcrypto/ecdsa/ecs_locl.h b/src/lib/libcrypto/ecdsa/ecs_locl.h deleted file mode 100644 index cb3be13cfc..0000000000 --- a/src/lib/libcrypto/ecdsa/ecs_locl.h +++ /dev/null | |||
@@ -1,115 +0,0 @@ | |||
1 | /* crypto/ecdsa/ecs_locl.h */ | ||
2 | /* | ||
3 | * Written by Nils Larsch for the OpenSSL project | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * licensing@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #ifndef HEADER_ECS_LOCL_H | ||
60 | #define HEADER_ECS_LOCL_H | ||
61 | |||
62 | #include <openssl/ecdsa.h> | ||
63 | |||
64 | #ifdef __cplusplus | ||
65 | extern "C" { | ||
66 | #endif | ||
67 | |||
68 | struct ecdsa_method | ||
69 | { | ||
70 | const char *name; | ||
71 | ECDSA_SIG *(*ecdsa_do_sign)(const unsigned char *dgst, int dgst_len, | ||
72 | const BIGNUM *inv, const BIGNUM *rp, EC_KEY *eckey); | ||
73 | int (*ecdsa_sign_setup)(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, | ||
74 | BIGNUM **r); | ||
75 | int (*ecdsa_do_verify)(const unsigned char *dgst, int dgst_len, | ||
76 | const ECDSA_SIG *sig, EC_KEY *eckey); | ||
77 | #if 0 | ||
78 | int (*init)(EC_KEY *eckey); | ||
79 | int (*finish)(EC_KEY *eckey); | ||
80 | #endif | ||
81 | int flags; | ||
82 | char *app_data; | ||
83 | }; | ||
84 | |||
85 | /* If this flag is set the ECDSA method is FIPS compliant and can be used | ||
86 | * in FIPS mode. This is set in the validated module method. If an | ||
87 | * application sets this flag in its own methods it is its responsibility | ||
88 | * to ensure the result is compliant. | ||
89 | */ | ||
90 | |||
91 | #define ECDSA_FLAG_FIPS_METHOD 0x1 | ||
92 | |||
93 | typedef struct ecdsa_data_st { | ||
94 | /* EC_KEY_METH_DATA part */ | ||
95 | int (*init)(EC_KEY *); | ||
96 | /* method (ECDSA) specific part */ | ||
97 | ENGINE *engine; | ||
98 | int flags; | ||
99 | const ECDSA_METHOD *meth; | ||
100 | CRYPTO_EX_DATA ex_data; | ||
101 | } ECDSA_DATA; | ||
102 | |||
103 | /** ecdsa_check | ||
104 | * checks whether ECKEY->meth_data is a pointer to a ECDSA_DATA structure | ||
105 | * and if not it removes the old meth_data and creates a ECDSA_DATA structure. | ||
106 | * \param eckey pointer to a EC_KEY object | ||
107 | * \return pointer to a ECDSA_DATA structure | ||
108 | */ | ||
109 | ECDSA_DATA *ecdsa_check(EC_KEY *eckey); | ||
110 | |||
111 | #ifdef __cplusplus | ||
112 | } | ||
113 | #endif | ||
114 | |||
115 | #endif /* HEADER_ECS_LOCL_H */ | ||
diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c deleted file mode 100644 index 7725935610..0000000000 --- a/src/lib/libcrypto/ecdsa/ecs_ossl.c +++ /dev/null | |||
@@ -1,483 +0,0 @@ | |||
1 | /* crypto/ecdsa/ecs_ossl.c */ | ||
2 | /* | ||
3 | * Written by Nils Larsch for the OpenSSL project | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * openssl-core@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #include "ecs_locl.h" | ||
60 | #include <openssl/err.h> | ||
61 | #include <openssl/obj_mac.h> | ||
62 | #include <openssl/bn.h> | ||
63 | |||
64 | static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dlen, | ||
65 | const BIGNUM *, const BIGNUM *, EC_KEY *eckey); | ||
66 | static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, | ||
67 | BIGNUM **rp); | ||
68 | static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len, | ||
69 | const ECDSA_SIG *sig, EC_KEY *eckey); | ||
70 | |||
71 | static ECDSA_METHOD openssl_ecdsa_meth = { | ||
72 | "OpenSSL ECDSA method", | ||
73 | ecdsa_do_sign, | ||
74 | ecdsa_sign_setup, | ||
75 | ecdsa_do_verify, | ||
76 | #if 0 | ||
77 | NULL, /* init */ | ||
78 | NULL, /* finish */ | ||
79 | #endif | ||
80 | 0, /* flags */ | ||
81 | NULL /* app_data */ | ||
82 | }; | ||
83 | |||
84 | const ECDSA_METHOD *ECDSA_OpenSSL(void) | ||
85 | { | ||
86 | return &openssl_ecdsa_meth; | ||
87 | } | ||
88 | |||
89 | static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, | ||
90 | BIGNUM **rp) | ||
91 | { | ||
92 | BN_CTX *ctx = NULL; | ||
93 | BIGNUM *k = NULL, *r = NULL, *order = NULL, *X = NULL; | ||
94 | EC_POINT *tmp_point=NULL; | ||
95 | const EC_GROUP *group; | ||
96 | int ret = 0; | ||
97 | |||
98 | if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL) | ||
99 | { | ||
100 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_PASSED_NULL_PARAMETER); | ||
101 | return 0; | ||
102 | } | ||
103 | |||
104 | if (ctx_in == NULL) | ||
105 | { | ||
106 | if ((ctx = BN_CTX_new()) == NULL) | ||
107 | { | ||
108 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_MALLOC_FAILURE); | ||
109 | return 0; | ||
110 | } | ||
111 | } | ||
112 | else | ||
113 | ctx = ctx_in; | ||
114 | |||
115 | k = BN_new(); /* this value is later returned in *kinvp */ | ||
116 | r = BN_new(); /* this value is later returned in *rp */ | ||
117 | order = BN_new(); | ||
118 | X = BN_new(); | ||
119 | if (!k || !r || !order || !X) | ||
120 | { | ||
121 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_MALLOC_FAILURE); | ||
122 | goto err; | ||
123 | } | ||
124 | if ((tmp_point = EC_POINT_new(group)) == NULL) | ||
125 | { | ||
126 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); | ||
127 | goto err; | ||
128 | } | ||
129 | if (!EC_GROUP_get_order(group, order, ctx)) | ||
130 | { | ||
131 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); | ||
132 | goto err; | ||
133 | } | ||
134 | |||
135 | do | ||
136 | { | ||
137 | /* get random k */ | ||
138 | do | ||
139 | if (!BN_rand_range(k, order)) | ||
140 | { | ||
141 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, | ||
142 | ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED); | ||
143 | goto err; | ||
144 | } | ||
145 | while (BN_is_zero(k)); | ||
146 | |||
147 | /* We do not want timing information to leak the length of k, | ||
148 | * so we compute G*k using an equivalent scalar of fixed | ||
149 | * bit-length. */ | ||
150 | |||
151 | if (!BN_add(k, k, order)) goto err; | ||
152 | if (BN_num_bits(k) <= BN_num_bits(order)) | ||
153 | if (!BN_add(k, k, order)) goto err; | ||
154 | |||
155 | /* compute r the x-coordinate of generator * k */ | ||
156 | if (!EC_POINT_mul(group, tmp_point, k, NULL, NULL, ctx)) | ||
157 | { | ||
158 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB); | ||
159 | goto err; | ||
160 | } | ||
161 | if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) | ||
162 | { | ||
163 | if (!EC_POINT_get_affine_coordinates_GFp(group, | ||
164 | tmp_point, X, NULL, ctx)) | ||
165 | { | ||
166 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_EC_LIB); | ||
167 | goto err; | ||
168 | } | ||
169 | } | ||
170 | #ifndef OPENSSL_NO_EC2M | ||
171 | else /* NID_X9_62_characteristic_two_field */ | ||
172 | { | ||
173 | if (!EC_POINT_get_affine_coordinates_GF2m(group, | ||
174 | tmp_point, X, NULL, ctx)) | ||
175 | { | ||
176 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_EC_LIB); | ||
177 | goto err; | ||
178 | } | ||
179 | } | ||
180 | #endif | ||
181 | if (!BN_nnmod(r, X, order, ctx)) | ||
182 | { | ||
183 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB); | ||
184 | goto err; | ||
185 | } | ||
186 | } | ||
187 | while (BN_is_zero(r)); | ||
188 | |||
189 | /* compute the inverse of k */ | ||
190 | if (!BN_mod_inverse(k, k, order, ctx)) | ||
191 | { | ||
192 | ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB); | ||
193 | goto err; | ||
194 | } | ||
195 | /* clear old values if necessary */ | ||
196 | if (*rp != NULL) | ||
197 | BN_clear_free(*rp); | ||
198 | if (*kinvp != NULL) | ||
199 | BN_clear_free(*kinvp); | ||
200 | /* save the pre-computed values */ | ||
201 | *rp = r; | ||
202 | *kinvp = k; | ||
203 | ret = 1; | ||
204 | err: | ||
205 | if (!ret) | ||
206 | { | ||
207 | if (k != NULL) BN_clear_free(k); | ||
208 | if (r != NULL) BN_clear_free(r); | ||
209 | } | ||
210 | if (ctx_in == NULL) | ||
211 | BN_CTX_free(ctx); | ||
212 | if (order != NULL) | ||
213 | BN_free(order); | ||
214 | if (tmp_point != NULL) | ||
215 | EC_POINT_free(tmp_point); | ||
216 | if (X) | ||
217 | BN_clear_free(X); | ||
218 | return(ret); | ||
219 | } | ||
220 | |||
221 | |||
222 | static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, | ||
223 | const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *eckey) | ||
224 | { | ||
225 | int ok = 0, i; | ||
226 | BIGNUM *kinv=NULL, *s, *m=NULL,*tmp=NULL,*order=NULL; | ||
227 | const BIGNUM *ckinv; | ||
228 | BN_CTX *ctx = NULL; | ||
229 | const EC_GROUP *group; | ||
230 | ECDSA_SIG *ret; | ||
231 | ECDSA_DATA *ecdsa; | ||
232 | const BIGNUM *priv_key; | ||
233 | |||
234 | ecdsa = ecdsa_check(eckey); | ||
235 | group = EC_KEY_get0_group(eckey); | ||
236 | priv_key = EC_KEY_get0_private_key(eckey); | ||
237 | |||
238 | if (group == NULL || priv_key == NULL || ecdsa == NULL) | ||
239 | { | ||
240 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_PASSED_NULL_PARAMETER); | ||
241 | return NULL; | ||
242 | } | ||
243 | |||
244 | ret = ECDSA_SIG_new(); | ||
245 | if (!ret) | ||
246 | { | ||
247 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); | ||
248 | return NULL; | ||
249 | } | ||
250 | s = ret->s; | ||
251 | |||
252 | if ((ctx = BN_CTX_new()) == NULL || (order = BN_new()) == NULL || | ||
253 | (tmp = BN_new()) == NULL || (m = BN_new()) == NULL) | ||
254 | { | ||
255 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); | ||
256 | goto err; | ||
257 | } | ||
258 | |||
259 | if (!EC_GROUP_get_order(group, order, ctx)) | ||
260 | { | ||
261 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_EC_LIB); | ||
262 | goto err; | ||
263 | } | ||
264 | i = BN_num_bits(order); | ||
265 | /* Need to truncate digest if it is too long: first truncate whole | ||
266 | * bytes. | ||
267 | */ | ||
268 | if (8 * dgst_len > i) | ||
269 | dgst_len = (i + 7)/8; | ||
270 | if (!BN_bin2bn(dgst, dgst_len, m)) | ||
271 | { | ||
272 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); | ||
273 | goto err; | ||
274 | } | ||
275 | /* If still too long truncate remaining bits with a shift */ | ||
276 | if ((8 * dgst_len > i) && !BN_rshift(m, m, 8 - (i & 0x7))) | ||
277 | { | ||
278 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); | ||
279 | goto err; | ||
280 | } | ||
281 | do | ||
282 | { | ||
283 | if (in_kinv == NULL || in_r == NULL) | ||
284 | { | ||
285 | if (!ECDSA_sign_setup(eckey, ctx, &kinv, &ret->r)) | ||
286 | { | ||
287 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN,ERR_R_ECDSA_LIB); | ||
288 | goto err; | ||
289 | } | ||
290 | ckinv = kinv; | ||
291 | } | ||
292 | else | ||
293 | { | ||
294 | ckinv = in_kinv; | ||
295 | if (BN_copy(ret->r, in_r) == NULL) | ||
296 | { | ||
297 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); | ||
298 | goto err; | ||
299 | } | ||
300 | } | ||
301 | |||
302 | if (!BN_mod_mul(tmp, priv_key, ret->r, order, ctx)) | ||
303 | { | ||
304 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); | ||
305 | goto err; | ||
306 | } | ||
307 | if (!BN_mod_add_quick(s, tmp, m, order)) | ||
308 | { | ||
309 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); | ||
310 | goto err; | ||
311 | } | ||
312 | if (!BN_mod_mul(s, s, ckinv, order, ctx)) | ||
313 | { | ||
314 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); | ||
315 | goto err; | ||
316 | } | ||
317 | if (BN_is_zero(s)) | ||
318 | { | ||
319 | /* if kinv and r have been supplied by the caller | ||
320 | * don't to generate new kinv and r values */ | ||
321 | if (in_kinv != NULL && in_r != NULL) | ||
322 | { | ||
323 | ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ECDSA_R_NEED_NEW_SETUP_VALUES); | ||
324 | goto err; | ||
325 | } | ||
326 | } | ||
327 | else | ||
328 | /* s != 0 => we have a valid signature */ | ||
329 | break; | ||
330 | } | ||
331 | while (1); | ||
332 | |||
333 | ok = 1; | ||
334 | err: | ||
335 | if (!ok) | ||
336 | { | ||
337 | ECDSA_SIG_free(ret); | ||
338 | ret = NULL; | ||
339 | } | ||
340 | if (ctx) | ||
341 | BN_CTX_free(ctx); | ||
342 | if (m) | ||
343 | BN_clear_free(m); | ||
344 | if (tmp) | ||
345 | BN_clear_free(tmp); | ||
346 | if (order) | ||
347 | BN_free(order); | ||
348 | if (kinv) | ||
349 | BN_clear_free(kinv); | ||
350 | return ret; | ||
351 | } | ||
352 | |||
353 | static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len, | ||
354 | const ECDSA_SIG *sig, EC_KEY *eckey) | ||
355 | { | ||
356 | int ret = -1, i; | ||
357 | BN_CTX *ctx; | ||
358 | BIGNUM *order, *u1, *u2, *m, *X; | ||
359 | EC_POINT *point = NULL; | ||
360 | const EC_GROUP *group; | ||
361 | const EC_POINT *pub_key; | ||
362 | |||
363 | /* check input values */ | ||
364 | if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL || | ||
365 | (pub_key = EC_KEY_get0_public_key(eckey)) == NULL || sig == NULL) | ||
366 | { | ||
367 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ECDSA_R_MISSING_PARAMETERS); | ||
368 | return -1; | ||
369 | } | ||
370 | |||
371 | ctx = BN_CTX_new(); | ||
372 | if (!ctx) | ||
373 | { | ||
374 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_MALLOC_FAILURE); | ||
375 | return -1; | ||
376 | } | ||
377 | BN_CTX_start(ctx); | ||
378 | order = BN_CTX_get(ctx); | ||
379 | u1 = BN_CTX_get(ctx); | ||
380 | u2 = BN_CTX_get(ctx); | ||
381 | m = BN_CTX_get(ctx); | ||
382 | X = BN_CTX_get(ctx); | ||
383 | if (!X) | ||
384 | { | ||
385 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); | ||
386 | goto err; | ||
387 | } | ||
388 | |||
389 | if (!EC_GROUP_get_order(group, order, ctx)) | ||
390 | { | ||
391 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB); | ||
392 | goto err; | ||
393 | } | ||
394 | |||
395 | if (BN_is_zero(sig->r) || BN_is_negative(sig->r) || | ||
396 | BN_ucmp(sig->r, order) >= 0 || BN_is_zero(sig->s) || | ||
397 | BN_is_negative(sig->s) || BN_ucmp(sig->s, order) >= 0) | ||
398 | { | ||
399 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ECDSA_R_BAD_SIGNATURE); | ||
400 | ret = 0; /* signature is invalid */ | ||
401 | goto err; | ||
402 | } | ||
403 | /* calculate tmp1 = inv(S) mod order */ | ||
404 | if (!BN_mod_inverse(u2, sig->s, order, ctx)) | ||
405 | { | ||
406 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); | ||
407 | goto err; | ||
408 | } | ||
409 | /* digest -> m */ | ||
410 | i = BN_num_bits(order); | ||
411 | /* Need to truncate digest if it is too long: first truncate whole | ||
412 | * bytes. | ||
413 | */ | ||
414 | if (8 * dgst_len > i) | ||
415 | dgst_len = (i + 7)/8; | ||
416 | if (!BN_bin2bn(dgst, dgst_len, m)) | ||
417 | { | ||
418 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); | ||
419 | goto err; | ||
420 | } | ||
421 | /* If still too long truncate remaining bits with a shift */ | ||
422 | if ((8 * dgst_len > i) && !BN_rshift(m, m, 8 - (i & 0x7))) | ||
423 | { | ||
424 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); | ||
425 | goto err; | ||
426 | } | ||
427 | /* u1 = m * tmp mod order */ | ||
428 | if (!BN_mod_mul(u1, m, u2, order, ctx)) | ||
429 | { | ||
430 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); | ||
431 | goto err; | ||
432 | } | ||
433 | /* u2 = r * w mod q */ | ||
434 | if (!BN_mod_mul(u2, sig->r, u2, order, ctx)) | ||
435 | { | ||
436 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); | ||
437 | goto err; | ||
438 | } | ||
439 | |||
440 | if ((point = EC_POINT_new(group)) == NULL) | ||
441 | { | ||
442 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_MALLOC_FAILURE); | ||
443 | goto err; | ||
444 | } | ||
445 | if (!EC_POINT_mul(group, point, u1, pub_key, u2, ctx)) | ||
446 | { | ||
447 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB); | ||
448 | goto err; | ||
449 | } | ||
450 | if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) | ||
451 | { | ||
452 | if (!EC_POINT_get_affine_coordinates_GFp(group, | ||
453 | point, X, NULL, ctx)) | ||
454 | { | ||
455 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB); | ||
456 | goto err; | ||
457 | } | ||
458 | } | ||
459 | #ifndef OPENSSL_NO_EC2M | ||
460 | else /* NID_X9_62_characteristic_two_field */ | ||
461 | { | ||
462 | if (!EC_POINT_get_affine_coordinates_GF2m(group, | ||
463 | point, X, NULL, ctx)) | ||
464 | { | ||
465 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB); | ||
466 | goto err; | ||
467 | } | ||
468 | } | ||
469 | #endif | ||
470 | if (!BN_nnmod(u1, X, order, ctx)) | ||
471 | { | ||
472 | ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB); | ||
473 | goto err; | ||
474 | } | ||
475 | /* if the signature is correct u1 is equal to sig->r */ | ||
476 | ret = (BN_ucmp(u1, sig->r) == 0); | ||
477 | err: | ||
478 | BN_CTX_end(ctx); | ||
479 | BN_CTX_free(ctx); | ||
480 | if (point) | ||
481 | EC_POINT_free(point); | ||
482 | return ret; | ||
483 | } | ||
diff --git a/src/lib/libcrypto/ecdsa/ecs_sign.c b/src/lib/libcrypto/ecdsa/ecs_sign.c deleted file mode 100644 index 353d5af514..0000000000 --- a/src/lib/libcrypto/ecdsa/ecs_sign.c +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | /* crypto/ecdsa/ecdsa_sign.c */ | ||
2 | /* ==================================================================== | ||
3 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * | ||
12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer in | ||
14 | * the documentation and/or other materials provided with the | ||
15 | * distribution. | ||
16 | * | ||
17 | * 3. All advertising materials mentioning features or use of this | ||
18 | * software must display the following acknowledgment: | ||
19 | * "This product includes software developed by the OpenSSL Project | ||
20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
21 | * | ||
22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
23 | * endorse or promote products derived from this software without | ||
24 | * prior written permission. For written permission, please contact | ||
25 | * openssl-core@OpenSSL.org. | ||
26 | * | ||
27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
28 | * nor may "OpenSSL" appear in their names without prior written | ||
29 | * permission of the OpenSSL Project. | ||
30 | * | ||
31 | * 6. Redistributions of any form whatsoever must retain the following | ||
32 | * acknowledgment: | ||
33 | * "This product includes software developed by the OpenSSL Project | ||
34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
35 | * | ||
36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
48 | * ==================================================================== | ||
49 | * | ||
50 | * This product includes cryptographic software written by Eric Young | ||
51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
52 | * Hudson (tjh@cryptsoft.com). | ||
53 | * | ||
54 | */ | ||
55 | |||
56 | #include "ecs_locl.h" | ||
57 | #ifndef OPENSSL_NO_ENGINE | ||
58 | #include <openssl/engine.h> | ||
59 | #endif | ||
60 | #include <openssl/rand.h> | ||
61 | |||
62 | ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) | ||
63 | { | ||
64 | return ECDSA_do_sign_ex(dgst, dlen, NULL, NULL, eckey); | ||
65 | } | ||
66 | |||
67 | ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dlen, | ||
68 | const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey) | ||
69 | { | ||
70 | ECDSA_DATA *ecdsa = ecdsa_check(eckey); | ||
71 | if (ecdsa == NULL) | ||
72 | return NULL; | ||
73 | return ecdsa->meth->ecdsa_do_sign(dgst, dlen, kinv, rp, eckey); | ||
74 | } | ||
75 | |||
76 | int ECDSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char | ||
77 | *sig, unsigned int *siglen, EC_KEY *eckey) | ||
78 | { | ||
79 | return ECDSA_sign_ex(type, dgst, dlen, sig, siglen, NULL, NULL, eckey); | ||
80 | } | ||
81 | |||
82 | int ECDSA_sign_ex(int type, const unsigned char *dgst, int dlen, unsigned char | ||
83 | *sig, unsigned int *siglen, const BIGNUM *kinv, const BIGNUM *r, | ||
84 | EC_KEY *eckey) | ||
85 | { | ||
86 | ECDSA_SIG *s; | ||
87 | RAND_seed(dgst, dlen); | ||
88 | s = ECDSA_do_sign_ex(dgst, dlen, kinv, r, eckey); | ||
89 | if (s == NULL) | ||
90 | { | ||
91 | *siglen=0; | ||
92 | return 0; | ||
93 | } | ||
94 | *siglen = i2d_ECDSA_SIG(s, &sig); | ||
95 | ECDSA_SIG_free(s); | ||
96 | return 1; | ||
97 | } | ||
98 | |||
99 | int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, | ||
100 | BIGNUM **rp) | ||
101 | { | ||
102 | ECDSA_DATA *ecdsa = ecdsa_check(eckey); | ||
103 | if (ecdsa == NULL) | ||
104 | return 0; | ||
105 | return ecdsa->meth->ecdsa_sign_setup(eckey, ctx_in, kinvp, rp); | ||
106 | } | ||
diff --git a/src/lib/libcrypto/ecdsa/ecs_vrf.c b/src/lib/libcrypto/ecdsa/ecs_vrf.c deleted file mode 100644 index ef9acf7b61..0000000000 --- a/src/lib/libcrypto/ecdsa/ecs_vrf.c +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | /* crypto/ecdsa/ecdsa_vrf.c */ | ||
2 | /* | ||
3 | * Written by Nils Larsch for the OpenSSL project | ||
4 | */ | ||
5 | /* ==================================================================== | ||
6 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | ||
7 | * | ||
8 | * Redistribution and use in source and binary forms, with or without | ||
9 | * modification, are permitted provided that the following conditions | ||
10 | * are met: | ||
11 | * | ||
12 | * 1. Redistributions of source code must retain the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer. | ||
14 | * | ||
15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer in | ||
17 | * the documentation and/or other materials provided with the | ||
18 | * distribution. | ||
19 | * | ||
20 | * 3. All advertising materials mentioning features or use of this | ||
21 | * software must display the following acknowledgment: | ||
22 | * "This product includes software developed by the OpenSSL Project | ||
23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
24 | * | ||
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
26 | * endorse or promote products derived from this software without | ||
27 | * prior written permission. For written permission, please contact | ||
28 | * openssl-core@OpenSSL.org. | ||
29 | * | ||
30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
31 | * nor may "OpenSSL" appear in their names without prior written | ||
32 | * permission of the OpenSSL Project. | ||
33 | * | ||
34 | * 6. Redistributions of any form whatsoever must retain the following | ||
35 | * acknowledgment: | ||
36 | * "This product includes software developed by the OpenSSL Project | ||
37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
38 | * | ||
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
51 | * ==================================================================== | ||
52 | * | ||
53 | * This product includes cryptographic software written by Eric Young | ||
54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
55 | * Hudson (tjh@cryptsoft.com). | ||
56 | * | ||
57 | */ | ||
58 | |||
59 | #include "ecs_locl.h" | ||
60 | #ifndef OPENSSL_NO_ENGINE | ||
61 | #include <openssl/engine.h> | ||
62 | #endif | ||
63 | |||
64 | /* returns | ||
65 | * 1: correct signature | ||
66 | * 0: incorrect signature | ||
67 | * -1: error | ||
68 | */ | ||
69 | int ECDSA_do_verify(const unsigned char *dgst, int dgst_len, | ||
70 | const ECDSA_SIG *sig, EC_KEY *eckey) | ||
71 | { | ||
72 | ECDSA_DATA *ecdsa = ecdsa_check(eckey); | ||
73 | if (ecdsa == NULL) | ||
74 | return 0; | ||
75 | return ecdsa->meth->ecdsa_do_verify(dgst, dgst_len, sig, eckey); | ||
76 | } | ||
77 | |||
78 | /* returns | ||
79 | * 1: correct signature | ||
80 | * 0: incorrect signature | ||
81 | * -1: error | ||
82 | */ | ||
83 | int ECDSA_verify(int type, const unsigned char *dgst, int dgst_len, | ||
84 | const unsigned char *sigbuf, int sig_len, EC_KEY *eckey) | ||
85 | { | ||
86 | ECDSA_SIG *s; | ||
87 | int ret=-1; | ||
88 | |||
89 | s = ECDSA_SIG_new(); | ||
90 | if (s == NULL) return(ret); | ||
91 | if (d2i_ECDSA_SIG(&s, &sigbuf, sig_len) == NULL) goto err; | ||
92 | ret=ECDSA_do_verify(dgst, dgst_len, s, eckey); | ||
93 | err: | ||
94 | ECDSA_SIG_free(s); | ||
95 | return(ret); | ||
96 | } | ||