generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dead code cleanup; remove #if 0 from crypto/engine

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2015-02-02 11:40:36 -05:00
parent 9ccc00ef6e
commit f16a64d11f
3 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/engine/eng_all.c
View File

@ -64,15 +64,6 @@ void ENGINE_load_builtin_engines(void)
{ {
/* Some ENGINEs need this */ /* Some ENGINEs need this */
OPENSSL_cpuid_setup(); OPENSSL_cpuid_setup();
#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).
*/
ENGINE_load_openssl();
#endif
#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)) #if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
ENGINE_load_cryptodev(); ENGINE_load_cryptodev();
#endif #endif

9
crypto/engine/eng_list.c
View File

@ -353,14 +353,6 @@ ENGINE *ENGINE_by_id(const char *id)
} }
} }
CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE); CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
#if 0
if (iterator == NULL) {
ENGINEerr(ENGINE_F_ENGINE_BY_ID, ENGINE_R_NO_SUCH_ENGINE);
ERR_add_error_data(2, "id=", id);
}
return iterator;
#else
/* EEK! Experimental code starts */
if (iterator) if (iterator)
return iterator; return iterator;
/* /*
@ -390,7 +382,6 @@ ENGINE *ENGINE_by_id(const char *id)
ERR_add_error_data(2, "id=", id); ERR_add_error_data(2, "id=", id);
return NULL; return NULL;
/* EEK! Experimental code ends */ /* EEK! Experimental code ends */
#endif
} }
int ENGINE_up_ref(ENGINE *e) int ENGINE_up_ref(ENGINE *e)

24
crypto/engine/tb_store.c
View File

@ -91,30 +91,6 @@ void ENGINE_register_all_STORE()
ENGINE_register_STORE(e); ENGINE_register_STORE(e);
} }
/* The following two functions are removed because they're useless. */
#if 0
int ENGINE_set_default_STORE(ENGINE *e)
{
if (e->store_meth)
return engine_table_register(&store_table,
engine_unregister_all_STORE, e,
&dummy_nid, 1, 1);
return 1;
}
#endif
#if 0
/*
* Exposed API function to get a functional reference from the implementation
* table (ie. try to get a functional reference from the tabled structural
* references).
*/
ENGINE *ENGINE_get_default_STORE(void)
{
return engine_table_select(&store_table, dummy_nid);
}
#endif
/* Obtains an STORE implementation from an ENGINE functional reference */ /* Obtains an STORE implementation from an ENGINE functional reference */
const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e) const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e)
{ {