summaryrefslogtreecommitdiff
path: root/crypto/des
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-02-06 11:31:41 +0100
committerRichard Levitte <levitte@openssl.org>2020-02-07 14:54:36 +0100
commit0e43960e88128bb86031a45c0fe9ca3e3a310c3b (patch)
tree2485faf806e14200e0648468bea544364fc13f62 /crypto/des
parentb05d63273277e0a17ade780b6bef2c48cfd3e522 (diff)
downloadopenssl-new-0e43960e88128bb86031a45c0fe9ca3e3a310c3b.tar.gz
Adapt all build.info and test recipes to the new $disabled{'deprecated-x.y'}
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11027)
Diffstat (limited to 'crypto/des')
-rw-r--r--crypto/des/build.info6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/des/build.info b/crypto/des/build.info
index 8ce3daf37e..1fbbcdf2f9 100644
--- a/crypto/des/build.info
+++ b/crypto/des/build.info
@@ -25,9 +25,9 @@ SOURCE[../../providers/libfips.a]=$COMMON
DEFINE[../../libcrypto]=$DESDEF
DEFINE[../../providers/libfips.a]=$DESDEF
-IF[{- $disabled{"deprecated"}
- && !$disabled{"mdc2"}
- && (defined $config{"api"} && $config{"api"} >= 30000) -}]
+# When all deprecated symbols are removed, libcrypto doesn't export the
+# DES functions, so we must include them directly in liblegacy.a
+IF[{- $disabled{'deprecated-3.0'} && !$disabled{"mdc2"} -}]
SOURCE[../../providers/liblegacy.a]=set_key.c $DESASM
DEFINE[../../providers/liblegacy.a]=$DESDEF
ENDIF