Commit 8b7080b0 authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove Obsolete engines 



There are a number of engines in the OpenSSL source code which are now
obsolete. The following engines have been removed: 4758cca, aep, atalla,
cswift, nuron, sureware.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent f51e5ed6

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 1.0.2 and 1.1.0  [xx XXX xxxx]



  *) Removed obsolete engines: 4758cca, aep, atalla, cswift, nuron and sureware.

     [Matt Caswell]



  *) New ASN.1 embed macro.



     New ASN.1 macro ASN1_EMBED. This is the same as ASN1_SIMPLE except the

crypto/engine/eng_all.c

+0 −18
Original line number Diff line number Diff line
@@ -73,29 +73,11 @@ void ENGINE_load_builtin_engines(void) 
    ENGINE_load_dynamic();

#ifndef OPENSSL_NO_STATIC_ENGINE

# ifndef OPENSSL_NO_HW

#  ifndef OPENSSL_NO_HW_4758_CCA

    ENGINE_load_4758cca();

#  endif

/*-

 * These engines have been disabled as they do not currently build

#ifndef OPENSSL_NO_HW_AEP

        ENGINE_load_aep();

#endif

#ifndef OPENSSL_NO_HW_ATALLA

        ENGINE_load_atalla();

#endif

#ifndef OPENSSL_NO_HW_CSWIFT

        ENGINE_load_cswift();

#endif

#ifndef OPENSSL_NO_HW_NCIPHER

        ENGINE_load_chil();

#endif

#ifndef OPENSSL_NO_HW_NURON

        ENGINE_load_nuron();

#endif

#ifndef OPENSSL_NO_HW_SUREWARE

        ENGINE_load_sureware();

#endif

#ifndef OPENSSL_NO_HW_UBSEC

        ENGINE_load_ubsec();

#endif

doc/crypto/engine.pod

+0 −6
Original line number Diff line number Diff line
@@ -24,14 +24,8 @@ engine - ENGINE cryptographic module support 
 void ENGINE_load_openssl(void);

 void ENGINE_load_dynamic(void);

 #ifndef OPENSSL_NO_STATIC_ENGINE

 void ENGINE_load_4758cca(void);

 void ENGINE_load_aep(void);

 void ENGINE_load_atalla(void);

 void ENGINE_load_chil(void);

 void ENGINE_load_cswift(void);

 void ENGINE_load_gmp(void);

 void ENGINE_load_nuron(void);

 void ENGINE_load_sureware(void);

 void ENGINE_load_ubsec(void);

 #endif

 void ENGINE_load_cryptodev(void);

engines/Makefile

+5 −26
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



#The following engines have been disabled as they currently do not build

# aep atalla cswift chil nuron sureware ubsec

# sureware ubsec



DIR=	engines

TOP=	..
@@ -31,13 +31,11 @@ AFLAGS= $(ASFLAGS) 
GENERAL=Makefile engines.com install.com engine_vector.mar



LIB=$(TOP)/libcrypto.a

LIBNAMES= 4758cca gmp padlock capi

LIBSRC=	e_4758cca.c \

	e_gmp.c \

LIBNAMES= gmp padlock capi

LIBSRC=	e_gmp.c \

	e_padlock.c \

	e_capi.c

LIBOBJ= e_4758cca.o \

	e_gmp.o \

LIBOBJ= e_gmp.o \

	e_padlock.o \

	e_capi.o \

	$(ENGINES_ASM_OBJ)
@@ -48,11 +46,8 @@ TESTLIBOBJ= e_ossltest.o 


SRC= $(LIBSRC)



HEADER=	e_4758cca_err.c e_4758cca_err.h \

	e_gmp_err.c e_gmp_err.h \

HEADER=	e_gmp_err.c e_gmp_err.h \

	e_chil_err.c e_chil_err.h \

	e_nuron_err.c e_nuron_err.h \

	e_sureware_err.c e_sureware_err.h \

	e_ubsec_err.c e_ubsec_err.h \

	e_capi_err.c e_capi_err.h \

	e_ossltest_err.c e_ossltest_err.h
@@ -159,22 +154,6 @@ clean: 


# DO NOT DELETE THIS LINE -- make depend depends on it.



e_4758cca.o: ../include/openssl/asn1.h ../include/openssl/bio.h

e_4758cca.o: ../include/openssl/bn.h ../include/openssl/buffer.h

e_4758cca.o: ../include/openssl/crypto.h ../include/openssl/dso.h

e_4758cca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

e_4758cca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

e_4758cca.o: ../include/openssl/engine.h ../include/openssl/err.h

e_4758cca.o: ../include/openssl/evp.h ../include/openssl/lhash.h

e_4758cca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

e_4758cca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

e_4758cca.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h

e_4758cca.o: ../include/openssl/rand.h ../include/openssl/rsa.h

e_4758cca.o: ../include/openssl/safestack.h ../include/openssl/sha.h

e_4758cca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

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

e_4758cca.o: e_4758cca.c e_4758cca_err.c e_4758cca_err.h

e_4758cca.o: vendor_defns/hw_4758_cca.h

e_capi.o: ../include/openssl/asn1.h ../include/openssl/bio.h

e_capi.o: ../include/openssl/buffer.h ../include/openssl/crypto.h

e_capi.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

engines/e_4758cca.c

deleted100644 → 0
+0 −937

File deleted.

Preview size limit exceeded, changes collapsed.