Commit f3c22ef1 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

This glues the GMP wrapper ENGINE into OpenSSL if it is being built (ie. if 

the OPENSSL_USE_GMP symbol is defined). Also, I've re-ordered the listing
of other builtin ENGINEs to be alphabetical (though "dynamic" will still
come first).
parent a85bef18

crypto/engine/eng_all.c

+14 −11
Original line number Diff line number Diff line
@@ -72,34 +72,37 @@ 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

#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_ATALLA

	ENGINE_load_atalla();

#endif

#ifndef OPENSSL_NO_HW_NURON

	ENGINE_load_nuron();

#endif

#ifndef OPENSSL_NO_HW_UBSEC

	ENGINE_load_ubsec();

#endif

#ifndef OPENSSL_NO_HW_AEP

	ENGINE_load_aep();

#endif

#ifndef OPENSSL_NO_HW_SUREWARE

	ENGINE_load_sureware();

#endif

#ifndef OPENSSL_NO_HW_4758_CCA

	ENGINE_load_4758cca();

#ifndef OPENSSL_NO_HW_UBSEC

	ENGINE_load_ubsec();

#endif

#endif

#if defined(__OpenBSD__) || defined(__FreeBSD__)

	ENGINE_load_cryptodev();

#endif

#if defined(OPENSSL_USE_GMP) && !defined(OPENSSL_NO_HW_GMP)

	ENGINE_load_gmp();

#endif

#endif

	}

crypto/engine/engine.h

+6 −5
Original line number Diff line number Diff line
@@ -320,14 +320,15 @@ ENGINE *ENGINE_by_id(const char *id); 
void ENGINE_load_openssl(void);

void ENGINE_load_dynamic(void);

#ifndef OPENSSL_NO_STATIC_ENGINE

void ENGINE_load_cswift(void);

void ENGINE_load_chil(void);

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_ubsec(void);

void ENGINE_load_aep(void);

void ENGINE_load_sureware(void);

void ENGINE_load_4758cca(void);

void ENGINE_load_ubsec(void);

#endif

void ENGINE_load_cryptodev(void);

void ENGINE_load_builtin_engines(void);