diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-06-12 18:31:57 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-06-19 10:33:01 +0200 |
| commit | a9091c137bb21a247afa01ecf17bd5c75d9b0e65 (patch) | |
| tree | 12ac6ac498b5c66da258324694686b9a02a1de85 /crypto/engine | |
| parent | Configure option 'no-deprecated' means '-DOPENSSL_API_COMPAT=0x10100000L' (diff) | |
| download | openssl-a9091c137bb21a247afa01ecf17bd5c75d9b0e65.tar.xz openssl-a9091c137bb21a247afa01ecf17bd5c75d9b0e65.zip | |
Convert our own check of OPENSSL_NO_DEPRECATED
... to the check OPENSSL_API_COMPAT < 0x10100000L, to correspond with
how it's declared.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6470)
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_all.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index c0d0b1cb07..5f06fe0b60 100644 --- a/crypto/engine/eng_all.c +++ b/crypto/engine/eng_all.c @@ -18,7 +18,7 @@ void ENGINE_load_builtin_engines(void) OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL); } -#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)) && !defined(OPENSSL_NO_DEPRECATED) +#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)) && OPENSSL_API_COMPAT < 0x10100000L void ENGINE_setup_bsd_cryptodev(void) { } |