Commit 1eb97c3e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

remove ECDSA_METHOD from ENGINE 



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

crypto/engine/Makefile

+15 −30
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ GENERAL=Makefile 
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_rand.c tb_store.c \

	tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c tb_store.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_rand.o tb_store.o \

	tb_rsa.o tb_dsa.o tb_dh.o tb_rand.o tb_store.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
@@ -345,34 +345,19 @@ tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 
tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

tb_dsa.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

tb_dsa.o: ../include/internal/cryptlib.h eng_int.h tb_dsa.c

tb_ecdh.o: ../../e_os.h ../../include/openssl/asn1.h

tb_ecdh.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

tb_ecdh.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

tb_ecdh.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

tb_ecdh.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

tb_ecdh.o: ../../include/openssl/err.h ../../include/openssl/evp.h

tb_ecdh.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

tb_ecdh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

tb_ecdh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

tb_ecdh.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

tb_ecdh.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

tb_ecdh.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

tb_ecdh.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h

tb_ecdh.o: eng_int.h tb_ecdh.c

tb_ecdsa.o: ../../e_os.h ../../include/openssl/asn1.h

tb_ecdsa.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

tb_ecdsa.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

tb_ecdsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

tb_ecdsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

tb_ecdsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h

tb_ecdsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

tb_ecdsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

tb_ecdsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

tb_ecdsa.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

tb_ecdsa.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

tb_ecdsa.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

tb_ecdsa.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h

tb_ecdsa.o: eng_int.h tb_ecdsa.c

tb_eckey.o: ../../e_os.h ../../include/openssl/asn1.h

tb_eckey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

tb_eckey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

tb_eckey.o: ../../include/openssl/ec.h ../../include/openssl/engine.h

tb_eckey.o: ../../include/openssl/err.h ../../include/openssl/evp.h

tb_eckey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

tb_eckey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

tb_eckey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

tb_eckey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

tb_eckey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

tb_eckey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

tb_eckey.o: ../../include/openssl/x509_vfy.h ../include/internal/cryptlib.h

tb_eckey.o: eng_int.h tb_eckey.c

tb_pkmeth.o: ../../e_os.h ../../include/openssl/asn1.h

tb_pkmeth.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

tb_pkmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

crypto/engine/eng_fat.c

+0 −5
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags) 
        return 0;

#endif

#ifndef OPENSSL_NO_EC

    if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e))

        return 0;

#endif

    if ((flags & ENGINE_METHOD_RAND) && !ENGINE_set_default_RAND(e))

        return 0;
@@ -107,8 +105,6 @@ static int int_def_cb(const char *alg, int len, void *arg) 
        *pflags |= ENGINE_METHOD_RSA;

    else if (strncmp(alg, "DSA", len) == 0)

        *pflags |= ENGINE_METHOD_DSA;

    else if (strncmp(alg, "ECDSA", len) == 0)

        *pflags |= ENGINE_METHOD_ECDSA;

    else if (strncmp(alg, "DH", len) == 0)

        *pflags |= ENGINE_METHOD_DH;

    else if (strncmp(alg, "RAND", len) == 0)
@@ -154,7 +150,6 @@ int ENGINE_register_complete(ENGINE *e) 
    ENGINE_register_DH(e);

#endif

#ifndef OPENSSL_NO_EC

    ENGINE_register_ECDSA(e);

#endif

    ENGINE_register_RAND(e);

    ENGINE_register_pkey_meths(e);

crypto/engine/eng_int.h

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ struct engine_st { 
    const RSA_METHOD *rsa_meth;

    const DSA_METHOD *dsa_meth;

    const DH_METHOD *dh_meth;

    const ECDSA_METHOD *ecdsa_meth;

    const EC_KEY_METHOD *ec_key_meth;

    const RAND_METHOD *rand_meth;

    const STORE_METHOD *store_meth;

crypto/engine/eng_list.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static void engine_cpy(ENGINE *dest, const ENGINE *src) 
    dest->dh_meth = src->dh_meth;

#endif

#ifndef OPENSSL_NO_EC

    dest->ecdsa_meth = src->ecdsa_meth;



#endif

    dest->rand_meth = src->rand_meth;

    dest->store_meth = src->store_meth;

crypto/engine/eng_openssl.c

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ static int bind_helper(ENGINE *e) 
        || !ENGINE_set_DSA(e, DSA_get_default_method())

# endif

# ifndef OPENSSL_NO_EC

        || !ENGINE_set_ECDSA(e, ECDSA_OpenSSL())

# endif

# ifndef OPENSSL_NO_DH

        || !ENGINE_set_DH(e, DH_get_default_method())