diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ecp_mont.c')
-rw-r--r-- | src/lib/libcrypto/ec/ecp_mont.c | 151 |
1 files changed, 70 insertions, 81 deletions
diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c index 9fc4a466a5..7b30d4c38a 100644 --- a/src/lib/libcrypto/ec/ecp_mont.c +++ b/src/lib/libcrypto/ec/ecp_mont.c | |||
@@ -1,7 +1,4 @@ | |||
1 | /* crypto/ec/ecp_mont.c */ | 1 | /* crypto/ec/ecp_mont.c */ |
2 | /* | ||
3 | * Originally written by Bodo Moeller for the OpenSSL project. | ||
4 | */ | ||
5 | /* ==================================================================== | 2 | /* ==================================================================== |
6 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. |
7 | * | 4 | * |
@@ -55,11 +52,6 @@ | |||
55 | * Hudson (tjh@cryptsoft.com). | 52 | * Hudson (tjh@cryptsoft.com). |
56 | * | 53 | * |
57 | */ | 54 | */ |
58 | /* ==================================================================== | ||
59 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | ||
60 | * Portions of this software developed by SUN MICROSYSTEMS, INC., | ||
61 | * and contributed to the OpenSSL project. | ||
62 | */ | ||
63 | 55 | ||
64 | #include <openssl/err.h> | 56 | #include <openssl/err.h> |
65 | 57 | ||
@@ -69,15 +61,16 @@ | |||
69 | const EC_METHOD *EC_GFp_mont_method(void) | 61 | const EC_METHOD *EC_GFp_mont_method(void) |
70 | { | 62 | { |
71 | static const EC_METHOD ret = { | 63 | static const EC_METHOD ret = { |
72 | NID_X9_62_prime_field, | ||
73 | ec_GFp_mont_group_init, | 64 | ec_GFp_mont_group_init, |
74 | ec_GFp_mont_group_finish, | 65 | ec_GFp_mont_group_finish, |
75 | ec_GFp_mont_group_clear_finish, | 66 | ec_GFp_mont_group_clear_finish, |
76 | ec_GFp_mont_group_copy, | 67 | ec_GFp_mont_group_copy, |
77 | ec_GFp_mont_group_set_curve, | 68 | ec_GFp_mont_group_set_curve_GFp, |
78 | ec_GFp_simple_group_get_curve, | 69 | ec_GFp_simple_group_get_curve_GFp, |
79 | ec_GFp_simple_group_get_degree, | 70 | ec_GFp_simple_group_set_generator, |
80 | ec_GFp_simple_group_check_discriminant, | 71 | ec_GFp_simple_group_get0_generator, |
72 | ec_GFp_simple_group_get_order, | ||
73 | ec_GFp_simple_group_get_cofactor, | ||
81 | ec_GFp_simple_point_init, | 74 | ec_GFp_simple_point_init, |
82 | ec_GFp_simple_point_finish, | 75 | ec_GFp_simple_point_finish, |
83 | ec_GFp_simple_point_clear_finish, | 76 | ec_GFp_simple_point_clear_finish, |
@@ -85,9 +78,9 @@ const EC_METHOD *EC_GFp_mont_method(void) | |||
85 | ec_GFp_simple_point_set_to_infinity, | 78 | ec_GFp_simple_point_set_to_infinity, |
86 | ec_GFp_simple_set_Jprojective_coordinates_GFp, | 79 | ec_GFp_simple_set_Jprojective_coordinates_GFp, |
87 | ec_GFp_simple_get_Jprojective_coordinates_GFp, | 80 | ec_GFp_simple_get_Jprojective_coordinates_GFp, |
88 | ec_GFp_simple_point_set_affine_coordinates, | 81 | ec_GFp_simple_point_set_affine_coordinates_GFp, |
89 | ec_GFp_simple_point_get_affine_coordinates, | 82 | ec_GFp_simple_point_get_affine_coordinates_GFp, |
90 | ec_GFp_simple_set_compressed_coordinates, | 83 | ec_GFp_simple_set_compressed_coordinates_GFp, |
91 | ec_GFp_simple_point2oct, | 84 | ec_GFp_simple_point2oct, |
92 | ec_GFp_simple_oct2point, | 85 | ec_GFp_simple_oct2point, |
93 | ec_GFp_simple_add, | 86 | ec_GFp_simple_add, |
@@ -98,12 +91,8 @@ const EC_METHOD *EC_GFp_mont_method(void) | |||
98 | ec_GFp_simple_cmp, | 91 | ec_GFp_simple_cmp, |
99 | ec_GFp_simple_make_affine, | 92 | ec_GFp_simple_make_affine, |
100 | ec_GFp_simple_points_make_affine, | 93 | ec_GFp_simple_points_make_affine, |
101 | 0 /* mul */, | ||
102 | 0 /* precompute_mult */, | ||
103 | 0 /* have_precompute_mult */, | ||
104 | ec_GFp_mont_field_mul, | 94 | ec_GFp_mont_field_mul, |
105 | ec_GFp_mont_field_sqr, | 95 | ec_GFp_mont_field_sqr, |
106 | 0 /* field_div */, | ||
107 | ec_GFp_mont_field_encode, | 96 | ec_GFp_mont_field_encode, |
108 | ec_GFp_mont_field_decode, | 97 | ec_GFp_mont_field_decode, |
109 | ec_GFp_mont_field_set_to_one }; | 98 | ec_GFp_mont_field_set_to_one }; |
@@ -123,6 +112,66 @@ int ec_GFp_mont_group_init(EC_GROUP *group) | |||
123 | } | 112 | } |
124 | 113 | ||
125 | 114 | ||
115 | int ec_GFp_mont_group_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) | ||
116 | { | ||
117 | BN_CTX *new_ctx = NULL; | ||
118 | BN_MONT_CTX *mont = NULL; | ||
119 | BIGNUM *one = NULL; | ||
120 | int ret = 0; | ||
121 | |||
122 | if (group->field_data1 != NULL) | ||
123 | { | ||
124 | BN_MONT_CTX_free(group->field_data1); | ||
125 | group->field_data1 = NULL; | ||
126 | } | ||
127 | if (group->field_data2 != NULL) | ||
128 | { | ||
129 | BN_free(group->field_data2); | ||
130 | group->field_data2 = NULL; | ||
131 | } | ||
132 | |||
133 | if (ctx == NULL) | ||
134 | { | ||
135 | ctx = new_ctx = BN_CTX_new(); | ||
136 | if (ctx == NULL) | ||
137 | return 0; | ||
138 | } | ||
139 | |||
140 | mont = BN_MONT_CTX_new(); | ||
141 | if (mont == NULL) goto err; | ||
142 | if (!BN_MONT_CTX_set(mont, p, ctx)) | ||
143 | { | ||
144 | ECerr(EC_F_GFP_MONT_GROUP_SET_CURVE_GFP, ERR_R_BN_LIB); | ||
145 | goto err; | ||
146 | } | ||
147 | one = BN_new(); | ||
148 | if (one == NULL) goto err; | ||
149 | if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)) goto err; | ||
150 | |||
151 | group->field_data1 = mont; | ||
152 | mont = NULL; | ||
153 | group->field_data2 = one; | ||
154 | one = NULL; | ||
155 | |||
156 | ret = ec_GFp_simple_group_set_curve_GFp(group, p, a, b, ctx); | ||
157 | |||
158 | if (!ret) | ||
159 | { | ||
160 | BN_MONT_CTX_free(group->field_data1); | ||
161 | group->field_data1 = NULL; | ||
162 | BN_free(group->field_data2); | ||
163 | group->field_data2 = NULL; | ||
164 | } | ||
165 | |||
166 | err: | ||
167 | if (new_ctx != NULL) | ||
168 | BN_CTX_free(new_ctx); | ||
169 | if (mont != NULL) | ||
170 | BN_MONT_CTX_free(mont); | ||
171 | return ret; | ||
172 | } | ||
173 | |||
174 | |||
126 | void ec_GFp_mont_group_finish(EC_GROUP *group) | 175 | void ec_GFp_mont_group_finish(EC_GROUP *group) |
127 | { | 176 | { |
128 | if (group->field_data1 != NULL) | 177 | if (group->field_data1 != NULL) |
@@ -194,66 +243,6 @@ int ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src) | |||
194 | } | 243 | } |
195 | 244 | ||
196 | 245 | ||
197 | int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) | ||
198 | { | ||
199 | BN_CTX *new_ctx = NULL; | ||
200 | BN_MONT_CTX *mont = NULL; | ||
201 | BIGNUM *one = NULL; | ||
202 | int ret = 0; | ||
203 | |||
204 | if (group->field_data1 != NULL) | ||
205 | { | ||
206 | BN_MONT_CTX_free(group->field_data1); | ||
207 | group->field_data1 = NULL; | ||
208 | } | ||
209 | if (group->field_data2 != NULL) | ||
210 | { | ||
211 | BN_free(group->field_data2); | ||
212 | group->field_data2 = NULL; | ||
213 | } | ||
214 | |||
215 | if (ctx == NULL) | ||
216 | { | ||
217 | ctx = new_ctx = BN_CTX_new(); | ||
218 | if (ctx == NULL) | ||
219 | return 0; | ||
220 | } | ||
221 | |||
222 | mont = BN_MONT_CTX_new(); | ||
223 | if (mont == NULL) goto err; | ||
224 | if (!BN_MONT_CTX_set(mont, p, ctx)) | ||
225 | { | ||
226 | ECerr(EC_F_EC_GFP_MONT_GROUP_SET_CURVE, ERR_R_BN_LIB); | ||
227 | goto err; | ||
228 | } | ||
229 | one = BN_new(); | ||
230 | if (one == NULL) goto err; | ||
231 | if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)) goto err; | ||
232 | |||
233 | group->field_data1 = mont; | ||
234 | mont = NULL; | ||
235 | group->field_data2 = one; | ||
236 | one = NULL; | ||
237 | |||
238 | ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx); | ||
239 | |||
240 | if (!ret) | ||
241 | { | ||
242 | BN_MONT_CTX_free(group->field_data1); | ||
243 | group->field_data1 = NULL; | ||
244 | BN_free(group->field_data2); | ||
245 | group->field_data2 = NULL; | ||
246 | } | ||
247 | |||
248 | err: | ||
249 | if (new_ctx != NULL) | ||
250 | BN_CTX_free(new_ctx); | ||
251 | if (mont != NULL) | ||
252 | BN_MONT_CTX_free(mont); | ||
253 | return ret; | ||
254 | } | ||
255 | |||
256 | |||
257 | int ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) | 246 | int ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) |
258 | { | 247 | { |
259 | if (group->field_data1 == NULL) | 248 | if (group->field_data1 == NULL) |
@@ -306,7 +295,7 @@ int ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx) | |||
306 | { | 295 | { |
307 | if (group->field_data2 == NULL) | 296 | if (group->field_data2 == NULL) |
308 | { | 297 | { |
309 | ECerr(EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE, EC_R_NOT_INITIALIZED); | 298 | ECerr(EC_F_EC_GFP_MONT_FIELD_DECODE, EC_R_NOT_INITIALIZED); |
310 | return 0; | 299 | return 0; |
311 | } | 300 | } |
312 | 301 | ||