* Written by Nils Larsch for the OpenSSL project.
*/
/* ====================================================================
- * Copyright (c) 1998-2002 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
* and contributed to the OpenSSL project.
*/
+#include <limits.h>
+
#include <openssl/err.h>
#include <openssl/obj_mac.h>
#include "ec_lcl.h"
{
static const EC_METHOD ret = {
NID_X9_62_prime_field,
- ec_GFp_nist_group_init,
- ec_GFp_nist_group_finish,
- ec_GFp_nist_group_clear_finish,
+ 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,
ec_GFp_simple_group_get_curve,
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_nist_field_mul,
ec_GFp_nist_field_sqr,
0 /* field_div */,
return &ret;
}
-#if BN_BITS2 == 64 && UINT_MAX != 4294967295UL && ULONG_MAX != 4294967295UL
+#if BN_BITS2 == 64
#define NO_32_BIT_TYPE
#endif
-int ec_GFp_nist_group_init(EC_GROUP *group)
- {
- int ok;
-
- ok = ec_GFp_simple_group_init(group);
- group->field_data1 = NULL;
- return ok;
- }
-
-void ec_GFp_nist_group_finish(EC_GROUP *group)
+int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
{
- BN_free(&group->field);
- BN_free(&group->a);
- BN_free(&group->b);
- }
+ dest->field_mod_func = src->field_mod_func;
-
-void ec_GFp_nist_group_clear_finish(EC_GROUP *group)
- {
- BN_clear_free(&group->field);
- BN_clear_free(&group->a);
- BN_clear_free(&group->b);
+ return ec_GFp_simple_group_copy(dest, src);
}
-
int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
{
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)
-#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)
+ {
+#ifndef NO_32_BIT_TYPE
group->field_mod_func = BN_nist_mod_224;
#else
- ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE_GFP, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
+ 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)
-#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)
+ {
+#ifndef NO_32_BIT_TYPE
group->field_mod_func = BN_nist_mod_256;
#else
- ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE_GFP, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
+ 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)
-#if !defined(NO_32_BIT_TYPE) || defined(OPENSSL_NO_ASM)
+ {
+#ifndef NO_32_BIT_TYPE
group->field_mod_func = BN_nist_mod_384;
#else
- ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE_GFP, EC_R_NOT_A_SUPPORTED_NIST_PRIME);
+ 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_GFP, EC_R_NOT_A_NIST_PRIME);
+ ECerr(EC_F_EC_GFP_NIST_GROUP_SET_CURVE, EC_R_NOT_A_NIST_PRIME);
goto err;
}
- /* group->field */
- if (!BN_copy(&group->field, p)) goto err;
- group->field.neg = 0;
-
- /* group->a */
- if (!group->field_mod_func(&group->a, a, p, ctx)) goto err;
-
- /* group->b */
- if (!group->field_mod_func(&group->b, b, p, ctx)) goto err;
-
- /* group->a_is_minus3 */
- if (!BN_add_word(tmp_bn, 3)) goto err;
- group->a_is_minus3 = (0 == BN_cmp(tmp_bn, &group->field));
-
- ret = 1;
+ ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
err:
BN_CTX_end(ctx);
return ret;
}
-int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
- {
- if (dest == NULL || src == NULL)
- return 0;
-
- if (!BN_copy(&dest->field, &src->field))
- return 0;
- if (!BN_copy(&dest->a, &src->a))
- return 0;
- if (!BN_copy(&dest->b, &src->b))
- return 0;
-
- dest->curve_name = src->curve_name;
-
- dest->a_is_minus3 = src->a_is_minus3;
-
- dest->field_data1 = src->field_data1;
-
- return 1;
- }
int ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
const BIGNUM *b, BN_CTX *ctx)
return ret;
}
+
int ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
BN_CTX *ctx)
{