diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-03-24 16:19:00 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-06-28 12:54:33 +0200 |
| commit | 619eb33a0c3dc488ba2bcc366633220813b701c7 (patch) | |
| tree | 3fe0209771791d7e8b0de89005e3f74f6515780e /crypto/init.c | |
| parent | 9a32dcf42e2f728018a02b27df9734be480b7f3c (diff) | |
Add new /dev/crypto engine
Based on cryptodev-linux
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3744)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/crypto/init.c b/crypto/init.c index 5f7e907ca7..2d2b07dd75 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -241,6 +241,18 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl) engine_load_openssl_int(); return 1; } +# ifndef OPENSSL_NO_DEVCRYPTOENG +static CRYPTO_ONCE engine_devcrypto = CRYPTO_ONCE_STATIC_INIT; +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_devcrypto) +{ +# ifdef OPENSSL_INIT_DEBUG + fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_devcrypto: " + "engine_load_devcrypto_int()\n"); +# endif + engine_load_devcrypto_int(); + return 1; +} +# endif # ifndef OPENSSL_NO_RDRAND static CRYPTO_ONCE engine_rdrand = CRYPTO_ONCE_STATIC_INIT; @@ -560,6 +572,11 @@ 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(OPENSSL_NO_DEVCRYPTOENG) + if ((opts & OPENSSL_INIT_ENGINE_CRYPTODEV) + && !RUN_ONCE(&engine_devcrypto, ossl_init_engine_devcrypto)) + return 0; +# endif # ifndef OPENSSL_NO_RDRAND if ((opts & OPENSSL_INIT_ENGINE_RDRAND) && !RUN_ONCE(&engine_rdrand, ossl_init_engine_rdrand)) |