diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-13 22:33:33 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-06-19 15:31:45 +0200 |
| commit | f39a5501ce69cab0c7282f5dcbf2b80d8ee259f2 (patch) | |
| tree | c5c9a3f4224fdf87b98813fb81f61c7b4ad72bc6 /crypto/init.c | |
| parent | Fix the fall-out in 04-test_bioprint.t (diff) | |
| download | openssl-f39a5501ce69cab0c7282f5dcbf2b80d8ee259f2.tar.xz openssl-f39a5501ce69cab0c7282f5dcbf2b80d8ee259f2.zip | |
Remove bsd_cryptodev engine
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3699)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/crypto/init.c b/crypto/init.c index b930b52b2f..5f7e907ca7 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -241,19 +241,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl) engine_load_openssl_int(); return 1; } -# if !defined(OPENSSL_NO_HW) && \ - (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(HAVE_CRYPTODEV)) -static CRYPTO_ONCE engine_cryptodev = CRYPTO_ONCE_STATIC_INIT; -DEFINE_RUN_ONCE_STATIC(ossl_init_engine_cryptodev) -{ -# ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_cryptodev: " - "engine_load_cryptodev_int()\n"); -# endif - engine_load_cryptodev_int(); - return 1; -} -# endif # ifndef OPENSSL_NO_RDRAND static CRYPTO_ONCE engine_rdrand = CRYPTO_ONCE_STATIC_INIT; @@ -573,12 +560,6 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) if ((opts & OPENSSL_INIT_ENGINE_OPENSSL) && !RUN_ONCE(&engine_openssl, ossl_init_engine_openssl)) return 0; -# if !defined(OPENSSL_NO_HW) && \ - (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(HAVE_CRYPTODEV)) - if ((opts & OPENSSL_INIT_ENGINE_CRYPTODEV) - && !RUN_ONCE(&engine_cryptodev, ossl_init_engine_cryptodev)) - return 0; -# endif # ifndef OPENSSL_NO_RDRAND if ((opts & OPENSSL_INIT_ENGINE_RDRAND) && !RUN_ONCE(&engine_rdrand, ossl_init_engine_rdrand)) |