diff options
author | Bodo Möller <bodo@openssl.org> | 2001-03-15 18:17:40 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2001-03-15 18:17:40 +0000 |
commit | 4f69172d25f1aab5dce50f97cd5ab61a6d74d771 (patch) | |
tree | 65db34645d1d88ac91cdc29e3c9a751a655dc302 /crypto/ec | |
parent | eb272ac0b07423a33f78e960dbe2c8abff06fdc6 (diff) |
Completely remove mont2 stuff.
It does not appear to be faster than the current Montgomery code
except for very small moduli (somewhere between 192 and 224 bits
in a 64-bit Sun environment, and even less than 192 bits
on 32 bit systems).
Diffstat (limited to 'crypto/ec')
-rw-r--r-- | crypto/ec/ec.h | 5 | ||||
-rw-r--r-- | crypto/ec/ec_err.c | 5 | ||||
-rw-r--r-- | crypto/ec/ecp_mont2.c | 283 |
3 files changed, 0 insertions, 293 deletions
diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h index 2182d08f7f..7f7f7078ef 100644 --- a/crypto/ec/ec.h +++ b/crypto/ec/ec.h @@ -175,10 +175,6 @@ void ERR_load_EC_strings(void); /* Error codes for the EC functions. */ /* Function codes. */ -#define EC_F_EC_GFP_MONT2_FIELD_DECODE 143 -#define EC_F_EC_GFP_MONT2_FIELD_ENCODE 144 -#define EC_F_EC_GFP_MONT2_FIELD_MUL 145 -#define EC_F_EC_GFP_MONT2_FIELD_SQR 146 #define EC_F_EC_GFP_MONT_FIELD_DECODE 133 #define EC_F_EC_GFP_MONT_FIELD_ENCODE 134 #define EC_F_EC_GFP_MONT_FIELD_MUL 131 @@ -221,7 +217,6 @@ void ERR_load_EC_strings(void); #define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP 125 #define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP 126 #define EC_F_EC_POINT_SET_TO_INFINITY 127 -#define EC_F_GFP_MONT2_GROUP_SET_CURVE_GFP 147 #define EC_F_GFP_MONT_GROUP_SET_CURVE_GFP 135 /* Reason codes. */ diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c index 87d0d95c19..49aff3139d 100644 --- a/crypto/ec/ec_err.c +++ b/crypto/ec/ec_err.c @@ -66,10 +66,6 @@ #ifndef OPENSSL_NO_ERR static ERR_STRING_DATA EC_str_functs[]= { -{ERR_PACK(0,EC_F_EC_GFP_MONT2_FIELD_DECODE,0), "EC_GFP_MONT2_FIELD_DECODE"}, -{ERR_PACK(0,EC_F_EC_GFP_MONT2_FIELD_ENCODE,0), "EC_GFP_MONT2_FIELD_ENCODE"}, -{ERR_PACK(0,EC_F_EC_GFP_MONT2_FIELD_MUL,0), "EC_GFP_MONT2_FIELD_MUL"}, -{ERR_PACK(0,EC_F_EC_GFP_MONT2_FIELD_SQR,0), "EC_GFP_MONT2_FIELD_SQR"}, {ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_DECODE,0), "ec_GFp_mont_field_decode"}, {ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_ENCODE,0), "ec_GFp_mont_field_encode"}, {ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_MUL,0), "ec_GFp_mont_field_mul"}, @@ -112,7 +108,6 @@ static ERR_STRING_DATA EC_str_functs[]= {ERR_PACK(0,EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP,0), "EC_POINT_set_compressed_coordinates_GFp"}, {ERR_PACK(0,EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP,0), "EC_POINT_set_Jprojective_coordinates_GFp"}, {ERR_PACK(0,EC_F_EC_POINT_SET_TO_INFINITY,0), "EC_POINT_set_to_infinity"}, -{ERR_PACK(0,EC_F_GFP_MONT2_GROUP_SET_CURVE_GFP,0), "GFP_MONT2_GROUP_SET_CURVE_GFP"}, {ERR_PACK(0,EC_F_GFP_MONT_GROUP_SET_CURVE_GFP,0), "GFP_MONT_GROUP_SET_CURVE_GFP"}, {0,NULL} }; diff --git a/crypto/ec/ecp_mont2.c b/crypto/ec/ecp_mont2.c deleted file mode 100644 index 75727287e0..0000000000 --- a/crypto/ec/ecp_mont2.c +++ /dev/null @@ -1,283 +0,0 @@ -/* unused */ -/* crypto/ec/ecp_mont2.c */ -/* ==================================================================== - * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#define NDEBUG - -#include <openssl/err.h> - -#include "ec_lcl.h" - -#include "../bn/bn_mont2.c" - -int ec_GFp_mont2_group_init(EC_GROUP *); -int ec_GFp_mont2_group_set_curve_GFp(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *); -void ec_GFp_mont2_group_finish(EC_GROUP *); -void ec_GFp_mont2_group_clear_finish(EC_GROUP *); -/* int ec_GFp_mont2_group_copy(EC_GROUP *, const EC_GROUP *); */ -int ec_GFp_mont2_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *); -int ec_GFp_mont2_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); -int ec_GFp_mont2_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); -int ec_GFp_mont2_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); -int ec_GFp_mont2_field_set_to_one(const EC_GROUP *, BIGNUM *r, BN_CTX *); - -const EC_METHOD *EC_GFp_mont2_method(void) - { - static const EC_METHOD ret = { - ec_GFp_mont2_group_init, - ec_GFp_mont2_group_finish, - ec_GFp_mont2_group_clear_finish, - 0 /* ec_GFp_mont2_group_copy */, - ec_GFp_mont2_group_set_curve_GFp, - ec_GFp_simple_group_get_curve_GFp, - ec_GFp_simple_group_set_generator, - ec_GFp_simple_group_get0_generator, - ec_GFp_simple_group_get_order, - ec_GFp_simple_group_get_cofactor, - ec_GFp_simple_point_init, - ec_GFp_simple_point_finish, - ec_GFp_simple_point_clear_finish, - ec_GFp_simple_point_copy, - ec_GFp_simple_point_set_to_infinity, - ec_GFp_simple_set_Jprojective_coordinates_GFp, - ec_GFp_simple_get_Jprojective_coordinates_GFp, - ec_GFp_simple_point_set_affine_coordinates_GFp, - ec_GFp_simple_point_get_affine_coordinates_GFp, - ec_GFp_simple_set_compressed_coordinates_GFp, - ec_GFp_simple_point2oct, - ec_GFp_simple_oct2point, - ec_GFp_simple_add, - ec_GFp_simple_dbl, - ec_GFp_simple_invert, - ec_GFp_simple_is_at_infinity, - ec_GFp_simple_is_on_curve, - ec_GFp_simple_cmp, - ec_GFp_simple_make_affine, - ec_GFp_simple_points_make_affine, - ec_GFp_mont2_field_mul, - ec_GFp_mont2_field_sqr, - ec_GFp_mont2_field_encode, - ec_GFp_mont2_field_decode, - ec_GFp_mont2_field_set_to_one }; - - return &ret; - } - - -int ec_GFp_mont2_group_init(EC_GROUP *group) - { - int ok; - - ok = ec_GFp_simple_group_init(group); - group->field_data1 = NULL; - group->field_data2 = NULL; - return ok; - } - - -int ec_GFp_mont2_group_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) - { - BN_CTX *new_ctx = NULL; - BN_MONTGOMERY *mont = NULL; - BIGNUM *one = NULL; - int ret = 0; - - if (group->field_data1 != NULL) - { - BN_mont_clear_free(group->field_data1); - group->field_data1 = NULL; - } - if (group->field_data2 != NULL) - { - BN_free(group->field_data2); - group->field_data2 = NULL; - } - - if (ctx == NULL) - { - ctx = new_ctx = BN_CTX_new(); - if (ctx == NULL) - return 0; - } - - mont = BN_mont_new(); - if (mont == NULL) goto err; - if (!BN_mont_set(p, mont, ctx)) - { - ECerr(EC_F_GFP_MONT2_GROUP_SET_CURVE_GFP, ERR_R_BN_LIB); - goto err; - } - one = BN_new(); - if (one == NULL) goto err; - if (!BN_one(one)) goto err; - if (!BN_to_mont(one, mont, ctx)) goto err; - - group->field_data1 = mont; - mont = NULL; - group->field_data2 = one; - one = NULL; - - ret = ec_GFp_simple_group_set_curve_GFp(group, p, a, b, ctx); - - if (!ret) - { - BN_mont_clear_free(group->field_data1); - group->field_data1 = NULL; - BN_free(group->field_data2); - group->field_data2 = NULL; - } - - err: - if (new_ctx != NULL) - BN_CTX_free(new_ctx); - if (mont != NULL) - BN_mont_clear_free(mont); - return ret; - } - - -void ec_GFp_mont2_group_finish(EC_GROUP *group) - { - if (group->field_data1 != NULL) - { - BN_mont_clear_free(group->field_data1); - group->field_data1 = NULL; - } - if (group->field_data2 != NULL) - { - BN_free(group->field_data2); - group->field_data2 = NULL; - } - ec_GFp_simple_group_finish(group); - } - - -void ec_GFp_mont2_group_clear_finish(EC_GROUP *group) - { - if (group->field_data1 != NULL) - { - BN_mont_clear_free(group->field_data1); - group->field_data1 = NULL; - } - if (group->field_data2 != NULL) - { - BN_clear_free(group->field_data2); - group->field_data2 = NULL; - } - ec_GFp_simple_group_clear_finish(group); - } - - -int ec_GFp_mont2_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) - { - if (group->field_data1 == NULL) - { - ECerr(EC_F_EC_GFP_MONT2_FIELD_MUL, EC_R_NOT_INITIALIZED); - return 0; - } - - return BN_mont_mod_mul(r, a, b, group->field_data1, ctx); - } - - -int ec_GFp_mont2_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) - { - if (group->field_data1 == NULL) - { - ECerr(EC_F_EC_GFP_MONT2_FIELD_SQR, EC_R_NOT_INITIALIZED); - return 0; - } - - return BN_mont_mod_mul(r, a, a, group->field_data1, ctx); - } - - -int ec_GFp_mont2_field_encode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) - { - if (group->field_data1 == NULL) - { - ECerr(EC_F_EC_GFP_MONT2_FIELD_ENCODE, EC_R_NOT_INITIALIZED); - return 0; - } - - if (!BN_copy(r, a)) return 0; - return BN_to_mont(r, (BN_MONTGOMERY *)group->field_data1, ctx); - } - - -int ec_GFp_mont2_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) - { - if (group->field_data1 == NULL) - { - ECerr(EC_F_EC_GFP_MONT2_FIELD_DECODE, EC_R_NOT_INITIALIZED); - return 0; - } - - if (!BN_copy(r, a)) return 0; - return BN_mont_red(r, (BN_MONTGOMERY *)group->field_data1); - } - - -int ec_GFp_mont2_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx) - { - if (group->field_data2 == NULL) - { - ECerr(EC_F_EC_GFP_MONT2_FIELD_DECODE, EC_R_NOT_INITIALIZED); - return 0; - } - - if (!BN_copy(r, group->field_data2)) return 0; - return 1; - } |