Apps: don't build deprecated DH and DSA apps.

This also means that there doesn't need to be any conditional checks in the .c
files to avoid deprecated builds.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11067)

diff --git a/apps/build.info b/apps/build.info
index c8835d765cb2a020db989ed08a24ab5e9a5df8f4..ad3ef74ad408aab156a4927a7f2287366288d007 100644 (file)
--- a/apps/build.info
+++ b/apps/build.info
@@ -12,8 +12,8 @@ ENDIF
 # Source for the 'openssl' program
 $OPENSSLSRC=\
         openssl.c progs.c \
-        asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \
-        dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \
+        asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c \
+        ec.c ecparam.c enc.c engine.c errstr.c \
         genpkey.c genrsa.c kdf.c mac.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c \
         pkcs8.c pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c \
         rsautl.c s_client.c s_server.c s_time.c sess_id.c smime.c speed.c \

diff --git a/apps/dhparam.c b/apps/dhparam.c
index e2a5b7946da3dea4525794becc7b5eab80cbcd40..acff366158e11ee906c703639f142fc7a0faf42c 100644 (file)
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -11,7 +11,7 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <openssl/opensslconf.h>
-#if defined(OPENSSL_NO_DH) || defined(OPENSSL_NO_DEPRECATED_3_0)
+#ifdef OPENSSL_NO_DH
 NON_EMPTY_TRANSLATION_UNIT
 #else
 

diff --git a/apps/dsa.c b/apps/dsa.c
index 0156ff83734dd20cdcd8e33c4cf67b11141a7030..9704a34c395e930b3315f1f5daa70d3e70eed663 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -11,7 +11,7 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <openssl/opensslconf.h>
-#if defined(OPENSSL_NO_DSA) || defined(OPENSSL_NO_DEPRECATED_3_0)
+#ifdef OPENSSL_NO_DSA
 NON_EMPTY_TRANSLATION_UNIT
 #else
 

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 25b86d5cc6fda1a0e5f2047d96ba72bf5f40d1c0..eebffa0ee54677ed5693f06659efb0194b0296f3 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -11,7 +11,7 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <openssl/opensslconf.h>
-#if defined(OPENSSL_NO_DSA) || defined(OPENSSL_NO_DEPRECATED_3_0)
+#ifdef OPENSSL_NO_DSA
 NON_EMPTY_TRANSLATION_UNIT
 #else
 

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 686168c69264f9dda54900e4dd2a57e63849c102..a64ac16a9729f388e0d879d21bfa5fcebbac3740 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -11,7 +11,7 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <openssl/opensslconf.h>
-#if defined(OPENSSL_NO_DSA) || defined(OPENSSL_NO_DEPRECATED_3_0)
+#ifdef OPENSSL_NO_DSA
 NON_EMPTY_TRANSLATION_UNIT
 #else