Initial support for pluggable public key ASN1 support. Process most public

[openssl.git] / crypto / ec / ecp_mont.c

diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index 21592d007af17e42fd51e2ceaf31ee9a0a11bcdb..9fc4a466a59f23cf59cae9f478d4f4c14fa50ed6 100644 (file)
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c
@@ -1,4 +1,7 @@
 /* crypto/ec/ecp_mont.c */
+/*
+ * Originally written by Bodo Moeller for the OpenSSL project.
+ */
 /* ====================================================================
  * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
  *
@@ -71,8 +74,8 @@ const EC_METHOD *EC_GFp_mont_method(void)
                ec_GFp_mont_group_finish,
                ec_GFp_mont_group_clear_finish,
                ec_GFp_mont_group_copy,
-               ec_GFp_mont_group_set_curve_GFp,
-               ec_GFp_simple_group_get_curve_GFp,
+               ec_GFp_mont_group_set_curve,
+               ec_GFp_simple_group_get_curve,
                ec_GFp_simple_group_get_degree,
                ec_GFp_simple_group_check_discriminant,
                ec_GFp_simple_point_init,
@@ -82,21 +85,22 @@ const EC_METHOD *EC_GFp_mont_method(void)
                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_point_set_affine_coordinates,
+               ec_GFp_simple_point_get_affine_coordinates,
+               ec_GFp_simple_set_compressed_coordinates,
                ec_GFp_simple_point2oct,
                ec_GFp_simple_oct2point,
                ec_GFp_simple_add,
                ec_GFp_simple_dbl,
                ec_GFp_simple_invert,
-               0 /* mul */,
-               0 /* precompute_mult */,
                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,
+               0 /* mul */,
+               0 /* precompute_mult */,
+               0 /* have_precompute_mult */,   
                ec_GFp_mont_field_mul,
                ec_GFp_mont_field_sqr,
                0 /* field_div */,
@@ -119,66 +123,6 @@ int ec_GFp_mont_group_init(EC_GROUP *group)
        }
 
 
-int ec_GFp_mont_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_MONT_CTX *mont = NULL;
-       BIGNUM *one = NULL;
-       int ret = 0;
-
-       if (group->field_data1 != NULL)
-               {
-               BN_MONT_CTX_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_CTX_new();
-       if (mont == NULL) goto err;
-       if (!BN_MONT_CTX_set(mont, p, ctx))
-               {
-               ECerr(EC_F_GFP_MONT_GROUP_SET_CURVE_GFP, ERR_R_BN_LIB);
-               goto err;
-               }
-       one = BN_new();
-       if (one == NULL) goto err;
-       if (!BN_to_montgomery(one, BN_value_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_CTX_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_CTX_free(mont);
-       return ret;
-       }
-
-
 void ec_GFp_mont_group_finish(EC_GROUP *group)
        {
        if (group->field_data1 != NULL)
@@ -250,6 +194,66 @@ int ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src)
        }
 
 
+int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+       {
+       BN_CTX *new_ctx = NULL;
+       BN_MONT_CTX *mont = NULL;
+       BIGNUM *one = NULL;
+       int ret = 0;
+
+       if (group->field_data1 != NULL)
+               {
+               BN_MONT_CTX_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_CTX_new();
+       if (mont == NULL) goto err;
+       if (!BN_MONT_CTX_set(mont, p, ctx))
+               {
+               ECerr(EC_F_EC_GFP_MONT_GROUP_SET_CURVE, ERR_R_BN_LIB);
+               goto err;
+               }
+       one = BN_new();
+       if (one == NULL) goto err;
+       if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)) goto err;
+
+       group->field_data1 = mont;
+       mont = NULL;
+       group->field_data2 = one;
+       one = NULL;
+
+       ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
+
+       if (!ret)
+               {
+               BN_MONT_CTX_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_CTX_free(mont);
+       return ret;
+       }
+
+
 int ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
        {
        if (group->field_data1 == NULL)
@@ -302,7 +306,7 @@ int ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r, BN_CTX *ctx)
        {
        if (group->field_data2 == NULL)
                {
-               ECerr(EC_F_EC_GFP_MONT_FIELD_DECODE, EC_R_NOT_INITIALIZED);
+               ECerr(EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE, EC_R_NOT_INITIALIZED);
                return 0;
                }