Fix bug in DSA, EC methods.
[openssl.git] / crypto / ec / ecp_mont.c
index 5db65ae41979ef0bc2329b922fedb1c37b82c57c..9fc4a466a59f23cf59cae9f478d4f4c14fa50ed6 100644 (file)
@@ -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.
  *
  * Hudson (tjh@cryptsoft.com).
  *
  */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * Portions of this software developed by SUN MICROSYSTEMS, INC.,
+ * and contributed to the OpenSSL project.
+ */
+
+#include <openssl/err.h>
 
 #include "ec_lcl.h"
 
 const EC_METHOD *EC_GFp_mont_method(void)
        {
        static const EC_METHOD ret = {
+               NID_X9_62_prime_field,
                ec_GFp_mont_group_init,
-               ec_GFp_mont_group_set_curve_GFp,
                ec_GFp_mont_group_finish,
                ec_GFp_mont_group_clear_finish,
                ec_GFp_mont_group_copy,
-               ec_GFp_simple_group_set_generator,
-               /* TODO: 'set' and 'get' functions for EC_GROUPs */
+               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,
                ec_GFp_simple_point_finish,
                ec_GFp_simple_point_clear_finish,
@@ -73,9 +85,9 @@ 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,
@@ -85,10 +97,16 @@ const EC_METHOD *EC_GFp_mont_method(void)
                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 */,
                ec_GFp_mont_field_encode,
-               ec_GFp_mont_field_decode };
+               ec_GFp_mont_field_decode,
+               ec_GFp_mont_field_set_to_one };
 
        return &ret;
        }
@@ -99,38 +117,199 @@ int ec_GFp_mont_group_init(EC_GROUP *group)
        int ok;
 
        ok = ec_GFp_simple_group_init(group);
-       group->field_data = NULL;
+       group->field_data1 = NULL;
+       group->field_data2 = NULL;
        return ok;
        }
 
 
-int ec_GFp_mont_group_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-/* TODO */
+void ec_GFp_mont_group_finish(EC_GROUP *group)
+       {
+       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;
+               }
+       ec_GFp_simple_group_finish(group);
+       }
+
+
+void ec_GFp_mont_group_clear_finish(EC_GROUP *group)
+       {
+       if (group->field_data1 != NULL)
+               {
+               BN_MONT_CTX_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_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src)
+       {
+       if (dest->field_data1 != NULL)
+               {
+               BN_MONT_CTX_free(dest->field_data1);
+               dest->field_data1 = NULL;
+               }
+       if (dest->field_data2 != NULL)
+               {
+               BN_clear_free(dest->field_data2);
+               dest->field_data2 = NULL;
+               }
+
+       if (!ec_GFp_simple_group_copy(dest, src)) return 0;
+
+       if (src->field_data1 != NULL)
+               {
+               dest->field_data1 = BN_MONT_CTX_new();
+               if (dest->field_data1 == NULL) return 0;
+               if (!BN_MONT_CTX_copy(dest->field_data1, src->field_data1)) goto err;
+               }
+       if (src->field_data2 != NULL)
+               {
+               dest->field_data2 = BN_dup(src->field_data2);
+               if (dest->field_data2 == NULL) goto err;
+               }
 
+       return 1;
 
-void ec_GFp_mont_group_finish(EC_GROUP *group);
-/* TODO */
+ err:
+       if (dest->field_data1 != NULL)
+               {
+               BN_MONT_CTX_free(dest->field_data1);
+               dest->field_data1 = NULL;
+               }
+       return 0;       
+       }
 
 
-void ec_GFp_mont_group_clear_finish(EC_GROUP *group);
-/* TODO */
+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;
+               }
 
-int ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src);
-/* TODO */
+       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;
 
-int ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-/* TODO */
+       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;
+               }
 
-int ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/* TODO */
+ 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_encode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/* TODO */
+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)
+               {
+               ECerr(EC_F_EC_GFP_MONT_FIELD_MUL, EC_R_NOT_INITIALIZED);
+               return 0;
+               }
 
+       return BN_mod_mul_montgomery(r, a, b, group->field_data1, ctx);
+       }
 
-int ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/* TODO */
+
+int ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
+       {
+       if (group->field_data1 == NULL)
+               {
+               ECerr(EC_F_EC_GFP_MONT_FIELD_SQR, EC_R_NOT_INITIALIZED);
+               return 0;
+               }
+
+       return BN_mod_mul_montgomery(r, a, a, group->field_data1, ctx);
+       }
+
+
+int ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
+       {
+       if (group->field_data1 == NULL)
+               {
+               ECerr(EC_F_EC_GFP_MONT_FIELD_ENCODE, EC_R_NOT_INITIALIZED);
+               return 0;
+               }
+
+       return BN_to_montgomery(r, a, (BN_MONT_CTX *)group->field_data1, ctx);
+       }
+
+
+int ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
+       {
+       if (group->field_data1 == NULL)
+               {
+               ECerr(EC_F_EC_GFP_MONT_FIELD_DECODE, EC_R_NOT_INITIALIZED);
+               return 0;
+               }
+
+       return BN_from_montgomery(r, a, group->field_data1, ctx);
+       }
+
+
+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_SET_TO_ONE, EC_R_NOT_INITIALIZED);
+               return 0;
+               }
+
+       if (!BN_copy(r, group->field_data2)) return 0;
+       return 1;
+       }