Import OpenSSL 1.1.0f
This commit is contained in:
@@ -1,60 +1,12 @@
|
||||
/* crypto/ec/ec_lib.c */
|
||||
/*
|
||||
* Originally written by Bodo Moeller for the OpenSSL project.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* 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
|
||||
* 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).
|
||||
*
|
||||
* Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
* in the file LICENSE in the source distribution or at
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
/* ====================================================================
|
||||
* Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
|
||||
* Binary polynomial ECC support in OpenSSL originally developed by
|
||||
@@ -68,8 +20,6 @@
|
||||
|
||||
#include "ec_lcl.h"
|
||||
|
||||
const char EC_version[] = "EC" OPENSSL_VERSION_PTEXT;
|
||||
|
||||
/* functions for EC_GROUP objects */
|
||||
|
||||
EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
|
||||
@@ -85,34 +35,60 @@ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret = OPENSSL_malloc(sizeof *ret);
|
||||
ret = OPENSSL_zalloc(sizeof(*ret));
|
||||
if (ret == NULL) {
|
||||
ECerr(EC_F_EC_GROUP_NEW, ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret->meth = meth;
|
||||
|
||||
ret->extra_data = NULL;
|
||||
ret->mont_data = NULL;
|
||||
|
||||
ret->generator = NULL;
|
||||
BN_init(&ret->order);
|
||||
BN_init(&ret->cofactor);
|
||||
|
||||
ret->curve_name = 0;
|
||||
ret->asn1_flag = ~EC_GROUP_ASN1_FLAG_MASK;
|
||||
ret->asn1_form = POINT_CONVERSION_UNCOMPRESSED;
|
||||
|
||||
ret->seed = NULL;
|
||||
ret->seed_len = 0;
|
||||
|
||||
if (!meth->group_init(ret)) {
|
||||
OPENSSL_free(ret);
|
||||
return NULL;
|
||||
if ((ret->meth->flags & EC_FLAGS_CUSTOM_CURVE) == 0) {
|
||||
ret->order = BN_new();
|
||||
if (ret->order == NULL)
|
||||
goto err;
|
||||
ret->cofactor = BN_new();
|
||||
if (ret->cofactor == NULL)
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret->asn1_flag = OPENSSL_EC_NAMED_CURVE;
|
||||
ret->asn1_form = POINT_CONVERSION_UNCOMPRESSED;
|
||||
if (!meth->group_init(ret))
|
||||
goto err;
|
||||
return ret;
|
||||
|
||||
err:
|
||||
BN_free(ret->order);
|
||||
BN_free(ret->cofactor);
|
||||
OPENSSL_free(ret);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void EC_pre_comp_free(EC_GROUP *group)
|
||||
{
|
||||
switch (group->pre_comp_type) {
|
||||
default:
|
||||
break;
|
||||
#ifdef ECP_NISTZ256_REFERENCE_IMPLEMENTATION
|
||||
case PCT_nistz256:
|
||||
EC_nistz256_pre_comp_free(group->pre_comp.nistz256);
|
||||
break;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
|
||||
case PCT_nistp224:
|
||||
EC_nistp224_pre_comp_free(group->pre_comp.nistp224);
|
||||
break;
|
||||
case PCT_nistp256:
|
||||
EC_nistp256_pre_comp_free(group->pre_comp.nistp256);
|
||||
break;
|
||||
case PCT_nistp521:
|
||||
EC_nistp521_pre_comp_free(group->pre_comp.nistp521);
|
||||
break;
|
||||
#endif
|
||||
case PCT_ec:
|
||||
EC_ec_pre_comp_free(group->pre_comp.ec);
|
||||
break;
|
||||
}
|
||||
group->pre_comp.ec = NULL;
|
||||
}
|
||||
|
||||
void EC_GROUP_free(EC_GROUP *group)
|
||||
@@ -123,19 +99,12 @@ void EC_GROUP_free(EC_GROUP *group)
|
||||
if (group->meth->group_finish != 0)
|
||||
group->meth->group_finish(group);
|
||||
|
||||
EC_EX_DATA_free_all_data(&group->extra_data);
|
||||
|
||||
if (EC_GROUP_VERSION(group) && group->mont_data)
|
||||
BN_MONT_CTX_free(group->mont_data);
|
||||
|
||||
if (group->generator != NULL)
|
||||
EC_POINT_free(group->generator);
|
||||
BN_free(&group->order);
|
||||
BN_free(&group->cofactor);
|
||||
|
||||
if (group->seed)
|
||||
OPENSSL_free(group->seed);
|
||||
|
||||
EC_pre_comp_free(group);
|
||||
BN_MONT_CTX_free(group->mont_data);
|
||||
EC_POINT_free(group->generator);
|
||||
BN_free(group->order);
|
||||
BN_free(group->cofactor);
|
||||
OPENSSL_free(group->seed);
|
||||
OPENSSL_free(group);
|
||||
}
|
||||
|
||||
@@ -149,29 +118,17 @@ void EC_GROUP_clear_free(EC_GROUP *group)
|
||||
else if (group->meth->group_finish != 0)
|
||||
group->meth->group_finish(group);
|
||||
|
||||
EC_EX_DATA_clear_free_all_data(&group->extra_data);
|
||||
|
||||
if (EC_GROUP_VERSION(group) && group->mont_data)
|
||||
BN_MONT_CTX_free(group->mont_data);
|
||||
|
||||
if (group->generator != NULL)
|
||||
EC_POINT_clear_free(group->generator);
|
||||
BN_clear_free(&group->order);
|
||||
BN_clear_free(&group->cofactor);
|
||||
|
||||
if (group->seed) {
|
||||
OPENSSL_cleanse(group->seed, group->seed_len);
|
||||
OPENSSL_free(group->seed);
|
||||
}
|
||||
|
||||
OPENSSL_cleanse(group, sizeof *group);
|
||||
OPENSSL_free(group);
|
||||
EC_pre_comp_free(group);
|
||||
BN_MONT_CTX_free(group->mont_data);
|
||||
EC_POINT_clear_free(group->generator);
|
||||
BN_clear_free(group->order);
|
||||
BN_clear_free(group->cofactor);
|
||||
OPENSSL_clear_free(group->seed, group->seed_len);
|
||||
OPENSSL_clear_free(group, sizeof(*group));
|
||||
}
|
||||
|
||||
int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
|
||||
{
|
||||
EC_EXTRA_DATA *d;
|
||||
|
||||
if (dest->meth->group_copy == 0) {
|
||||
ECerr(EC_F_EC_GROUP_COPY, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
|
||||
return 0;
|
||||
@@ -183,20 +140,34 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
|
||||
if (dest == src)
|
||||
return 1;
|
||||
|
||||
EC_EX_DATA_free_all_data(&dest->extra_data);
|
||||
|
||||
for (d = src->extra_data; d != NULL; d = d->next) {
|
||||
void *t = d->dup_func(d->data);
|
||||
|
||||
if (t == NULL)
|
||||
return 0;
|
||||
if (!EC_EX_DATA_set_data
|
||||
(&dest->extra_data, t, d->dup_func, d->free_func,
|
||||
d->clear_free_func))
|
||||
return 0;
|
||||
/* Copy precomputed */
|
||||
dest->pre_comp_type = src->pre_comp_type;
|
||||
switch (src->pre_comp_type) {
|
||||
default:
|
||||
dest->pre_comp.ec = NULL;
|
||||
break;
|
||||
#ifdef ECP_NISTZ256_REFERENCE_IMPLEMENTATION
|
||||
case PCT_nistz256:
|
||||
dest->pre_comp.nistz256 = EC_nistz256_pre_comp_dup(src->pre_comp.nistz256);
|
||||
break;
|
||||
#endif
|
||||
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
|
||||
case PCT_nistp224:
|
||||
dest->pre_comp.nistp224 = EC_nistp224_pre_comp_dup(src->pre_comp.nistp224);
|
||||
break;
|
||||
case PCT_nistp256:
|
||||
dest->pre_comp.nistp256 = EC_nistp256_pre_comp_dup(src->pre_comp.nistp256);
|
||||
break;
|
||||
case PCT_nistp521:
|
||||
dest->pre_comp.nistp521 = EC_nistp521_pre_comp_dup(src->pre_comp.nistp521);
|
||||
break;
|
||||
#endif
|
||||
case PCT_ec:
|
||||
dest->pre_comp.ec = EC_ec_pre_comp_dup(src->pre_comp.ec);
|
||||
break;
|
||||
}
|
||||
|
||||
if (EC_GROUP_VERSION(src) && src->mont_data != NULL) {
|
||||
if (src->mont_data != NULL) {
|
||||
if (dest->mont_data == NULL) {
|
||||
dest->mont_data = BN_MONT_CTX_new();
|
||||
if (dest->mont_data == NULL)
|
||||
@@ -206,10 +177,8 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
|
||||
return 0;
|
||||
} else {
|
||||
/* src->generator == NULL */
|
||||
if (EC_GROUP_VERSION(dest) && dest->mont_data != NULL) {
|
||||
BN_MONT_CTX_free(dest->mont_data);
|
||||
dest->mont_data = NULL;
|
||||
}
|
||||
BN_MONT_CTX_free(dest->mont_data);
|
||||
dest->mont_data = NULL;
|
||||
}
|
||||
|
||||
if (src->generator != NULL) {
|
||||
@@ -222,24 +191,23 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
|
||||
return 0;
|
||||
} else {
|
||||
/* src->generator == NULL */
|
||||
if (dest->generator != NULL) {
|
||||
EC_POINT_clear_free(dest->generator);
|
||||
dest->generator = NULL;
|
||||
}
|
||||
EC_POINT_clear_free(dest->generator);
|
||||
dest->generator = NULL;
|
||||
}
|
||||
|
||||
if (!BN_copy(&dest->order, &src->order))
|
||||
return 0;
|
||||
if (!BN_copy(&dest->cofactor, &src->cofactor))
|
||||
return 0;
|
||||
if ((src->meth->flags & EC_FLAGS_CUSTOM_CURVE) == 0) {
|
||||
if (!BN_copy(dest->order, src->order))
|
||||
return 0;
|
||||
if (!BN_copy(dest->cofactor, src->cofactor))
|
||||
return 0;
|
||||
}
|
||||
|
||||
dest->curve_name = src->curve_name;
|
||||
dest->asn1_flag = src->asn1_flag;
|
||||
dest->asn1_form = src->asn1_form;
|
||||
|
||||
if (src->seed) {
|
||||
if (dest->seed)
|
||||
OPENSSL_free(dest->seed);
|
||||
OPENSSL_free(dest->seed);
|
||||
dest->seed = OPENSSL_malloc(src->seed_len);
|
||||
if (dest->seed == NULL)
|
||||
return 0;
|
||||
@@ -247,8 +215,7 @@ int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
|
||||
return 0;
|
||||
dest->seed_len = src->seed_len;
|
||||
} else {
|
||||
if (dest->seed)
|
||||
OPENSSL_free(dest->seed);
|
||||
OPENSSL_free(dest->seed);
|
||||
dest->seed = NULL;
|
||||
dest->seed_len = 0;
|
||||
}
|
||||
@@ -273,10 +240,9 @@ EC_GROUP *EC_GROUP_dup(const EC_GROUP *a)
|
||||
|
||||
err:
|
||||
if (!ok) {
|
||||
if (t)
|
||||
EC_GROUP_free(t);
|
||||
EC_GROUP_free(t);
|
||||
return NULL;
|
||||
} else
|
||||
}
|
||||
return t;
|
||||
}
|
||||
|
||||
@@ -307,24 +273,28 @@ int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
|
||||
return 0;
|
||||
|
||||
if (order != NULL) {
|
||||
if (!BN_copy(&group->order, order))
|
||||
if (!BN_copy(group->order, order))
|
||||
return 0;
|
||||
} else
|
||||
BN_zero(&group->order);
|
||||
BN_zero(group->order);
|
||||
|
||||
if (cofactor != NULL) {
|
||||
if (!BN_copy(&group->cofactor, cofactor))
|
||||
if (!BN_copy(group->cofactor, cofactor))
|
||||
return 0;
|
||||
} else
|
||||
BN_zero(&group->cofactor);
|
||||
BN_zero(group->cofactor);
|
||||
|
||||
/*
|
||||
* We ignore the return value because some groups have an order with
|
||||
* Some groups have an order with
|
||||
* factors of two, which makes the Montgomery setup fail.
|
||||
* |group->mont_data| will be NULL in this case.
|
||||
*/
|
||||
ec_precompute_mont_data(group);
|
||||
if (BN_is_odd(group->order)) {
|
||||
return ec_precompute_mont_data(group);
|
||||
}
|
||||
|
||||
BN_MONT_CTX_free(group->mont_data);
|
||||
group->mont_data = NULL;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -335,24 +305,45 @@ const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group)
|
||||
|
||||
BN_MONT_CTX *EC_GROUP_get_mont_data(const EC_GROUP *group)
|
||||
{
|
||||
return EC_GROUP_VERSION(group) ? group->mont_data : NULL;
|
||||
return group->mont_data;
|
||||
}
|
||||
|
||||
int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx)
|
||||
{
|
||||
if (!BN_copy(order, &group->order))
|
||||
if (group->order == NULL)
|
||||
return 0;
|
||||
if (!BN_copy(order, group->order))
|
||||
return 0;
|
||||
|
||||
return !BN_is_zero(order);
|
||||
}
|
||||
|
||||
const BIGNUM *EC_GROUP_get0_order(const EC_GROUP *group)
|
||||
{
|
||||
return group->order;
|
||||
}
|
||||
|
||||
int EC_GROUP_order_bits(const EC_GROUP *group)
|
||||
{
|
||||
OPENSSL_assert(group->meth->group_order_bits != NULL);
|
||||
return group->meth->group_order_bits(group);
|
||||
}
|
||||
|
||||
int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor,
|
||||
BN_CTX *ctx)
|
||||
{
|
||||
if (!BN_copy(cofactor, &group->cofactor))
|
||||
|
||||
if (group->cofactor == NULL)
|
||||
return 0;
|
||||
if (!BN_copy(cofactor, group->cofactor))
|
||||
return 0;
|
||||
|
||||
return !BN_is_zero(&group->cofactor);
|
||||
return !BN_is_zero(group->cofactor);
|
||||
}
|
||||
|
||||
const BIGNUM *EC_GROUP_get0_cofactor(const EC_GROUP *group)
|
||||
{
|
||||
return group->cofactor;
|
||||
}
|
||||
|
||||
void EC_GROUP_set_curve_name(EC_GROUP *group, int nid)
|
||||
@@ -367,13 +358,12 @@ int EC_GROUP_get_curve_name(const EC_GROUP *group)
|
||||
|
||||
void EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag)
|
||||
{
|
||||
group->asn1_flag &= ~EC_GROUP_ASN1_FLAG_MASK;
|
||||
group->asn1_flag |= flag & EC_GROUP_ASN1_FLAG_MASK;
|
||||
group->asn1_flag = flag;
|
||||
}
|
||||
|
||||
int EC_GROUP_get_asn1_flag(const EC_GROUP *group)
|
||||
{
|
||||
return group->asn1_flag & EC_GROUP_ASN1_FLAG_MASK;
|
||||
return group->asn1_flag;
|
||||
}
|
||||
|
||||
void EC_GROUP_set_point_conversion_form(EC_GROUP *group,
|
||||
@@ -390,11 +380,9 @@ point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP
|
||||
|
||||
size_t EC_GROUP_set_seed(EC_GROUP *group, const unsigned char *p, size_t len)
|
||||
{
|
||||
if (group->seed) {
|
||||
OPENSSL_free(group->seed);
|
||||
group->seed = NULL;
|
||||
group->seed_len = 0;
|
||||
}
|
||||
OPENSSL_free(group->seed);
|
||||
group->seed = NULL;
|
||||
group->seed_len = 0;
|
||||
|
||||
if (!len || !p)
|
||||
return 1;
|
||||
@@ -494,10 +482,12 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
|
||||
if (EC_GROUP_get_curve_name(a) && EC_GROUP_get_curve_name(b) &&
|
||||
EC_GROUP_get_curve_name(a) != EC_GROUP_get_curve_name(b))
|
||||
return 1;
|
||||
if (a->meth->flags & EC_FLAGS_CUSTOM_CURVE)
|
||||
return 0;
|
||||
|
||||
if (!ctx)
|
||||
if (ctx == NULL)
|
||||
ctx_new = ctx = BN_CTX_new();
|
||||
if (!ctx)
|
||||
if (ctx == NULL)
|
||||
return -1;
|
||||
|
||||
BN_CTX_start(ctx);
|
||||
@@ -507,10 +497,9 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
|
||||
b1 = BN_CTX_get(ctx);
|
||||
b2 = BN_CTX_get(ctx);
|
||||
b3 = BN_CTX_get(ctx);
|
||||
if (!b3) {
|
||||
if (b3 == NULL) {
|
||||
BN_CTX_end(ctx);
|
||||
if (ctx_new)
|
||||
BN_CTX_free(ctx);
|
||||
BN_CTX_free(ctx_new);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -531,172 +520,27 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
|
||||
r = 1;
|
||||
|
||||
if (!r) {
|
||||
const BIGNUM *ao, *bo, *ac, *bc;
|
||||
/* compare the order and cofactor */
|
||||
if (!EC_GROUP_get_order(a, a1, ctx) ||
|
||||
!EC_GROUP_get_order(b, b1, ctx) ||
|
||||
!EC_GROUP_get_cofactor(a, a2, ctx) ||
|
||||
!EC_GROUP_get_cofactor(b, b2, ctx)) {
|
||||
ao = EC_GROUP_get0_order(a);
|
||||
bo = EC_GROUP_get0_order(b);
|
||||
ac = EC_GROUP_get0_cofactor(a);
|
||||
bc = EC_GROUP_get0_cofactor(b);
|
||||
if (ao == NULL || bo == NULL) {
|
||||
BN_CTX_end(ctx);
|
||||
if (ctx_new)
|
||||
BN_CTX_free(ctx);
|
||||
BN_CTX_free(ctx_new);
|
||||
return -1;
|
||||
}
|
||||
if (BN_cmp(a1, b1) || BN_cmp(a2, b2))
|
||||
if (BN_cmp(ao, bo) || BN_cmp(ac, bc))
|
||||
r = 1;
|
||||
}
|
||||
|
||||
BN_CTX_end(ctx);
|
||||
if (ctx_new)
|
||||
BN_CTX_free(ctx);
|
||||
BN_CTX_free(ctx_new);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
/* this has 'package' visibility */
|
||||
int EC_EX_DATA_set_data(EC_EXTRA_DATA **ex_data, void *data,
|
||||
void *(*dup_func) (void *),
|
||||
void (*free_func) (void *),
|
||||
void (*clear_free_func) (void *))
|
||||
{
|
||||
EC_EXTRA_DATA *d;
|
||||
|
||||
if (ex_data == NULL)
|
||||
return 0;
|
||||
|
||||
for (d = *ex_data; d != NULL; d = d->next) {
|
||||
if (d->dup_func == dup_func && d->free_func == free_func
|
||||
&& d->clear_free_func == clear_free_func) {
|
||||
ECerr(EC_F_EC_EX_DATA_SET_DATA, EC_R_SLOT_FULL);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (data == NULL)
|
||||
/* no explicit entry needed */
|
||||
return 1;
|
||||
|
||||
d = OPENSSL_malloc(sizeof *d);
|
||||
if (d == NULL)
|
||||
return 0;
|
||||
|
||||
d->data = data;
|
||||
d->dup_func = dup_func;
|
||||
d->free_func = free_func;
|
||||
d->clear_free_func = clear_free_func;
|
||||
|
||||
d->next = *ex_data;
|
||||
*ex_data = d;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* this has 'package' visibility */
|
||||
void *EC_EX_DATA_get_data(const EC_EXTRA_DATA *ex_data,
|
||||
void *(*dup_func) (void *),
|
||||
void (*free_func) (void *),
|
||||
void (*clear_free_func) (void *))
|
||||
{
|
||||
const EC_EXTRA_DATA *d;
|
||||
|
||||
for (d = ex_data; d != NULL; d = d->next) {
|
||||
if (d->dup_func == dup_func && d->free_func == free_func
|
||||
&& d->clear_free_func == clear_free_func)
|
||||
return d->data;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* this has 'package' visibility */
|
||||
void EC_EX_DATA_free_data(EC_EXTRA_DATA **ex_data,
|
||||
void *(*dup_func) (void *),
|
||||
void (*free_func) (void *),
|
||||
void (*clear_free_func) (void *))
|
||||
{
|
||||
EC_EXTRA_DATA **p;
|
||||
|
||||
if (ex_data == NULL)
|
||||
return;
|
||||
|
||||
for (p = ex_data; *p != NULL; p = &((*p)->next)) {
|
||||
if ((*p)->dup_func == dup_func && (*p)->free_func == free_func
|
||||
&& (*p)->clear_free_func == clear_free_func) {
|
||||
EC_EXTRA_DATA *next = (*p)->next;
|
||||
|
||||
(*p)->free_func((*p)->data);
|
||||
OPENSSL_free(*p);
|
||||
|
||||
*p = next;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* this has 'package' visibility */
|
||||
void EC_EX_DATA_clear_free_data(EC_EXTRA_DATA **ex_data,
|
||||
void *(*dup_func) (void *),
|
||||
void (*free_func) (void *),
|
||||
void (*clear_free_func) (void *))
|
||||
{
|
||||
EC_EXTRA_DATA **p;
|
||||
|
||||
if (ex_data == NULL)
|
||||
return;
|
||||
|
||||
for (p = ex_data; *p != NULL; p = &((*p)->next)) {
|
||||
if ((*p)->dup_func == dup_func && (*p)->free_func == free_func
|
||||
&& (*p)->clear_free_func == clear_free_func) {
|
||||
EC_EXTRA_DATA *next = (*p)->next;
|
||||
|
||||
(*p)->clear_free_func((*p)->data);
|
||||
OPENSSL_free(*p);
|
||||
|
||||
*p = next;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* this has 'package' visibility */
|
||||
void EC_EX_DATA_free_all_data(EC_EXTRA_DATA **ex_data)
|
||||
{
|
||||
EC_EXTRA_DATA *d;
|
||||
|
||||
if (ex_data == NULL)
|
||||
return;
|
||||
|
||||
d = *ex_data;
|
||||
while (d) {
|
||||
EC_EXTRA_DATA *next = d->next;
|
||||
|
||||
d->free_func(d->data);
|
||||
OPENSSL_free(d);
|
||||
|
||||
d = next;
|
||||
}
|
||||
*ex_data = NULL;
|
||||
}
|
||||
|
||||
/* this has 'package' visibility */
|
||||
void EC_EX_DATA_clear_free_all_data(EC_EXTRA_DATA **ex_data)
|
||||
{
|
||||
EC_EXTRA_DATA *d;
|
||||
|
||||
if (ex_data == NULL)
|
||||
return;
|
||||
|
||||
d = *ex_data;
|
||||
while (d) {
|
||||
EC_EXTRA_DATA *next = d->next;
|
||||
|
||||
d->clear_free_func(d->data);
|
||||
OPENSSL_free(d);
|
||||
|
||||
d = next;
|
||||
}
|
||||
*ex_data = NULL;
|
||||
}
|
||||
|
||||
/* functions for EC_POINT objects */
|
||||
|
||||
EC_POINT *EC_POINT_new(const EC_GROUP *group)
|
||||
@@ -712,7 +556,7 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret = OPENSSL_malloc(sizeof *ret);
|
||||
ret = OPENSSL_zalloc(sizeof(*ret));
|
||||
if (ret == NULL) {
|
||||
ECerr(EC_F_EC_POINT_NEW, ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
@@ -747,8 +591,7 @@ void EC_POINT_clear_free(EC_POINT *point)
|
||||
point->meth->point_clear_finish(point);
|
||||
else if (point->meth->point_finish != 0)
|
||||
point->meth->point_finish(point);
|
||||
OPENSSL_cleanse(point, sizeof *point);
|
||||
OPENSSL_free(point);
|
||||
OPENSSL_clear_free(point, sizeof(*point));
|
||||
}
|
||||
|
||||
int EC_POINT_copy(EC_POINT *dest, const EC_POINT *src)
|
||||
@@ -781,8 +624,8 @@ EC_POINT *EC_POINT_dup(const EC_POINT *a, const EC_GROUP *group)
|
||||
if (!r) {
|
||||
EC_POINT_free(t);
|
||||
return NULL;
|
||||
} else
|
||||
return t;
|
||||
}
|
||||
return t;
|
||||
}
|
||||
|
||||
const EC_METHOD *EC_POINT_method_of(const EC_POINT *point)
|
||||
@@ -856,7 +699,15 @@ int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
|
||||
EC_R_INCOMPATIBLE_OBJECTS);
|
||||
return 0;
|
||||
}
|
||||
return group->meth->point_set_affine_coordinates(group, point, x, y, ctx);
|
||||
if (!group->meth->point_set_affine_coordinates(group, point, x, y, ctx))
|
||||
return 0;
|
||||
|
||||
if (EC_POINT_is_on_curve(group, point, ctx) <= 0) {
|
||||
ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP,
|
||||
EC_R_POINT_IS_NOT_ON_CURVE);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifndef OPENSSL_NO_EC2M
|
||||
@@ -874,7 +725,15 @@ int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
|
||||
EC_R_INCOMPATIBLE_OBJECTS);
|
||||
return 0;
|
||||
}
|
||||
return group->meth->point_set_affine_coordinates(group, point, x, y, ctx);
|
||||
if (!group->meth->point_set_affine_coordinates(group, point, x, y, ctx))
|
||||
return 0;
|
||||
|
||||
if (EC_POINT_is_on_curve(group, point, ctx) <= 0) {
|
||||
ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M,
|
||||
EC_R_POINT_IS_NOT_ON_CURVE);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1103,22 +962,17 @@ int ec_precompute_mont_data(EC_GROUP *group)
|
||||
BN_CTX *ctx = BN_CTX_new();
|
||||
int ret = 0;
|
||||
|
||||
if (!EC_GROUP_VERSION(group))
|
||||
goto err;
|
||||
|
||||
if (group->mont_data) {
|
||||
BN_MONT_CTX_free(group->mont_data);
|
||||
group->mont_data = NULL;
|
||||
}
|
||||
BN_MONT_CTX_free(group->mont_data);
|
||||
group->mont_data = NULL;
|
||||
|
||||
if (ctx == NULL)
|
||||
goto err;
|
||||
|
||||
group->mont_data = BN_MONT_CTX_new();
|
||||
if (!group->mont_data)
|
||||
if (group->mont_data == NULL)
|
||||
goto err;
|
||||
|
||||
if (!BN_MONT_CTX_set(group->mont_data, &group->order, ctx)) {
|
||||
if (!BN_MONT_CTX_set(group->mont_data, group->order, ctx)) {
|
||||
BN_MONT_CTX_free(group->mont_data);
|
||||
group->mont_data = NULL;
|
||||
goto err;
|
||||
@@ -1128,7 +982,23 @@ int ec_precompute_mont_data(EC_GROUP *group)
|
||||
|
||||
err:
|
||||
|
||||
if (ctx)
|
||||
BN_CTX_free(ctx);
|
||||
BN_CTX_free(ctx);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int EC_KEY_set_ex_data(EC_KEY *key, int idx, void *arg)
|
||||
{
|
||||
return CRYPTO_set_ex_data(&key->ex_data, idx, arg);
|
||||
}
|
||||
|
||||
void *EC_KEY_get_ex_data(const EC_KEY *key, int idx)
|
||||
{
|
||||
return CRYPTO_get_ex_data(&key->ex_data, idx);
|
||||
}
|
||||
|
||||
int ec_group_simple_order_bits(const EC_GROUP *group)
|
||||
{
|
||||
if (group->order == NULL)
|
||||
return 0;
|
||||
return BN_num_bits(group->order);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user