diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-03-01 13:18:11 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-05 08:46:51 +0100 |
| commit | 469ce8ff48ef06b2e508d0c06a42ec86379b0032 (patch) | |
| tree | ac10082555d063cfaaf2ac5f6c3abde8c7fe635a /crypto/init.c | |
| parent | e3b35d2b29e9446af83fcaa534e67e7b04a60d7a (diff) | |
Deprecate the "hw" configuration options, make "padlockeng" disablable
The "hw" and "hw-.*" style options are historical artifacts, sprung
from the time when ENGINE was first designed, with hardware crypto
accelerators and HSMs in mind.
Today, these options have largely lost their value, replaced by
options such as "no-{foo}eng" and "no-engine".
This completes the transition by making "hw" and "hw-.*" deprecated,
but automatically translated into more modern variants of the same.
In the process, we get rid of the last regular expression in
Configure's @disablables, a feature that was ill supported anyway.
Also, padlock now gets treated just as every other engine.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8380)
Diffstat (limited to 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/init.c b/crypto/init.c index ddea63ae0d..ef9c043099 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -389,7 +389,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_devcrypto) return 1; } # endif -# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) +# if !defined(OPENSSL_NO_PADLOCKENG) static CRYPTO_ONCE engine_padlock = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE_STATIC(ossl_init_engine_padlock) { @@ -761,7 +761,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) && !RUN_ONCE(&engine_devcrypto, ossl_init_engine_devcrypto)) return 0; # endif -# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) +# if !defined(OPENSSL_NO_PADLOCKENG) if ((opts & OPENSSL_INIT_ENGINE_PADLOCK) && !RUN_ONCE(&engine_padlock, ossl_init_engine_padlock)) return 0; |