resolve conflicts

1 files changed, 141 insertions, 39 deletions

diff --git a/src/lib/libcrypto/ec/ecp_nist.c b/src/lib/libcrypto/ec/ecp_nist.c
index ed07748675..71893d5eab 100644
--- a/src/lib/libcrypto/ec/ecp_nist.c
+++ b/src/lib/libcrypto/ec/ecp_nist.c
@@ -1,6 +1,9 @@
 /* crypto/ec/ecp_nist.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project.
+ */
 /* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2003 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
@@ -52,23 +55,30 @@
  * 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 <limits.h>
+
+#include <openssl/err.h>
+#include <openssl/obj_mac.h>
 #include "ec_lcl.h"
 
-#if 0
 const EC_METHOD *EC_GFp_nist_method(void)
         {
         static const EC_METHOD ret = {
-                ec_GFp_nist_group_init,
-                ec_GFp_nist_group_finish,
-                ec_GFp_nist_group_clear_finish,
+                NID_X9_62_prime_field,
+                ec_GFp_simple_group_init,
+                ec_GFp_simple_group_finish,
+                ec_GFp_simple_group_clear_finish,
                 ec_GFp_nist_group_copy,
-                ec_GFp_nist_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_nist_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,
@@ -76,9 +86,9 @@ const EC_METHOD *EC_GFp_nist_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,
@@ -89,46 +99,138 @@ const EC_METHOD *EC_GFp_nist_method(void)
                 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_nist_field_mul,
                 ec_GFp_nist_field_sqr,
+                0 /* field_div */,
                 0 /* field_encode */,
                 0 /* field_decode */,
                 0 /* field_set_to_one */ };
 
         return &ret;
         }
-#endif
 
+#if BN_BITS2 == 64
+#define NO_32_BIT_TYPE
+#endif
 
-int ec_GFp_nist_group_init(EC_GROUP *group)
+int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
         {
-        int ok;
+        dest->field_mod_func = src->field_mod_func;
 
-        ok = ec_GFp_simple_group_init(group);
-        group->field_data1 = NULL;
-        return ok;
+        return ec_GFp_simple_group_copy(dest, src);
         }
 
-
-int ec_GFp_nist_group_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-/* TODO */
-
-
-void ec_GFp_nist_group_finish(EC_GROUP *group);
-/* TODO */
-
-
-void ec_GFp_nist_group_clear_finish(EC_GROUP *group);
-/* TODO */
-
-
-int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src);
-/* TODO */
+int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
+        const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+        {
+        int ret = 0;
+        BN_CTX *new_ctx = NULL;
+        BIGNUM *tmp_bn;
+        
+        if (ctx == NULL)
+                if ((ctx = new_ctx = BN_CTX_new()) == NULL) return 0;
+
+        BN_CTX_start(ctx);
+        if ((tmp_bn = BN_CTX_get(ctx)) == NULL) goto err;
+
+        if (BN_ucmp(BN_get0_nist_prime_192(), p) == 0)
+                group->field_mod_func = BN_nist_mod_192;
+        else if (BN_ucmp(BN_get0_nist_prime_224(), p) == 0)
+                {
+#ifndef NO_32_BIT_TYPE
+                group->field_mod_func = BN_nist_mod_224;
+#else
+                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
+                goto err;
+#endif
+                }
+        else if (BN_ucmp(BN_get0_nist_prime_256(), p) == 0)
+                {
+#ifndef NO_32_BIT_TYPE
+                group->field_mod_func = BN_nist_mod_256;
+#else
+                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
+                goto err;
+#endif
+                }
+        else if (BN_ucmp(BN_get0_nist_prime_384(), p) == 0)
+                {
+#ifndef NO_32_BIT_TYPE
+                group->field_mod_func = BN_nist_mod_384;
+#else
+                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
+                goto err;
+#endif
+                }
+        else if (BN_ucmp(BN_get0_nist_prime_521(), p) == 0)
+                /* this one works in the NO_32_BIT_TYPE case */
+                group->field_mod_func = BN_nist_mod_521;
+        else
+                {
+                ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_NIST_PRIME);
+                goto err;
+                }
+
+        ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
+
+ err:
+        BN_CTX_end(ctx);
+        if (new_ctx != NULL)
+                BN_CTX_free(new_ctx);
+        return ret;
+        }
 
 
-int ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-/* TODO */
+int ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
+        const BIGNUM *b, BN_CTX *ctx)
+        {
+        int     ret=0;
+        BN_CTX  *ctx_new=NULL;
+
+        if (!group || !r || !a || !b)
+                {
+                ECerr(EC_F_EC_GFP_NIST_FIELD_MUL, ERR_R_PASSED_NULL_PARAMETER);
+                goto err;
+                }
+        if (!ctx)
+                if ((ctx_new = ctx = BN_CTX_new()) == NULL) goto err;
+
+        if (!BN_mul(r, a, b, ctx)) goto err;
+        if (!group->field_mod_func(r, r, &group->field, ctx))
+                goto err;
+
+        ret=1;
+err:
+        if (ctx_new)
+                BN_CTX_free(ctx_new);
+        return ret;
+        }
 
 
-int ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/* TODO */
+int ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
+        BN_CTX *ctx)
+        {
+        int     ret=0;
+        BN_CTX  *ctx_new=NULL;
+
+        if (!group || !r || !a)
+                {
+                ECerr(EC_F_EC_GFP_NIST_FIELD_SQR, EC_R_PASSED_NULL_PARAMETER);
+                goto err;
+                }
+        if (!ctx)
+                if ((ctx_new = ctx = BN_CTX_new()) == NULL) goto err;
+
+        if (!BN_sqr(r, a, ctx)) goto err;
+        if (!group->field_mod_func(r, r, &group->field, ctx))
+                goto err;
+
+        ret=1;
+err:
+        if (ctx_new)
+                BN_CTX_free(ctx_new);
+        return ret;
+        }