Minor clean-up in crypto/engine.

crypto/engine/eng_all.c

@@ -61,12 +61,15 @@
 
 void ENGINE_load_builtin_engines(void)
 	{
+#if 0
 	/* There's no longer any need for an "openssl" ENGINE unless, one day,
 	 * it is the *only* way for standard builtin implementations to be be
 	 * accessed (ie. it would be possible to statically link binaries with
 	 * *no* builtin implementations). */
-#if 0
 	ENGINE_load_openssl();
+#endif
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
+	ENGINE_load_cryptodev();
 #endif
 	ENGINE_load_dynamic();
 #ifndef OPENSSL_NO_STATIC_ENGINE
@@ -98,14 +101,11 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_PADLOCK
 	ENGINE_load_padlock();
 #endif
+#endif
 #ifndef OPENSSL_NO_GOST
 	ENGINE_load_gost();
 #endif
-#endif
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
-	ENGINE_load_cryptodev();
-#endif
-#if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
+#ifndef OPENSSL_NO_GMP
 	ENGINE_load_gmp();
 #endif
 #endif

crypto/engine/engine.h

@@ -327,16 +327,18 @@ void ENGINE_load_aep(void);
 void ENGINE_load_atalla(void);
 void ENGINE_load_chil(void);
 void ENGINE_load_cswift(void);
-#ifndef OPENSSL_NO_GMP
-void ENGINE_load_gmp(void);
-#endif
 void ENGINE_load_nuron(void);
 void ENGINE_load_sureware(void);
 void ENGINE_load_ubsec(void);
+void ENGINE_load_padlock(void);
+#ifndef OPENSSL_NO_GMP
+void ENGINE_load_gmp(void);
+#endif
+#ifndef OPENSSL_NO_GOST
 void ENGINE_load_gost(void);
 #endif
+#endif
 void ENGINE_load_cryptodev(void);
-void ENGINE_load_padlock(void);
 void ENGINE_load_builtin_engines(void);
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation

util/libeay.num

@@ -3107,7 +3107,7 @@ EC_GFp_nist_method                      3529	EXIST::FUNCTION:EC
 STORE_method_set_modify_function        3530	EXIST:!VMS:FUNCTION:
 STORE_meth_set_modify_fn                3530	EXIST:VMS:FUNCTION:
 STORE_parse_attrs_next                  3531	EXIST::FUNCTION:
-ENGINE_load_padlock                     3532	EXIST::FUNCTION:ENGINE
+ENGINE_load_padlock                     3532	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 EC_GROUP_set_curve_name                 3533	EXIST::FUNCTION:EC
 X509_CERT_PAIR_it                       3534	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_CERT_PAIR_it                       3534	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -3587,7 +3587,7 @@ X509_ALGOR_get0                         3976	EXIST::FUNCTION:
 DSO_global_lookup                       3977	EXIST::FUNCTION:
 TS_CONF_set_tsa_name                    3978	EXIST::FUNCTION:
 i2d_ASN1_SET_ANY                        3979	EXIST::FUNCTION:
-ENGINE_load_gost                        3980	EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ENGINE_load_gost                        3980	EXIST::FUNCTION:ENGINE,GOST,STATIC_ENGINE
 WHIRLPOOL_BitUpdate                     3981	EXIST::FUNCTION:WHIRLPOOL
 ASN1_PCTX_get_flags                     3982	EXIST::FUNCTION:
 TS_TST_INFO_get_ext_by_NID              3983	EXIST::FUNCTION: