diff options
Diffstat (limited to 'src/lib/libcrypto/dh')
-rw-r--r-- | src/lib/libcrypto/dh/dh.h | 280 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_ameth.c | 501 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_asn1.c | 93 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_check.c | 142 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_depr.c | 83 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_err.c | 122 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_gen.c | 192 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_key.c | 292 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_lib.c | 260 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_pmeth.c | 254 | ||||
-rw-r--r-- | src/lib/libcrypto/dh/dh_prn.c | 80 |
11 files changed, 0 insertions, 2299 deletions
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h deleted file mode 100644 index ea59e610ef..0000000000 --- a/src/lib/libcrypto/dh/dh.h +++ /dev/null | |||
@@ -1,280 +0,0 @@ | |||
1 | /* crypto/dh/dh.h */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #ifndef HEADER_DH_H | ||
60 | #define HEADER_DH_H | ||
61 | |||
62 | #include <openssl/e_os2.h> | ||
63 | |||
64 | #ifdef OPENSSL_NO_DH | ||
65 | #error DH is disabled. | ||
66 | #endif | ||
67 | |||
68 | #ifndef OPENSSL_NO_BIO | ||
69 | #include <openssl/bio.h> | ||
70 | #endif | ||
71 | #include <openssl/ossl_typ.h> | ||
72 | #ifndef OPENSSL_NO_DEPRECATED | ||
73 | #include <openssl/bn.h> | ||
74 | #endif | ||
75 | |||
76 | #ifndef OPENSSL_DH_MAX_MODULUS_BITS | ||
77 | # define OPENSSL_DH_MAX_MODULUS_BITS 10000 | ||
78 | #endif | ||
79 | |||
80 | #define DH_FLAG_CACHE_MONT_P 0x01 | ||
81 | #define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH | ||
82 | * implementation now uses constant time | ||
83 | * modular exponentiation for secret exponents | ||
84 | * by default. This flag causes the | ||
85 | * faster variable sliding window method to | ||
86 | * be used for all exponents. | ||
87 | */ | ||
88 | |||
89 | /* If this flag is set the DH method is FIPS compliant and can be used | ||
90 | * in FIPS mode. This is set in the validated module method. If an | ||
91 | * application sets this flag in its own methods it is its reposibility | ||
92 | * to ensure the result is compliant. | ||
93 | */ | ||
94 | |||
95 | #define DH_FLAG_FIPS_METHOD 0x0400 | ||
96 | |||
97 | /* If this flag is set the operations normally disabled in FIPS mode are | ||
98 | * permitted it is then the applications responsibility to ensure that the | ||
99 | * usage is compliant. | ||
100 | */ | ||
101 | |||
102 | #define DH_FLAG_NON_FIPS_ALLOW 0x0400 | ||
103 | |||
104 | #ifdef __cplusplus | ||
105 | extern "C" { | ||
106 | #endif | ||
107 | |||
108 | /* Already defined in ossl_typ.h */ | ||
109 | /* typedef struct dh_st DH; */ | ||
110 | /* typedef struct dh_method DH_METHOD; */ | ||
111 | |||
112 | struct dh_method | ||
113 | { | ||
114 | const char *name; | ||
115 | /* Methods here */ | ||
116 | int (*generate_key)(DH *dh); | ||
117 | int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh); | ||
118 | int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a, | ||
119 | const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, | ||
120 | BN_MONT_CTX *m_ctx); /* Can be null */ | ||
121 | |||
122 | int (*init)(DH *dh); | ||
123 | int (*finish)(DH *dh); | ||
124 | int flags; | ||
125 | char *app_data; | ||
126 | /* If this is non-NULL, it will be used to generate parameters */ | ||
127 | int (*generate_params)(DH *dh, int prime_len, int generator, BN_GENCB *cb); | ||
128 | }; | ||
129 | |||
130 | struct dh_st | ||
131 | { | ||
132 | /* This first argument is used to pick up errors when | ||
133 | * a DH is passed instead of a EVP_PKEY */ | ||
134 | int pad; | ||
135 | int version; | ||
136 | BIGNUM *p; | ||
137 | BIGNUM *g; | ||
138 | long length; /* optional */ | ||
139 | BIGNUM *pub_key; /* g^x */ | ||
140 | BIGNUM *priv_key; /* x */ | ||
141 | |||
142 | int flags; | ||
143 | BN_MONT_CTX *method_mont_p; | ||
144 | /* Place holders if we want to do X9.42 DH */ | ||
145 | BIGNUM *q; | ||
146 | BIGNUM *j; | ||
147 | unsigned char *seed; | ||
148 | int seedlen; | ||
149 | BIGNUM *counter; | ||
150 | |||
151 | int references; | ||
152 | CRYPTO_EX_DATA ex_data; | ||
153 | const DH_METHOD *meth; | ||
154 | ENGINE *engine; | ||
155 | }; | ||
156 | |||
157 | #define DH_GENERATOR_2 2 | ||
158 | /* #define DH_GENERATOR_3 3 */ | ||
159 | #define DH_GENERATOR_5 5 | ||
160 | |||
161 | /* DH_check error codes */ | ||
162 | #define DH_CHECK_P_NOT_PRIME 0x01 | ||
163 | #define DH_CHECK_P_NOT_SAFE_PRIME 0x02 | ||
164 | #define DH_UNABLE_TO_CHECK_GENERATOR 0x04 | ||
165 | #define DH_NOT_SUITABLE_GENERATOR 0x08 | ||
166 | |||
167 | /* DH_check_pub_key error codes */ | ||
168 | #define DH_CHECK_PUBKEY_TOO_SMALL 0x01 | ||
169 | #define DH_CHECK_PUBKEY_TOO_LARGE 0x02 | ||
170 | |||
171 | /* primes p where (p-1)/2 is prime too are called "safe"; we define | ||
172 | this for backward compatibility: */ | ||
173 | #define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME | ||
174 | |||
175 | #define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ | ||
176 | (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x)) | ||
177 | #define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \ | ||
178 | (unsigned char *)(x)) | ||
179 | #define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x) | ||
180 | #define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) | ||
181 | |||
182 | DH *DHparams_dup(DH *); | ||
183 | |||
184 | const DH_METHOD *DH_OpenSSL(void); | ||
185 | |||
186 | void DH_set_default_method(const DH_METHOD *meth); | ||
187 | const DH_METHOD *DH_get_default_method(void); | ||
188 | int DH_set_method(DH *dh, const DH_METHOD *meth); | ||
189 | DH *DH_new_method(ENGINE *engine); | ||
190 | |||
191 | DH * DH_new(void); | ||
192 | void DH_free(DH *dh); | ||
193 | int DH_up_ref(DH *dh); | ||
194 | int DH_size(const DH *dh); | ||
195 | int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | ||
196 | CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); | ||
197 | int DH_set_ex_data(DH *d, int idx, void *arg); | ||
198 | void *DH_get_ex_data(DH *d, int idx); | ||
199 | |||
200 | /* Deprecated version */ | ||
201 | #ifndef OPENSSL_NO_DEPRECATED | ||
202 | DH * DH_generate_parameters(int prime_len,int generator, | ||
203 | void (*callback)(int,int,void *),void *cb_arg); | ||
204 | #endif /* !defined(OPENSSL_NO_DEPRECATED) */ | ||
205 | |||
206 | /* New version */ | ||
207 | int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb); | ||
208 | |||
209 | int DH_check(const DH *dh,int *codes); | ||
210 | int DH_check_pub_key(const DH *dh,const BIGNUM *pub_key, int *codes); | ||
211 | int DH_generate_key(DH *dh); | ||
212 | int DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh); | ||
213 | DH * d2i_DHparams(DH **a,const unsigned char **pp, long length); | ||
214 | int i2d_DHparams(const DH *a,unsigned char **pp); | ||
215 | #ifndef OPENSSL_NO_FP_API | ||
216 | int DHparams_print_fp(FILE *fp, const DH *x); | ||
217 | #endif | ||
218 | #ifndef OPENSSL_NO_BIO | ||
219 | int DHparams_print(BIO *bp, const DH *x); | ||
220 | #else | ||
221 | int DHparams_print(char *bp, const DH *x); | ||
222 | #endif | ||
223 | |||
224 | #define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \ | ||
225 | EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \ | ||
226 | EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, len, NULL) | ||
227 | |||
228 | #define EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, gen) \ | ||
229 | EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \ | ||
230 | EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, gen, NULL) | ||
231 | |||
232 | #define EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN (EVP_PKEY_ALG_CTRL + 1) | ||
233 | #define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR (EVP_PKEY_ALG_CTRL + 2) | ||
234 | |||
235 | |||
236 | /* BEGIN ERROR CODES */ | ||
237 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
238 | * made after this point may be overwritten when the script is next run. | ||
239 | */ | ||
240 | void ERR_load_DH_strings(void); | ||
241 | |||
242 | /* Error codes for the DH functions. */ | ||
243 | |||
244 | /* Function codes. */ | ||
245 | #define DH_F_COMPUTE_KEY 102 | ||
246 | #define DH_F_DHPARAMS_PRINT_FP 101 | ||
247 | #define DH_F_DH_BUILTIN_GENPARAMS 106 | ||
248 | #define DH_F_DH_COMPUTE_KEY 114 | ||
249 | #define DH_F_DH_GENERATE_KEY 115 | ||
250 | #define DH_F_DH_GENERATE_PARAMETERS_EX 116 | ||
251 | #define DH_F_DH_NEW_METHOD 105 | ||
252 | #define DH_F_DH_PARAM_DECODE 107 | ||
253 | #define DH_F_DH_PRIV_DECODE 110 | ||
254 | #define DH_F_DH_PRIV_ENCODE 111 | ||
255 | #define DH_F_DH_PUB_DECODE 108 | ||
256 | #define DH_F_DH_PUB_ENCODE 109 | ||
257 | #define DH_F_DO_DH_PRINT 100 | ||
258 | #define DH_F_GENERATE_KEY 103 | ||
259 | #define DH_F_GENERATE_PARAMETERS 104 | ||
260 | #define DH_F_PKEY_DH_DERIVE 112 | ||
261 | #define DH_F_PKEY_DH_KEYGEN 113 | ||
262 | |||
263 | /* Reason codes. */ | ||
264 | #define DH_R_BAD_GENERATOR 101 | ||
265 | #define DH_R_BN_DECODE_ERROR 109 | ||
266 | #define DH_R_BN_ERROR 106 | ||
267 | #define DH_R_DECODE_ERROR 104 | ||
268 | #define DH_R_INVALID_PUBKEY 102 | ||
269 | #define DH_R_KEYS_NOT_SET 108 | ||
270 | #define DH_R_KEY_SIZE_TOO_SMALL 110 | ||
271 | #define DH_R_MODULUS_TOO_LARGE 103 | ||
272 | #define DH_R_NON_FIPS_METHOD 111 | ||
273 | #define DH_R_NO_PARAMETERS_SET 107 | ||
274 | #define DH_R_NO_PRIVATE_VALUE 100 | ||
275 | #define DH_R_PARAMETER_ENCODING_ERROR 105 | ||
276 | |||
277 | #ifdef __cplusplus | ||
278 | } | ||
279 | #endif | ||
280 | #endif | ||
diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c deleted file mode 100644 index 02ec2d47b4..0000000000 --- a/src/lib/libcrypto/dh/dh_ameth.c +++ /dev/null | |||
@@ -1,501 +0,0 @@ | |||
1 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | ||
2 | * project 2006. | ||
3 | */ | ||
4 | /* ==================================================================== | ||
5 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions | ||
9 | * are met: | ||
10 | * | ||
11 | * 1. Redistributions of source code must retain the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer. | ||
13 | * | ||
14 | * 2. Redistributions in binary form must reproduce the above copyright | ||
15 | * notice, this list of conditions and the following disclaimer in | ||
16 | * the documentation and/or other materials provided with the | ||
17 | * distribution. | ||
18 | * | ||
19 | * 3. All advertising materials mentioning features or use of this | ||
20 | * software must display the following acknowledgment: | ||
21 | * "This product includes software developed by the OpenSSL Project | ||
22 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
23 | * | ||
24 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
25 | * endorse or promote products derived from this software without | ||
26 | * prior written permission. For written permission, please contact | ||
27 | * licensing@OpenSSL.org. | ||
28 | * | ||
29 | * 5. Products derived from this software may not be called "OpenSSL" | ||
30 | * nor may "OpenSSL" appear in their names without prior written | ||
31 | * permission of the OpenSSL Project. | ||
32 | * | ||
33 | * 6. Redistributions of any form whatsoever must retain the following | ||
34 | * acknowledgment: | ||
35 | * "This product includes software developed by the OpenSSL Project | ||
36 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
37 | * | ||
38 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
39 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
40 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
41 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
42 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
43 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
44 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
45 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
46 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
47 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
48 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
49 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
50 | * ==================================================================== | ||
51 | * | ||
52 | * This product includes cryptographic software written by Eric Young | ||
53 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
54 | * Hudson (tjh@cryptsoft.com). | ||
55 | * | ||
56 | */ | ||
57 | |||
58 | #include <stdio.h> | ||
59 | #include "cryptlib.h" | ||
60 | #include <openssl/x509.h> | ||
61 | #include <openssl/asn1.h> | ||
62 | #include <openssl/dh.h> | ||
63 | #include <openssl/bn.h> | ||
64 | #include "asn1_locl.h" | ||
65 | |||
66 | static void int_dh_free(EVP_PKEY *pkey) | ||
67 | { | ||
68 | DH_free(pkey->pkey.dh); | ||
69 | } | ||
70 | |||
71 | static int dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey) | ||
72 | { | ||
73 | const unsigned char *p, *pm; | ||
74 | int pklen, pmlen; | ||
75 | int ptype; | ||
76 | void *pval; | ||
77 | ASN1_STRING *pstr; | ||
78 | X509_ALGOR *palg; | ||
79 | ASN1_INTEGER *public_key = NULL; | ||
80 | |||
81 | DH *dh = NULL; | ||
82 | |||
83 | if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, &palg, pubkey)) | ||
84 | return 0; | ||
85 | X509_ALGOR_get0(NULL, &ptype, &pval, palg); | ||
86 | |||
87 | if (ptype != V_ASN1_SEQUENCE) | ||
88 | { | ||
89 | DHerr(DH_F_DH_PUB_DECODE, DH_R_PARAMETER_ENCODING_ERROR); | ||
90 | goto err; | ||
91 | } | ||
92 | |||
93 | pstr = pval; | ||
94 | pm = pstr->data; | ||
95 | pmlen = pstr->length; | ||
96 | |||
97 | if (!(dh = d2i_DHparams(NULL, &pm, pmlen))) | ||
98 | { | ||
99 | DHerr(DH_F_DH_PUB_DECODE, DH_R_DECODE_ERROR); | ||
100 | goto err; | ||
101 | } | ||
102 | |||
103 | if (!(public_key=d2i_ASN1_INTEGER(NULL, &p, pklen))) | ||
104 | { | ||
105 | DHerr(DH_F_DH_PUB_DECODE, DH_R_DECODE_ERROR); | ||
106 | goto err; | ||
107 | } | ||
108 | |||
109 | /* We have parameters now set public key */ | ||
110 | if (!(dh->pub_key = ASN1_INTEGER_to_BN(public_key, NULL))) | ||
111 | { | ||
112 | DHerr(DH_F_DH_PUB_DECODE, DH_R_BN_DECODE_ERROR); | ||
113 | goto err; | ||
114 | } | ||
115 | |||
116 | ASN1_INTEGER_free(public_key); | ||
117 | EVP_PKEY_assign_DH(pkey, dh); | ||
118 | return 1; | ||
119 | |||
120 | err: | ||
121 | if (public_key) | ||
122 | ASN1_INTEGER_free(public_key); | ||
123 | if (dh) | ||
124 | DH_free(dh); | ||
125 | return 0; | ||
126 | |||
127 | } | ||
128 | |||
129 | static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) | ||
130 | { | ||
131 | DH *dh; | ||
132 | void *pval = NULL; | ||
133 | int ptype; | ||
134 | unsigned char *penc = NULL; | ||
135 | int penclen; | ||
136 | ASN1_STRING *str; | ||
137 | ASN1_INTEGER *pub_key = NULL; | ||
138 | |||
139 | dh=pkey->pkey.dh; | ||
140 | |||
141 | str = ASN1_STRING_new(); | ||
142 | str->length = i2d_DHparams(dh, &str->data); | ||
143 | if (str->length <= 0) | ||
144 | { | ||
145 | DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); | ||
146 | goto err; | ||
147 | } | ||
148 | pval = str; | ||
149 | ptype = V_ASN1_SEQUENCE; | ||
150 | |||
151 | pub_key = BN_to_ASN1_INTEGER(dh->pub_key, NULL); | ||
152 | if (!pub_key) | ||
153 | goto err; | ||
154 | |||
155 | penclen = i2d_ASN1_INTEGER(pub_key, &penc); | ||
156 | |||
157 | ASN1_INTEGER_free(pub_key); | ||
158 | |||
159 | if (penclen <= 0) | ||
160 | { | ||
161 | DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); | ||
162 | goto err; | ||
163 | } | ||
164 | |||
165 | if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DH), | ||
166 | ptype, pval, penc, penclen)) | ||
167 | return 1; | ||
168 | |||
169 | err: | ||
170 | if (penc) | ||
171 | OPENSSL_free(penc); | ||
172 | if (pval) | ||
173 | ASN1_STRING_free(pval); | ||
174 | |||
175 | return 0; | ||
176 | } | ||
177 | |||
178 | |||
179 | /* PKCS#8 DH is defined in PKCS#11 of all places. It is similar to DH in | ||
180 | * that the AlgorithmIdentifier contains the paramaters, the private key | ||
181 | * is explcitly included and the pubkey must be recalculated. | ||
182 | */ | ||
183 | |||
184 | static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8) | ||
185 | { | ||
186 | const unsigned char *p, *pm; | ||
187 | int pklen, pmlen; | ||
188 | int ptype; | ||
189 | void *pval; | ||
190 | ASN1_STRING *pstr; | ||
191 | X509_ALGOR *palg; | ||
192 | ASN1_INTEGER *privkey = NULL; | ||
193 | |||
194 | DH *dh = NULL; | ||
195 | |||
196 | if (!PKCS8_pkey_get0(NULL, &p, &pklen, &palg, p8)) | ||
197 | return 0; | ||
198 | |||
199 | X509_ALGOR_get0(NULL, &ptype, &pval, palg); | ||
200 | |||
201 | if (ptype != V_ASN1_SEQUENCE) | ||
202 | goto decerr; | ||
203 | |||
204 | if (!(privkey=d2i_ASN1_INTEGER(NULL, &p, pklen))) | ||
205 | goto decerr; | ||
206 | |||
207 | |||
208 | pstr = pval; | ||
209 | pm = pstr->data; | ||
210 | pmlen = pstr->length; | ||
211 | if (!(dh = d2i_DHparams(NULL, &pm, pmlen))) | ||
212 | goto decerr; | ||
213 | /* We have parameters now set private key */ | ||
214 | if (!(dh->priv_key = ASN1_INTEGER_to_BN(privkey, NULL))) | ||
215 | { | ||
216 | DHerr(DH_F_DH_PRIV_DECODE,DH_R_BN_ERROR); | ||
217 | goto dherr; | ||
218 | } | ||
219 | /* Calculate public key */ | ||
220 | if (!DH_generate_key(dh)) | ||
221 | goto dherr; | ||
222 | |||
223 | EVP_PKEY_assign_DH(pkey, dh); | ||
224 | |||
225 | ASN1_INTEGER_free(privkey); | ||
226 | |||
227 | return 1; | ||
228 | |||
229 | decerr: | ||
230 | DHerr(DH_F_DH_PRIV_DECODE, EVP_R_DECODE_ERROR); | ||
231 | dherr: | ||
232 | DH_free(dh); | ||
233 | return 0; | ||
234 | } | ||
235 | |||
236 | static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) | ||
237 | { | ||
238 | ASN1_STRING *params = NULL; | ||
239 | ASN1_INTEGER *prkey = NULL; | ||
240 | unsigned char *dp = NULL; | ||
241 | int dplen; | ||
242 | |||
243 | params = ASN1_STRING_new(); | ||
244 | |||
245 | if (!params) | ||
246 | { | ||
247 | DHerr(DH_F_DH_PRIV_ENCODE,ERR_R_MALLOC_FAILURE); | ||
248 | goto err; | ||
249 | } | ||
250 | |||
251 | params->length = i2d_DHparams(pkey->pkey.dh, ¶ms->data); | ||
252 | if (params->length <= 0) | ||
253 | { | ||
254 | DHerr(DH_F_DH_PRIV_ENCODE,ERR_R_MALLOC_FAILURE); | ||
255 | goto err; | ||
256 | } | ||
257 | params->type = V_ASN1_SEQUENCE; | ||
258 | |||
259 | /* Get private key into integer */ | ||
260 | prkey = BN_to_ASN1_INTEGER(pkey->pkey.dh->priv_key, NULL); | ||
261 | |||
262 | if (!prkey) | ||
263 | { | ||
264 | DHerr(DH_F_DH_PRIV_ENCODE,DH_R_BN_ERROR); | ||
265 | goto err; | ||
266 | } | ||
267 | |||
268 | dplen = i2d_ASN1_INTEGER(prkey, &dp); | ||
269 | |||
270 | ASN1_INTEGER_free(prkey); | ||
271 | |||
272 | if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dhKeyAgreement), 0, | ||
273 | V_ASN1_SEQUENCE, params, dp, dplen)) | ||
274 | goto err; | ||
275 | |||
276 | return 1; | ||
277 | |||
278 | err: | ||
279 | if (dp != NULL) | ||
280 | OPENSSL_free(dp); | ||
281 | if (params != NULL) | ||
282 | ASN1_STRING_free(params); | ||
283 | if (prkey != NULL) | ||
284 | ASN1_INTEGER_free(prkey); | ||
285 | return 0; | ||
286 | } | ||
287 | |||
288 | |||
289 | static void update_buflen(const BIGNUM *b, size_t *pbuflen) | ||
290 | { | ||
291 | size_t i; | ||
292 | if (!b) | ||
293 | return; | ||
294 | if (*pbuflen < (i = (size_t)BN_num_bytes(b))) | ||
295 | *pbuflen = i; | ||
296 | } | ||
297 | |||
298 | static int dh_param_decode(EVP_PKEY *pkey, | ||
299 | const unsigned char **pder, int derlen) | ||
300 | { | ||
301 | DH *dh; | ||
302 | if (!(dh = d2i_DHparams(NULL, pder, derlen))) | ||
303 | { | ||
304 | DHerr(DH_F_DH_PARAM_DECODE, ERR_R_DH_LIB); | ||
305 | return 0; | ||
306 | } | ||
307 | EVP_PKEY_assign_DH(pkey, dh); | ||
308 | return 1; | ||
309 | } | ||
310 | |||
311 | static int dh_param_encode(const EVP_PKEY *pkey, unsigned char **pder) | ||
312 | { | ||
313 | return i2d_DHparams(pkey->pkey.dh, pder); | ||
314 | } | ||
315 | |||
316 | static int do_dh_print(BIO *bp, const DH *x, int indent, | ||
317 | ASN1_PCTX *ctx, int ptype) | ||
318 | { | ||
319 | unsigned char *m=NULL; | ||
320 | int reason=ERR_R_BUF_LIB,ret=0; | ||
321 | size_t buf_len=0; | ||
322 | |||
323 | const char *ktype = NULL; | ||
324 | |||
325 | BIGNUM *priv_key, *pub_key; | ||
326 | |||
327 | if (ptype == 2) | ||
328 | priv_key = x->priv_key; | ||
329 | else | ||
330 | priv_key = NULL; | ||
331 | |||
332 | if (ptype > 0) | ||
333 | pub_key = x->pub_key; | ||
334 | else | ||
335 | pub_key = NULL; | ||
336 | |||
337 | update_buflen(x->p, &buf_len); | ||
338 | |||
339 | if (buf_len == 0) | ||
340 | { | ||
341 | reason = ERR_R_PASSED_NULL_PARAMETER; | ||
342 | goto err; | ||
343 | } | ||
344 | |||
345 | update_buflen(x->g, &buf_len); | ||
346 | update_buflen(pub_key, &buf_len); | ||
347 | update_buflen(priv_key, &buf_len); | ||
348 | |||
349 | if (ptype == 2) | ||
350 | ktype = "PKCS#3 DH Private-Key"; | ||
351 | else if (ptype == 1) | ||
352 | ktype = "PKCS#3 DH Public-Key"; | ||
353 | else | ||
354 | ktype = "PKCS#3 DH Parameters"; | ||
355 | |||
356 | m= OPENSSL_malloc(buf_len+10); | ||
357 | if (m == NULL) | ||
358 | { | ||
359 | reason=ERR_R_MALLOC_FAILURE; | ||
360 | goto err; | ||
361 | } | ||
362 | |||
363 | BIO_indent(bp, indent, 128); | ||
364 | if (BIO_printf(bp,"%s: (%d bit)\n", ktype, BN_num_bits(x->p)) <= 0) | ||
365 | goto err; | ||
366 | indent += 4; | ||
367 | |||
368 | if (!ASN1_bn_print(bp,"private-key:",priv_key,m,indent)) goto err; | ||
369 | if (!ASN1_bn_print(bp,"public-key:",pub_key,m,indent)) goto err; | ||
370 | |||
371 | if (!ASN1_bn_print(bp,"prime:",x->p,m,indent)) goto err; | ||
372 | if (!ASN1_bn_print(bp,"generator:",x->g,m,indent)) goto err; | ||
373 | if (x->length != 0) | ||
374 | { | ||
375 | BIO_indent(bp, indent, 128); | ||
376 | if (BIO_printf(bp,"recommended-private-length: %d bits\n", | ||
377 | (int)x->length) <= 0) goto err; | ||
378 | } | ||
379 | |||
380 | |||
381 | ret=1; | ||
382 | if (0) | ||
383 | { | ||
384 | err: | ||
385 | DHerr(DH_F_DO_DH_PRINT,reason); | ||
386 | } | ||
387 | if (m != NULL) OPENSSL_free(m); | ||
388 | return(ret); | ||
389 | } | ||
390 | |||
391 | static int int_dh_size(const EVP_PKEY *pkey) | ||
392 | { | ||
393 | return(DH_size(pkey->pkey.dh)); | ||
394 | } | ||
395 | |||
396 | static int dh_bits(const EVP_PKEY *pkey) | ||
397 | { | ||
398 | return BN_num_bits(pkey->pkey.dh->p); | ||
399 | } | ||
400 | |||
401 | static int dh_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) | ||
402 | { | ||
403 | if ( BN_cmp(a->pkey.dh->p,b->pkey.dh->p) || | ||
404 | BN_cmp(a->pkey.dh->g,b->pkey.dh->g)) | ||
405 | return 0; | ||
406 | else | ||
407 | return 1; | ||
408 | } | ||
409 | |||
410 | static int dh_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) | ||
411 | { | ||
412 | BIGNUM *a; | ||
413 | |||
414 | if ((a=BN_dup(from->pkey.dh->p)) == NULL) | ||
415 | return 0; | ||
416 | if (to->pkey.dh->p != NULL) | ||
417 | BN_free(to->pkey.dh->p); | ||
418 | to->pkey.dh->p=a; | ||
419 | |||
420 | if ((a=BN_dup(from->pkey.dh->g)) == NULL) | ||
421 | return 0; | ||
422 | if (to->pkey.dh->g != NULL) | ||
423 | BN_free(to->pkey.dh->g); | ||
424 | to->pkey.dh->g=a; | ||
425 | |||
426 | return 1; | ||
427 | } | ||
428 | |||
429 | static int dh_missing_parameters(const EVP_PKEY *a) | ||
430 | { | ||
431 | if (!a->pkey.dh->p || !a->pkey.dh->g) | ||
432 | return 1; | ||
433 | return 0; | ||
434 | } | ||
435 | |||
436 | static int dh_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) | ||
437 | { | ||
438 | if (dh_cmp_parameters(a, b) == 0) | ||
439 | return 0; | ||
440 | if (BN_cmp(b->pkey.dh->pub_key,a->pkey.dh->pub_key) != 0) | ||
441 | return 0; | ||
442 | else | ||
443 | return 1; | ||
444 | } | ||
445 | |||
446 | static int dh_param_print(BIO *bp, const EVP_PKEY *pkey, int indent, | ||
447 | ASN1_PCTX *ctx) | ||
448 | { | ||
449 | return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 0); | ||
450 | } | ||
451 | |||
452 | static int dh_public_print(BIO *bp, const EVP_PKEY *pkey, int indent, | ||
453 | ASN1_PCTX *ctx) | ||
454 | { | ||
455 | return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 1); | ||
456 | } | ||
457 | |||
458 | static int dh_private_print(BIO *bp, const EVP_PKEY *pkey, int indent, | ||
459 | ASN1_PCTX *ctx) | ||
460 | { | ||
461 | return do_dh_print(bp, pkey->pkey.dh, indent, ctx, 2); | ||
462 | } | ||
463 | |||
464 | int DHparams_print(BIO *bp, const DH *x) | ||
465 | { | ||
466 | return do_dh_print(bp, x, 4, NULL, 0); | ||
467 | } | ||
468 | |||
469 | const EVP_PKEY_ASN1_METHOD dh_asn1_meth = | ||
470 | { | ||
471 | EVP_PKEY_DH, | ||
472 | EVP_PKEY_DH, | ||
473 | 0, | ||
474 | |||
475 | "DH", | ||
476 | "OpenSSL PKCS#3 DH method", | ||
477 | |||
478 | dh_pub_decode, | ||
479 | dh_pub_encode, | ||
480 | dh_pub_cmp, | ||
481 | dh_public_print, | ||
482 | |||
483 | dh_priv_decode, | ||
484 | dh_priv_encode, | ||
485 | dh_private_print, | ||
486 | |||
487 | int_dh_size, | ||
488 | dh_bits, | ||
489 | |||
490 | dh_param_decode, | ||
491 | dh_param_encode, | ||
492 | dh_missing_parameters, | ||
493 | dh_copy_parameters, | ||
494 | dh_cmp_parameters, | ||
495 | dh_param_print, | ||
496 | 0, | ||
497 | |||
498 | int_dh_free, | ||
499 | 0 | ||
500 | }; | ||
501 | |||
diff --git a/src/lib/libcrypto/dh/dh_asn1.c b/src/lib/libcrypto/dh/dh_asn1.c deleted file mode 100644 index 0b4357d605..0000000000 --- a/src/lib/libcrypto/dh/dh_asn1.c +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | /* dh_asn1.c */ | ||
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | ||
3 | * project 2000. | ||
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 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/bn.h> | ||
62 | #include <openssl/dh.h> | ||
63 | #include <openssl/objects.h> | ||
64 | #include <openssl/asn1t.h> | ||
65 | |||
66 | /* Override the default free and new methods */ | ||
67 | static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, | ||
68 | void *exarg) | ||
69 | { | ||
70 | if(operation == ASN1_OP_NEW_PRE) { | ||
71 | *pval = (ASN1_VALUE *)DH_new(); | ||
72 | if(*pval) return 2; | ||
73 | return 0; | ||
74 | } else if(operation == ASN1_OP_FREE_PRE) { | ||
75 | DH_free((DH *)*pval); | ||
76 | *pval = NULL; | ||
77 | return 2; | ||
78 | } | ||
79 | return 1; | ||
80 | } | ||
81 | |||
82 | ASN1_SEQUENCE_cb(DHparams, dh_cb) = { | ||
83 | ASN1_SIMPLE(DH, p, BIGNUM), | ||
84 | ASN1_SIMPLE(DH, g, BIGNUM), | ||
85 | ASN1_OPT(DH, length, ZLONG), | ||
86 | } ASN1_SEQUENCE_END_cb(DH, DHparams) | ||
87 | |||
88 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams) | ||
89 | |||
90 | DH *DHparams_dup(DH *dh) | ||
91 | { | ||
92 | return ASN1_item_dup(ASN1_ITEM_rptr(DHparams), dh); | ||
93 | } | ||
diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c deleted file mode 100644 index 066898174e..0000000000 --- a/src/lib/libcrypto/dh/dh_check.c +++ /dev/null | |||
@@ -1,142 +0,0 @@ | |||
1 | /* crypto/dh/dh_check.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/bn.h> | ||
62 | #include <openssl/dh.h> | ||
63 | |||
64 | /* Check that p is a safe prime and | ||
65 | * if g is 2, 3 or 5, check that it is a suitable generator | ||
66 | * where | ||
67 | * for 2, p mod 24 == 11 | ||
68 | * for 3, p mod 12 == 5 | ||
69 | * for 5, p mod 10 == 3 or 7 | ||
70 | * should hold. | ||
71 | */ | ||
72 | |||
73 | int DH_check(const DH *dh, int *ret) | ||
74 | { | ||
75 | int ok=0; | ||
76 | BN_CTX *ctx=NULL; | ||
77 | BN_ULONG l; | ||
78 | BIGNUM *q=NULL; | ||
79 | |||
80 | *ret=0; | ||
81 | ctx=BN_CTX_new(); | ||
82 | if (ctx == NULL) goto err; | ||
83 | q=BN_new(); | ||
84 | if (q == NULL) goto err; | ||
85 | |||
86 | if (BN_is_word(dh->g,DH_GENERATOR_2)) | ||
87 | { | ||
88 | l=BN_mod_word(dh->p,24); | ||
89 | if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR; | ||
90 | } | ||
91 | #if 0 | ||
92 | else if (BN_is_word(dh->g,DH_GENERATOR_3)) | ||
93 | { | ||
94 | l=BN_mod_word(dh->p,12); | ||
95 | if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR; | ||
96 | } | ||
97 | #endif | ||
98 | else if (BN_is_word(dh->g,DH_GENERATOR_5)) | ||
99 | { | ||
100 | l=BN_mod_word(dh->p,10); | ||
101 | if ((l != 3) && (l != 7)) | ||
102 | *ret|=DH_NOT_SUITABLE_GENERATOR; | ||
103 | } | ||
104 | else | ||
105 | *ret|=DH_UNABLE_TO_CHECK_GENERATOR; | ||
106 | |||
107 | if (!BN_is_prime_ex(dh->p,BN_prime_checks,ctx,NULL)) | ||
108 | *ret|=DH_CHECK_P_NOT_PRIME; | ||
109 | else | ||
110 | { | ||
111 | if (!BN_rshift1(q,dh->p)) goto err; | ||
112 | if (!BN_is_prime_ex(q,BN_prime_checks,ctx,NULL)) | ||
113 | *ret|=DH_CHECK_P_NOT_SAFE_PRIME; | ||
114 | } | ||
115 | ok=1; | ||
116 | err: | ||
117 | if (ctx != NULL) BN_CTX_free(ctx); | ||
118 | if (q != NULL) BN_free(q); | ||
119 | return(ok); | ||
120 | } | ||
121 | |||
122 | int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret) | ||
123 | { | ||
124 | int ok=0; | ||
125 | BIGNUM *q=NULL; | ||
126 | |||
127 | *ret=0; | ||
128 | q=BN_new(); | ||
129 | if (q == NULL) goto err; | ||
130 | BN_set_word(q,1); | ||
131 | if (BN_cmp(pub_key,q)<=0) | ||
132 | *ret|=DH_CHECK_PUBKEY_TOO_SMALL; | ||
133 | BN_copy(q,dh->p); | ||
134 | BN_sub_word(q,1); | ||
135 | if (BN_cmp(pub_key,q)>=0) | ||
136 | *ret|=DH_CHECK_PUBKEY_TOO_LARGE; | ||
137 | |||
138 | ok = 1; | ||
139 | err: | ||
140 | if (q != NULL) BN_free(q); | ||
141 | return(ok); | ||
142 | } | ||
diff --git a/src/lib/libcrypto/dh/dh_depr.c b/src/lib/libcrypto/dh/dh_depr.c deleted file mode 100644 index acc05f252c..0000000000 --- a/src/lib/libcrypto/dh/dh_depr.c +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | /* crypto/dh/dh_depr.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 | |||
57 | /* This file contains deprecated functions as wrappers to the new ones */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/bn.h> | ||
62 | #include <openssl/dh.h> | ||
63 | |||
64 | static void *dummy=&dummy; | ||
65 | |||
66 | #ifndef OPENSSL_NO_DEPRECATED | ||
67 | DH *DH_generate_parameters(int prime_len, int generator, | ||
68 | void (*callback)(int,int,void *), void *cb_arg) | ||
69 | { | ||
70 | BN_GENCB cb; | ||
71 | DH *ret=NULL; | ||
72 | |||
73 | if((ret=DH_new()) == NULL) | ||
74 | return NULL; | ||
75 | |||
76 | BN_GENCB_set_old(&cb, callback, cb_arg); | ||
77 | |||
78 | if(DH_generate_parameters_ex(ret, prime_len, generator, &cb)) | ||
79 | return ret; | ||
80 | DH_free(ret); | ||
81 | return NULL; | ||
82 | } | ||
83 | #endif | ||
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c deleted file mode 100644 index 56d3df7356..0000000000 --- a/src/lib/libcrypto/dh/dh_err.c +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | /* crypto/dh/dh_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/dh.h> | ||
64 | |||
65 | /* BEGIN ERROR CODES */ | ||
66 | #ifndef OPENSSL_NO_ERR | ||
67 | |||
68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0) | ||
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason) | ||
70 | |||
71 | static ERR_STRING_DATA DH_str_functs[]= | ||
72 | { | ||
73 | {ERR_FUNC(DH_F_COMPUTE_KEY), "COMPUTE_KEY"}, | ||
74 | {ERR_FUNC(DH_F_DHPARAMS_PRINT_FP), "DHparams_print_fp"}, | ||
75 | {ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS), "DH_BUILTIN_GENPARAMS"}, | ||
76 | {ERR_FUNC(DH_F_DH_COMPUTE_KEY), "DH_compute_key"}, | ||
77 | {ERR_FUNC(DH_F_DH_GENERATE_KEY), "DH_generate_key"}, | ||
78 | {ERR_FUNC(DH_F_DH_GENERATE_PARAMETERS_EX), "DH_generate_parameters_ex"}, | ||
79 | {ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"}, | ||
80 | {ERR_FUNC(DH_F_DH_PARAM_DECODE), "DH_PARAM_DECODE"}, | ||
81 | {ERR_FUNC(DH_F_DH_PRIV_DECODE), "DH_PRIV_DECODE"}, | ||
82 | {ERR_FUNC(DH_F_DH_PRIV_ENCODE), "DH_PRIV_ENCODE"}, | ||
83 | {ERR_FUNC(DH_F_DH_PUB_DECODE), "DH_PUB_DECODE"}, | ||
84 | {ERR_FUNC(DH_F_DH_PUB_ENCODE), "DH_PUB_ENCODE"}, | ||
85 | {ERR_FUNC(DH_F_DO_DH_PRINT), "DO_DH_PRINT"}, | ||
86 | {ERR_FUNC(DH_F_GENERATE_KEY), "GENERATE_KEY"}, | ||
87 | {ERR_FUNC(DH_F_GENERATE_PARAMETERS), "GENERATE_PARAMETERS"}, | ||
88 | {ERR_FUNC(DH_F_PKEY_DH_DERIVE), "PKEY_DH_DERIVE"}, | ||
89 | {ERR_FUNC(DH_F_PKEY_DH_KEYGEN), "PKEY_DH_KEYGEN"}, | ||
90 | {0,NULL} | ||
91 | }; | ||
92 | |||
93 | static ERR_STRING_DATA DH_str_reasons[]= | ||
94 | { | ||
95 | {ERR_REASON(DH_R_BAD_GENERATOR) ,"bad generator"}, | ||
96 | {ERR_REASON(DH_R_BN_DECODE_ERROR) ,"bn decode error"}, | ||
97 | {ERR_REASON(DH_R_BN_ERROR) ,"bn error"}, | ||
98 | {ERR_REASON(DH_R_DECODE_ERROR) ,"decode error"}, | ||
99 | {ERR_REASON(DH_R_INVALID_PUBKEY) ,"invalid public key"}, | ||
100 | {ERR_REASON(DH_R_KEYS_NOT_SET) ,"keys not set"}, | ||
101 | {ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL) ,"key size too small"}, | ||
102 | {ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, | ||
103 | {ERR_REASON(DH_R_NON_FIPS_METHOD) ,"non fips method"}, | ||
104 | {ERR_REASON(DH_R_NO_PARAMETERS_SET) ,"no parameters set"}, | ||
105 | {ERR_REASON(DH_R_NO_PRIVATE_VALUE) ,"no private value"}, | ||
106 | {ERR_REASON(DH_R_PARAMETER_ENCODING_ERROR),"parameter encoding error"}, | ||
107 | {0,NULL} | ||
108 | }; | ||
109 | |||
110 | #endif | ||
111 | |||
112 | void ERR_load_DH_strings(void) | ||
113 | { | ||
114 | #ifndef OPENSSL_NO_ERR | ||
115 | |||
116 | if (ERR_func_error_string(DH_str_functs[0].error) == NULL) | ||
117 | { | ||
118 | ERR_load_strings(0,DH_str_functs); | ||
119 | ERR_load_strings(0,DH_str_reasons); | ||
120 | } | ||
121 | #endif | ||
122 | } | ||
diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c deleted file mode 100644 index 7b1fe9c9cb..0000000000 --- a/src/lib/libcrypto/dh/dh_gen.c +++ /dev/null | |||
@@ -1,192 +0,0 @@ | |||
1 | /* crypto/dh/dh_gen.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | /* NB: These functions have been upgraded - the previous prototypes are in | ||
60 | * dh_depr.c as wrappers to these ones. | ||
61 | * - Geoff | ||
62 | */ | ||
63 | |||
64 | #include <stdio.h> | ||
65 | #include "cryptlib.h" | ||
66 | #include <openssl/bn.h> | ||
67 | #include <openssl/dh.h> | ||
68 | |||
69 | #ifdef OPENSSL_FIPS | ||
70 | #include <openssl/fips.h> | ||
71 | #endif | ||
72 | |||
73 | static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb); | ||
74 | |||
75 | int DH_generate_parameters_ex(DH *ret, int prime_len, int generator, BN_GENCB *cb) | ||
76 | { | ||
77 | #ifdef OPENSSL_FIPS | ||
78 | if (FIPS_mode() && !(ret->meth->flags & DH_FLAG_FIPS_METHOD) | ||
79 | && !(ret->flags & DH_FLAG_NON_FIPS_ALLOW)) | ||
80 | { | ||
81 | DHerr(DH_F_DH_GENERATE_PARAMETERS_EX, DH_R_NON_FIPS_METHOD); | ||
82 | return 0; | ||
83 | } | ||
84 | #endif | ||
85 | if(ret->meth->generate_params) | ||
86 | return ret->meth->generate_params(ret, prime_len, generator, cb); | ||
87 | #ifdef OPENSSL_FIPS | ||
88 | if (FIPS_mode()) | ||
89 | return FIPS_dh_generate_parameters_ex(ret, prime_len, | ||
90 | generator, cb); | ||
91 | #endif | ||
92 | return dh_builtin_genparams(ret, prime_len, generator, cb); | ||
93 | } | ||
94 | |||
95 | /* We generate DH parameters as follows | ||
96 | * find a prime q which is prime_len/2 bits long. | ||
97 | * p=(2*q)+1 or (p-1)/2 = q | ||
98 | * For this case, g is a generator if | ||
99 | * g^((p-1)/q) mod p != 1 for values of q which are the factors of p-1. | ||
100 | * Since the factors of p-1 are q and 2, we just need to check | ||
101 | * g^2 mod p != 1 and g^q mod p != 1. | ||
102 | * | ||
103 | * Having said all that, | ||
104 | * there is another special case method for the generators 2, 3 and 5. | ||
105 | * for 2, p mod 24 == 11 | ||
106 | * for 3, p mod 12 == 5 <<<<< does not work for safe primes. | ||
107 | * for 5, p mod 10 == 3 or 7 | ||
108 | * | ||
109 | * Thanks to Phil Karn <karn@qualcomm.com> for the pointers about the | ||
110 | * special generators and for answering some of my questions. | ||
111 | * | ||
112 | * I've implemented the second simple method :-). | ||
113 | * Since DH should be using a safe prime (both p and q are prime), | ||
114 | * this generator function can take a very very long time to run. | ||
115 | */ | ||
116 | /* Actually there is no reason to insist that 'generator' be a generator. | ||
117 | * It's just as OK (and in some sense better) to use a generator of the | ||
118 | * order-q subgroup. | ||
119 | */ | ||
120 | static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb) | ||
121 | { | ||
122 | BIGNUM *t1,*t2; | ||
123 | int g,ok= -1; | ||
124 | BN_CTX *ctx=NULL; | ||
125 | |||
126 | ctx=BN_CTX_new(); | ||
127 | if (ctx == NULL) goto err; | ||
128 | BN_CTX_start(ctx); | ||
129 | t1 = BN_CTX_get(ctx); | ||
130 | t2 = BN_CTX_get(ctx); | ||
131 | if (t1 == NULL || t2 == NULL) goto err; | ||
132 | |||
133 | /* Make sure 'ret' has the necessary elements */ | ||
134 | if(!ret->p && ((ret->p = BN_new()) == NULL)) goto err; | ||
135 | if(!ret->g && ((ret->g = BN_new()) == NULL)) goto err; | ||
136 | |||
137 | if (generator <= 1) | ||
138 | { | ||
139 | DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR); | ||
140 | goto err; | ||
141 | } | ||
142 | if (generator == DH_GENERATOR_2) | ||
143 | { | ||
144 | if (!BN_set_word(t1,24)) goto err; | ||
145 | if (!BN_set_word(t2,11)) goto err; | ||
146 | g=2; | ||
147 | } | ||
148 | #if 0 /* does not work for safe primes */ | ||
149 | else if (generator == DH_GENERATOR_3) | ||
150 | { | ||
151 | if (!BN_set_word(t1,12)) goto err; | ||
152 | if (!BN_set_word(t2,5)) goto err; | ||
153 | g=3; | ||
154 | } | ||
155 | #endif | ||
156 | else if (generator == DH_GENERATOR_5) | ||
157 | { | ||
158 | if (!BN_set_word(t1,10)) goto err; | ||
159 | if (!BN_set_word(t2,3)) goto err; | ||
160 | /* BN_set_word(t3,7); just have to miss | ||
161 | * out on these ones :-( */ | ||
162 | g=5; | ||
163 | } | ||
164 | else | ||
165 | { | ||
166 | /* in the general case, don't worry if 'generator' is a | ||
167 | * generator or not: since we are using safe primes, | ||
168 | * it will generate either an order-q or an order-2q group, | ||
169 | * which both is OK */ | ||
170 | if (!BN_set_word(t1,2)) goto err; | ||
171 | if (!BN_set_word(t2,1)) goto err; | ||
172 | g=generator; | ||
173 | } | ||
174 | |||
175 | if(!BN_generate_prime_ex(ret->p,prime_len,1,t1,t2,cb)) goto err; | ||
176 | if(!BN_GENCB_call(cb, 3, 0)) goto err; | ||
177 | if (!BN_set_word(ret->g,g)) goto err; | ||
178 | ok=1; | ||
179 | err: | ||
180 | if (ok == -1) | ||
181 | { | ||
182 | DHerr(DH_F_DH_BUILTIN_GENPARAMS,ERR_R_BN_LIB); | ||
183 | ok=0; | ||
184 | } | ||
185 | |||
186 | if (ctx != NULL) | ||
187 | { | ||
188 | BN_CTX_end(ctx); | ||
189 | BN_CTX_free(ctx); | ||
190 | } | ||
191 | return ok; | ||
192 | } | ||
diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c deleted file mode 100644 index 89a74db4e6..0000000000 --- a/src/lib/libcrypto/dh/dh_key.c +++ /dev/null | |||
@@ -1,292 +0,0 @@ | |||
1 | /* crypto/dh/dh_key.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/bn.h> | ||
62 | #include <openssl/rand.h> | ||
63 | #include <openssl/dh.h> | ||
64 | |||
65 | static int generate_key(DH *dh); | ||
66 | static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh); | ||
67 | static int dh_bn_mod_exp(const DH *dh, BIGNUM *r, | ||
68 | const BIGNUM *a, const BIGNUM *p, | ||
69 | const BIGNUM *m, BN_CTX *ctx, | ||
70 | BN_MONT_CTX *m_ctx); | ||
71 | static int dh_init(DH *dh); | ||
72 | static int dh_finish(DH *dh); | ||
73 | |||
74 | int DH_generate_key(DH *dh) | ||
75 | { | ||
76 | #ifdef OPENSSL_FIPS | ||
77 | if (FIPS_mode() && !(dh->meth->flags & DH_FLAG_FIPS_METHOD) | ||
78 | && !(dh->flags & DH_FLAG_NON_FIPS_ALLOW)) | ||
79 | { | ||
80 | DHerr(DH_F_DH_GENERATE_KEY, DH_R_NON_FIPS_METHOD); | ||
81 | return 0; | ||
82 | } | ||
83 | #endif | ||
84 | return dh->meth->generate_key(dh); | ||
85 | } | ||
86 | |||
87 | int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) | ||
88 | { | ||
89 | #ifdef OPENSSL_FIPS | ||
90 | if (FIPS_mode() && !(dh->meth->flags & DH_FLAG_FIPS_METHOD) | ||
91 | && !(dh->flags & DH_FLAG_NON_FIPS_ALLOW)) | ||
92 | { | ||
93 | DHerr(DH_F_DH_COMPUTE_KEY, DH_R_NON_FIPS_METHOD); | ||
94 | return 0; | ||
95 | } | ||
96 | #endif | ||
97 | return dh->meth->compute_key(key, pub_key, dh); | ||
98 | } | ||
99 | |||
100 | static DH_METHOD dh_ossl = { | ||
101 | "OpenSSL DH Method", | ||
102 | generate_key, | ||
103 | compute_key, | ||
104 | dh_bn_mod_exp, | ||
105 | dh_init, | ||
106 | dh_finish, | ||
107 | 0, | ||
108 | NULL, | ||
109 | NULL | ||
110 | }; | ||
111 | |||
112 | const DH_METHOD *DH_OpenSSL(void) | ||
113 | { | ||
114 | return &dh_ossl; | ||
115 | } | ||
116 | |||
117 | static int generate_key(DH *dh) | ||
118 | { | ||
119 | int ok=0; | ||
120 | int generate_new_key=0; | ||
121 | unsigned l; | ||
122 | BN_CTX *ctx; | ||
123 | BN_MONT_CTX *mont=NULL; | ||
124 | BIGNUM *pub_key=NULL,*priv_key=NULL; | ||
125 | |||
126 | ctx = BN_CTX_new(); | ||
127 | if (ctx == NULL) goto err; | ||
128 | |||
129 | if (dh->priv_key == NULL) | ||
130 | { | ||
131 | priv_key=BN_new(); | ||
132 | if (priv_key == NULL) goto err; | ||
133 | generate_new_key=1; | ||
134 | } | ||
135 | else | ||
136 | priv_key=dh->priv_key; | ||
137 | |||
138 | if (dh->pub_key == NULL) | ||
139 | { | ||
140 | pub_key=BN_new(); | ||
141 | if (pub_key == NULL) goto err; | ||
142 | } | ||
143 | else | ||
144 | pub_key=dh->pub_key; | ||
145 | |||
146 | |||
147 | if (dh->flags & DH_FLAG_CACHE_MONT_P) | ||
148 | { | ||
149 | mont = BN_MONT_CTX_set_locked(&dh->method_mont_p, | ||
150 | CRYPTO_LOCK_DH, dh->p, ctx); | ||
151 | if (!mont) | ||
152 | goto err; | ||
153 | } | ||
154 | |||
155 | if (generate_new_key) | ||
156 | { | ||
157 | if (dh->q) | ||
158 | { | ||
159 | do | ||
160 | { | ||
161 | if (!BN_rand_range(priv_key, dh->q)) | ||
162 | goto err; | ||
163 | } | ||
164 | while (BN_is_zero(priv_key) || BN_is_one(priv_key)); | ||
165 | } | ||
166 | else | ||
167 | { | ||
168 | /* secret exponent length */ | ||
169 | l = dh->length ? dh->length : BN_num_bits(dh->p)-1; | ||
170 | if (!BN_rand(priv_key, l, 0, 0)) goto err; | ||
171 | } | ||
172 | } | ||
173 | |||
174 | { | ||
175 | BIGNUM local_prk; | ||
176 | BIGNUM *prk; | ||
177 | |||
178 | if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0) | ||
179 | { | ||
180 | BN_init(&local_prk); | ||
181 | prk = &local_prk; | ||
182 | BN_with_flags(prk, priv_key, BN_FLG_CONSTTIME); | ||
183 | } | ||
184 | else | ||
185 | prk = priv_key; | ||
186 | |||
187 | if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, prk, dh->p, ctx, mont)) goto err; | ||
188 | } | ||
189 | |||
190 | dh->pub_key=pub_key; | ||
191 | dh->priv_key=priv_key; | ||
192 | ok=1; | ||
193 | err: | ||
194 | if (ok != 1) | ||
195 | DHerr(DH_F_GENERATE_KEY,ERR_R_BN_LIB); | ||
196 | |||
197 | if ((pub_key != NULL) && (dh->pub_key == NULL)) BN_free(pub_key); | ||
198 | if ((priv_key != NULL) && (dh->priv_key == NULL)) BN_free(priv_key); | ||
199 | BN_CTX_free(ctx); | ||
200 | return(ok); | ||
201 | } | ||
202 | |||
203 | static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) | ||
204 | { | ||
205 | BN_CTX *ctx=NULL; | ||
206 | BN_MONT_CTX *mont=NULL; | ||
207 | BIGNUM *tmp; | ||
208 | int ret= -1; | ||
209 | int check_result; | ||
210 | |||
211 | if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) | ||
212 | { | ||
213 | DHerr(DH_F_COMPUTE_KEY,DH_R_MODULUS_TOO_LARGE); | ||
214 | goto err; | ||
215 | } | ||
216 | |||
217 | ctx = BN_CTX_new(); | ||
218 | if (ctx == NULL) goto err; | ||
219 | BN_CTX_start(ctx); | ||
220 | tmp = BN_CTX_get(ctx); | ||
221 | |||
222 | if (dh->priv_key == NULL) | ||
223 | { | ||
224 | DHerr(DH_F_COMPUTE_KEY,DH_R_NO_PRIVATE_VALUE); | ||
225 | goto err; | ||
226 | } | ||
227 | |||
228 | if (dh->flags & DH_FLAG_CACHE_MONT_P) | ||
229 | { | ||
230 | mont = BN_MONT_CTX_set_locked(&dh->method_mont_p, | ||
231 | CRYPTO_LOCK_DH, dh->p, ctx); | ||
232 | if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0) | ||
233 | { | ||
234 | /* XXX */ | ||
235 | BN_set_flags(dh->priv_key, BN_FLG_CONSTTIME); | ||
236 | } | ||
237 | if (!mont) | ||
238 | goto err; | ||
239 | } | ||
240 | |||
241 | if (!DH_check_pub_key(dh, pub_key, &check_result) || check_result) | ||
242 | { | ||
243 | DHerr(DH_F_COMPUTE_KEY,DH_R_INVALID_PUBKEY); | ||
244 | goto err; | ||
245 | } | ||
246 | |||
247 | if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key,dh->p,ctx,mont)) | ||
248 | { | ||
249 | DHerr(DH_F_COMPUTE_KEY,ERR_R_BN_LIB); | ||
250 | goto err; | ||
251 | } | ||
252 | |||
253 | ret=BN_bn2bin(tmp,key); | ||
254 | err: | ||
255 | if (ctx != NULL) | ||
256 | { | ||
257 | BN_CTX_end(ctx); | ||
258 | BN_CTX_free(ctx); | ||
259 | } | ||
260 | return(ret); | ||
261 | } | ||
262 | |||
263 | static int dh_bn_mod_exp(const DH *dh, BIGNUM *r, | ||
264 | const BIGNUM *a, const BIGNUM *p, | ||
265 | const BIGNUM *m, BN_CTX *ctx, | ||
266 | BN_MONT_CTX *m_ctx) | ||
267 | { | ||
268 | /* If a is only one word long and constant time is false, use the faster | ||
269 | * exponenentiation function. | ||
270 | */ | ||
271 | if (a->top == 1 && ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) != 0)) | ||
272 | { | ||
273 | BN_ULONG A = a->d[0]; | ||
274 | return BN_mod_exp_mont_word(r,A,p,m,ctx,m_ctx); | ||
275 | } | ||
276 | else | ||
277 | return BN_mod_exp_mont(r,a,p,m,ctx,m_ctx); | ||
278 | } | ||
279 | |||
280 | |||
281 | static int dh_init(DH *dh) | ||
282 | { | ||
283 | dh->flags |= DH_FLAG_CACHE_MONT_P; | ||
284 | return(1); | ||
285 | } | ||
286 | |||
287 | static int dh_finish(DH *dh) | ||
288 | { | ||
289 | if(dh->method_mont_p) | ||
290 | BN_MONT_CTX_free(dh->method_mont_p); | ||
291 | return(1); | ||
292 | } | ||
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c deleted file mode 100644 index 00218f2b92..0000000000 --- a/src/lib/libcrypto/dh/dh_lib.c +++ /dev/null | |||
@@ -1,260 +0,0 @@ | |||
1 | /* crypto/dh/dh_lib.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/bn.h> | ||
62 | #include <openssl/dh.h> | ||
63 | #ifndef OPENSSL_NO_ENGINE | ||
64 | #include <openssl/engine.h> | ||
65 | #endif | ||
66 | |||
67 | #ifdef OPENSSL_FIPS | ||
68 | #include <openssl/fips.h> | ||
69 | #endif | ||
70 | |||
71 | const char DH_version[]="Diffie-Hellman" OPENSSL_VERSION_PTEXT; | ||
72 | |||
73 | static const DH_METHOD *default_DH_method = NULL; | ||
74 | |||
75 | void DH_set_default_method(const DH_METHOD *meth) | ||
76 | { | ||
77 | default_DH_method = meth; | ||
78 | } | ||
79 | |||
80 | const DH_METHOD *DH_get_default_method(void) | ||
81 | { | ||
82 | if(!default_DH_method) | ||
83 | { | ||
84 | #ifdef OPENSSL_FIPS | ||
85 | if (FIPS_mode()) | ||
86 | return FIPS_dh_openssl(); | ||
87 | else | ||
88 | return DH_OpenSSL(); | ||
89 | #else | ||
90 | default_DH_method = DH_OpenSSL(); | ||
91 | #endif | ||
92 | } | ||
93 | return default_DH_method; | ||
94 | } | ||
95 | |||
96 | int DH_set_method(DH *dh, const DH_METHOD *meth) | ||
97 | { | ||
98 | /* NB: The caller is specifically setting a method, so it's not up to us | ||
99 | * to deal with which ENGINE it comes from. */ | ||
100 | const DH_METHOD *mtmp; | ||
101 | mtmp = dh->meth; | ||
102 | if (mtmp->finish) mtmp->finish(dh); | ||
103 | #ifndef OPENSSL_NO_ENGINE | ||
104 | if (dh->engine) | ||
105 | { | ||
106 | ENGINE_finish(dh->engine); | ||
107 | dh->engine = NULL; | ||
108 | } | ||
109 | #endif | ||
110 | dh->meth = meth; | ||
111 | if (meth->init) meth->init(dh); | ||
112 | return 1; | ||
113 | } | ||
114 | |||
115 | DH *DH_new(void) | ||
116 | { | ||
117 | return DH_new_method(NULL); | ||
118 | } | ||
119 | |||
120 | DH *DH_new_method(ENGINE *engine) | ||
121 | { | ||
122 | DH *ret; | ||
123 | |||
124 | ret=(DH *)OPENSSL_malloc(sizeof(DH)); | ||
125 | if (ret == NULL) | ||
126 | { | ||
127 | DHerr(DH_F_DH_NEW_METHOD,ERR_R_MALLOC_FAILURE); | ||
128 | return(NULL); | ||
129 | } | ||
130 | |||
131 | ret->meth = DH_get_default_method(); | ||
132 | #ifndef OPENSSL_NO_ENGINE | ||
133 | if (engine) | ||
134 | { | ||
135 | if (!ENGINE_init(engine)) | ||
136 | { | ||
137 | DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB); | ||
138 | OPENSSL_free(ret); | ||
139 | return NULL; | ||
140 | } | ||
141 | ret->engine = engine; | ||
142 | } | ||
143 | else | ||
144 | ret->engine = ENGINE_get_default_DH(); | ||
145 | if(ret->engine) | ||
146 | { | ||
147 | ret->meth = ENGINE_get_DH(ret->engine); | ||
148 | if(!ret->meth) | ||
149 | { | ||
150 | DHerr(DH_F_DH_NEW_METHOD,ERR_R_ENGINE_LIB); | ||
151 | ENGINE_finish(ret->engine); | ||
152 | OPENSSL_free(ret); | ||
153 | return NULL; | ||
154 | } | ||
155 | } | ||
156 | #endif | ||
157 | |||
158 | ret->pad=0; | ||
159 | ret->version=0; | ||
160 | ret->p=NULL; | ||
161 | ret->g=NULL; | ||
162 | ret->length=0; | ||
163 | ret->pub_key=NULL; | ||
164 | ret->priv_key=NULL; | ||
165 | ret->q=NULL; | ||
166 | ret->j=NULL; | ||
167 | ret->seed = NULL; | ||
168 | ret->seedlen = 0; | ||
169 | ret->counter = NULL; | ||
170 | ret->method_mont_p=NULL; | ||
171 | ret->references = 1; | ||
172 | ret->flags=ret->meth->flags & ~DH_FLAG_NON_FIPS_ALLOW; | ||
173 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data); | ||
174 | if ((ret->meth->init != NULL) && !ret->meth->init(ret)) | ||
175 | { | ||
176 | #ifndef OPENSSL_NO_ENGINE | ||
177 | if (ret->engine) | ||
178 | ENGINE_finish(ret->engine); | ||
179 | #endif | ||
180 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data); | ||
181 | OPENSSL_free(ret); | ||
182 | ret=NULL; | ||
183 | } | ||
184 | return(ret); | ||
185 | } | ||
186 | |||
187 | void DH_free(DH *r) | ||
188 | { | ||
189 | int i; | ||
190 | if(r == NULL) return; | ||
191 | i = CRYPTO_add(&r->references, -1, CRYPTO_LOCK_DH); | ||
192 | #ifdef REF_PRINT | ||
193 | REF_PRINT("DH",r); | ||
194 | #endif | ||
195 | if (i > 0) return; | ||
196 | #ifdef REF_CHECK | ||
197 | if (i < 0) | ||
198 | { | ||
199 | fprintf(stderr,"DH_free, bad reference count\n"); | ||
200 | abort(); | ||
201 | } | ||
202 | #endif | ||
203 | |||
204 | if (r->meth->finish) | ||
205 | r->meth->finish(r); | ||
206 | #ifndef OPENSSL_NO_ENGINE | ||
207 | if (r->engine) | ||
208 | ENGINE_finish(r->engine); | ||
209 | #endif | ||
210 | |||
211 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, r, &r->ex_data); | ||
212 | |||
213 | if (r->p != NULL) BN_clear_free(r->p); | ||
214 | if (r->g != NULL) BN_clear_free(r->g); | ||
215 | if (r->q != NULL) BN_clear_free(r->q); | ||
216 | if (r->j != NULL) BN_clear_free(r->j); | ||
217 | if (r->seed) OPENSSL_free(r->seed); | ||
218 | if (r->counter != NULL) BN_clear_free(r->counter); | ||
219 | if (r->pub_key != NULL) BN_clear_free(r->pub_key); | ||
220 | if (r->priv_key != NULL) BN_clear_free(r->priv_key); | ||
221 | OPENSSL_free(r); | ||
222 | } | ||
223 | |||
224 | int DH_up_ref(DH *r) | ||
225 | { | ||
226 | int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_DH); | ||
227 | #ifdef REF_PRINT | ||
228 | REF_PRINT("DH",r); | ||
229 | #endif | ||
230 | #ifdef REF_CHECK | ||
231 | if (i < 2) | ||
232 | { | ||
233 | fprintf(stderr, "DH_up, bad reference count\n"); | ||
234 | abort(); | ||
235 | } | ||
236 | #endif | ||
237 | return ((i > 1) ? 1 : 0); | ||
238 | } | ||
239 | |||
240 | int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | ||
241 | CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) | ||
242 | { | ||
243 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DH, argl, argp, | ||
244 | new_func, dup_func, free_func); | ||
245 | } | ||
246 | |||
247 | int DH_set_ex_data(DH *d, int idx, void *arg) | ||
248 | { | ||
249 | return(CRYPTO_set_ex_data(&d->ex_data,idx,arg)); | ||
250 | } | ||
251 | |||
252 | void *DH_get_ex_data(DH *d, int idx) | ||
253 | { | ||
254 | return(CRYPTO_get_ex_data(&d->ex_data,idx)); | ||
255 | } | ||
256 | |||
257 | int DH_size(const DH *dh) | ||
258 | { | ||
259 | return(BN_num_bytes(dh->p)); | ||
260 | } | ||
diff --git a/src/lib/libcrypto/dh/dh_pmeth.c b/src/lib/libcrypto/dh/dh_pmeth.c deleted file mode 100644 index 5ae72b7d4c..0000000000 --- a/src/lib/libcrypto/dh/dh_pmeth.c +++ /dev/null | |||
@@ -1,254 +0,0 @@ | |||
1 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | ||
2 | * project 2006. | ||
3 | */ | ||
4 | /* ==================================================================== | ||
5 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions | ||
9 | * are met: | ||
10 | * | ||
11 | * 1. Redistributions of source code must retain the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer. | ||
13 | * | ||
14 | * 2. Redistributions in binary form must reproduce the above copyright | ||
15 | * notice, this list of conditions and the following disclaimer in | ||
16 | * the documentation and/or other materials provided with the | ||
17 | * distribution. | ||
18 | * | ||
19 | * 3. All advertising materials mentioning features or use of this | ||
20 | * software must display the following acknowledgment: | ||
21 | * "This product includes software developed by the OpenSSL Project | ||
22 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
23 | * | ||
24 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
25 | * endorse or promote products derived from this software without | ||
26 | * prior written permission. For written permission, please contact | ||
27 | * licensing@OpenSSL.org. | ||
28 | * | ||
29 | * 5. Products derived from this software may not be called "OpenSSL" | ||
30 | * nor may "OpenSSL" appear in their names without prior written | ||
31 | * permission of the OpenSSL Project. | ||
32 | * | ||
33 | * 6. Redistributions of any form whatsoever must retain the following | ||
34 | * acknowledgment: | ||
35 | * "This product includes software developed by the OpenSSL Project | ||
36 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
37 | * | ||
38 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
39 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
40 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
41 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
42 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
43 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
44 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
45 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
46 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
47 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
48 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
49 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
50 | * ==================================================================== | ||
51 | * | ||
52 | * This product includes cryptographic software written by Eric Young | ||
53 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
54 | * Hudson (tjh@cryptsoft.com). | ||
55 | * | ||
56 | */ | ||
57 | |||
58 | #include <stdio.h> | ||
59 | #include "cryptlib.h" | ||
60 | #include <openssl/asn1t.h> | ||
61 | #include <openssl/x509.h> | ||
62 | #include <openssl/evp.h> | ||
63 | #include <openssl/dh.h> | ||
64 | #include <openssl/bn.h> | ||
65 | #include "evp_locl.h" | ||
66 | |||
67 | /* DH pkey context structure */ | ||
68 | |||
69 | typedef struct | ||
70 | { | ||
71 | /* Parameter gen parameters */ | ||
72 | int prime_len; | ||
73 | int generator; | ||
74 | int use_dsa; | ||
75 | /* Keygen callback info */ | ||
76 | int gentmp[2]; | ||
77 | /* message digest */ | ||
78 | } DH_PKEY_CTX; | ||
79 | |||
80 | static int pkey_dh_init(EVP_PKEY_CTX *ctx) | ||
81 | { | ||
82 | DH_PKEY_CTX *dctx; | ||
83 | dctx = OPENSSL_malloc(sizeof(DH_PKEY_CTX)); | ||
84 | if (!dctx) | ||
85 | return 0; | ||
86 | dctx->prime_len = 1024; | ||
87 | dctx->generator = 2; | ||
88 | dctx->use_dsa = 0; | ||
89 | |||
90 | ctx->data = dctx; | ||
91 | ctx->keygen_info = dctx->gentmp; | ||
92 | ctx->keygen_info_count = 2; | ||
93 | |||
94 | return 1; | ||
95 | } | ||
96 | |||
97 | static int pkey_dh_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src) | ||
98 | { | ||
99 | DH_PKEY_CTX *dctx, *sctx; | ||
100 | if (!pkey_dh_init(dst)) | ||
101 | return 0; | ||
102 | sctx = src->data; | ||
103 | dctx = dst->data; | ||
104 | dctx->prime_len = sctx->prime_len; | ||
105 | dctx->generator = sctx->generator; | ||
106 | dctx->use_dsa = sctx->use_dsa; | ||
107 | return 1; | ||
108 | } | ||
109 | |||
110 | static void pkey_dh_cleanup(EVP_PKEY_CTX *ctx) | ||
111 | { | ||
112 | DH_PKEY_CTX *dctx = ctx->data; | ||
113 | if (dctx) | ||
114 | OPENSSL_free(dctx); | ||
115 | } | ||
116 | |||
117 | static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) | ||
118 | { | ||
119 | DH_PKEY_CTX *dctx = ctx->data; | ||
120 | switch (type) | ||
121 | { | ||
122 | case EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN: | ||
123 | if (p1 < 256) | ||
124 | return -2; | ||
125 | dctx->prime_len = p1; | ||
126 | return 1; | ||
127 | |||
128 | case EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR: | ||
129 | dctx->generator = p1; | ||
130 | return 1; | ||
131 | |||
132 | case EVP_PKEY_CTRL_PEER_KEY: | ||
133 | /* Default behaviour is OK */ | ||
134 | return 1; | ||
135 | |||
136 | default: | ||
137 | return -2; | ||
138 | |||
139 | } | ||
140 | } | ||
141 | |||
142 | |||
143 | static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx, | ||
144 | const char *type, const char *value) | ||
145 | { | ||
146 | if (!strcmp(type, "dh_paramgen_prime_len")) | ||
147 | { | ||
148 | int len; | ||
149 | len = atoi(value); | ||
150 | return EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len); | ||
151 | } | ||
152 | if (!strcmp(type, "dh_paramgen_generator")) | ||
153 | { | ||
154 | int len; | ||
155 | len = atoi(value); | ||
156 | return EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, len); | ||
157 | } | ||
158 | return -2; | ||
159 | } | ||
160 | |||
161 | static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) | ||
162 | { | ||
163 | DH *dh = NULL; | ||
164 | DH_PKEY_CTX *dctx = ctx->data; | ||
165 | BN_GENCB *pcb, cb; | ||
166 | int ret; | ||
167 | if (ctx->pkey_gencb) | ||
168 | { | ||
169 | pcb = &cb; | ||
170 | evp_pkey_set_cb_translate(pcb, ctx); | ||
171 | } | ||
172 | else | ||
173 | pcb = NULL; | ||
174 | dh = DH_new(); | ||
175 | if (!dh) | ||
176 | return 0; | ||
177 | ret = DH_generate_parameters_ex(dh, | ||
178 | dctx->prime_len, dctx->generator, pcb); | ||
179 | if (ret) | ||
180 | EVP_PKEY_assign_DH(pkey, dh); | ||
181 | else | ||
182 | DH_free(dh); | ||
183 | return ret; | ||
184 | } | ||
185 | |||
186 | static int pkey_dh_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) | ||
187 | { | ||
188 | DH *dh = NULL; | ||
189 | if (ctx->pkey == NULL) | ||
190 | { | ||
191 | DHerr(DH_F_PKEY_DH_KEYGEN, DH_R_NO_PARAMETERS_SET); | ||
192 | return 0; | ||
193 | } | ||
194 | dh = DH_new(); | ||
195 | if (!dh) | ||
196 | return 0; | ||
197 | EVP_PKEY_assign_DH(pkey, dh); | ||
198 | /* Note: if error return, pkey is freed by parent routine */ | ||
199 | if (!EVP_PKEY_copy_parameters(pkey, ctx->pkey)) | ||
200 | return 0; | ||
201 | return DH_generate_key(pkey->pkey.dh); | ||
202 | } | ||
203 | |||
204 | static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen) | ||
205 | { | ||
206 | int ret; | ||
207 | if (!ctx->pkey || !ctx->peerkey) | ||
208 | { | ||
209 | DHerr(DH_F_PKEY_DH_DERIVE, DH_R_KEYS_NOT_SET); | ||
210 | return 0; | ||
211 | } | ||
212 | ret = DH_compute_key(key, ctx->peerkey->pkey.dh->pub_key, | ||
213 | ctx->pkey->pkey.dh); | ||
214 | if (ret < 0) | ||
215 | return ret; | ||
216 | *keylen = ret; | ||
217 | return 1; | ||
218 | } | ||
219 | |||
220 | const EVP_PKEY_METHOD dh_pkey_meth = | ||
221 | { | ||
222 | EVP_PKEY_DH, | ||
223 | EVP_PKEY_FLAG_AUTOARGLEN, | ||
224 | pkey_dh_init, | ||
225 | pkey_dh_copy, | ||
226 | pkey_dh_cleanup, | ||
227 | |||
228 | 0, | ||
229 | pkey_dh_paramgen, | ||
230 | |||
231 | 0, | ||
232 | pkey_dh_keygen, | ||
233 | |||
234 | 0, | ||
235 | 0, | ||
236 | |||
237 | 0, | ||
238 | 0, | ||
239 | |||
240 | 0,0, | ||
241 | |||
242 | 0,0,0,0, | ||
243 | |||
244 | 0,0, | ||
245 | |||
246 | 0,0, | ||
247 | |||
248 | 0, | ||
249 | pkey_dh_derive, | ||
250 | |||
251 | pkey_dh_ctrl, | ||
252 | pkey_dh_ctrl_str | ||
253 | |||
254 | }; | ||
diff --git a/src/lib/libcrypto/dh/dh_prn.c b/src/lib/libcrypto/dh/dh_prn.c deleted file mode 100644 index ae58c2ac87..0000000000 --- a/src/lib/libcrypto/dh/dh_prn.c +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | /* crypto/asn1/t_pkey.c */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include "cryptlib.h" | ||
61 | #include <openssl/evp.h> | ||
62 | #include <openssl/dh.h> | ||
63 | |||
64 | #ifndef OPENSSL_NO_FP_API | ||
65 | int DHparams_print_fp(FILE *fp, const DH *x) | ||
66 | { | ||
67 | BIO *b; | ||
68 | int ret; | ||
69 | |||
70 | if ((b=BIO_new(BIO_s_file())) == NULL) | ||
71 | { | ||
72 | DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB); | ||
73 | return(0); | ||
74 | } | ||
75 | BIO_set_fp(b,fp,BIO_NOCLOSE); | ||
76 | ret=DHparams_print(b, x); | ||
77 | BIO_free(b); | ||
78 | return(ret); | ||
79 | } | ||
80 | #endif | ||