Commit 28572b57 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Support for EC_KEY_METHOD. 



Add EC_KEY_METHOD. This is part of the EC revision and will make EC behave
more like other algorithms. Specifically:

EC_KEY_METHOD is part of EC_KEY.
It is part of ENGINE.
Default or key specific implementations can be provided to redirect some
or all operations.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 28cbe2ab

crypto/ec/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\ 
	ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\

	ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c \

	ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c \

	ecp_oct.c ec2_oct.c ec_oct.c

	ecp_oct.c ec2_oct.c ec_oct.c ec_kmeth.c



LIBOBJ=	ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\

	ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\

	ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o \

	ecp_nistp224.o ecp_nistp256.o ecp_nistp521.o ecp_nistputil.o \

	ecp_oct.o ec2_oct.o ec_oct.o $(EC_ASM)

	ecp_oct.o ec2_oct.o ec_oct.o ec_kmeth.o $(EC_ASM)



SRC= $(LIBSRC)

crypto/ec/ec_key.c

+1 −11
Original line number Diff line number Diff line
@@ -68,17 +68,7 @@ 


EC_KEY *EC_KEY_new(void)

{

    EC_KEY *ret = OPENSSL_zalloc(sizeof(*ret));



    if (ret == NULL) {

        ECerr(EC_F_EC_KEY_NEW, ERR_R_MALLOC_FAILURE);

        return (NULL);

    }



    ret->version = 1;

    ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;

    ret->references = 1;

    return (ret);

    return EC_KEY_new_method(NULL);

}



EC_KEY *EC_KEY_new_by_curve_name(int nid)

crypto/ec/ec_kmeth.c

0 → 100644
+120 −0
Original line number Diff line number Diff line 
/* crypto/ec/ec_kmeth.c */

/*

 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL

 * project.

 */

/* ====================================================================

 * Copyright (c) 2015 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

 *    licensing@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.

 * ====================================================================

 */



#include <openssl/ec.h>

#include <openssl/engine.h>

#include <openssl/err.h>

#include "ec_lcl.h"





static const EC_KEY_METHOD openssl_ec_key_method = {

    "OpenSSL EC_KEY method",

    0

};



const EC_KEY_METHOD *default_ec_key_meth = &openssl_ec_key_method;



const EC_KEY_METHOD *EC_KEY_OpenSSL(void)

{

    return &openssl_ec_key_method;

}



const EC_KEY_METHOD *EC_KEY_get_default_method(void)

{

    return default_ec_key_meth;

}



void EC_KEY_set_default_method(const EC_KEY_METHOD *meth)

{

    if (meth == NULL)

        default_ec_key_meth = &openssl_ec_key_method;

    else

        default_ec_key_meth = meth;

}



EC_KEY *EC_KEY_new_method(ENGINE *engine)

{

    EC_KEY *ret = OPENSSL_zalloc(sizeof(*ret));



    if (ret == NULL) {

        ECerr(EC_F_EC_KEY_NEW_METHOD, ERR_R_MALLOC_FAILURE);

        return (NULL);

    }

    ret->meth = EC_KEY_get_default_method();

#ifndef OPENSSL_NO_ENGINE

    if (engine) {

        if (!ENGINE_init(engine)) {

            ECerr(EC_F_EC_KEY_NEW_METHOD, ERR_R_ENGINE_LIB);

            OPENSSL_free(ret);

            return NULL;

        }

        ret->engine = engine;

    } else

        ret->engine = ENGINE_get_default_EC_KEY();

    if (ret->engine) {

        ret->meth = ENGINE_get_EC_KEY(ret->engine);

        if (!ret->meth) {

            ECerr(EC_F_EC_KEY_NEW_METHOD, ERR_R_ENGINE_LIB);

            ENGINE_finish(ret->engine);

            OPENSSL_free(ret);

            return NULL;

        }

    }

#endif



    ret->version = 1;

    ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;

    ret->references = 1;

    return (ret);

}

crypto/ec/ec_lcl.h

+11 −0
Original line number Diff line number Diff line
@@ -257,6 +257,8 @@ struct ec_group_st { 
} /* EC_GROUP */ ;



struct ec_key_st {

    const EC_KEY_METHOD *meth;

    ENGINE *engine;

    int version;

    EC_GROUP *group;

    EC_POINT *pub_key;
@@ -552,3 +554,12 @@ int ec_precompute_mont_data(EC_GROUP *); 
 */

const EC_METHOD *EC_GFp_nistz256_method(void);

#endif



/* EC_METHOD definitions */



struct ec_key_method_st {

    const char *name;

    int32_t flags;

} /* EC_KEY_METHOD */ ;



#define EC_KEY_METHOD_DYNAMIC   1

crypto/engine/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ LIB=$(TOP)/libcrypto.a 
LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \

	eng_table.c eng_pkey.c eng_fat.c eng_all.c \

	tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \

	tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \

	tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c tb_eckey.c \

	eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \

	eng_rdrand.c

LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \

	eng_table.o eng_pkey.o eng_fat.o eng_all.o \

	tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \

	tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \

	tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o tb_eckey.o \

	eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \

	eng_rdrand.o