Apps: don't build deprecated DH and DSA apps.
authorPauli <paul.dale@oracle.com>
Wed, 12 Feb 2020 10:05:29 +0000 (20:05 +1000)
committerPauli <paul.dale@oracle.com>
Thu, 13 Feb 2020 22:40:45 +0000 (08:40 +1000)
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)

apps/build.info
apps/dhparam.c
apps/dsa.c
apps/dsaparam.c
apps/gendsa.c

index c8835d7..ad3ef74 100644 (file)
@@ -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 \
index e2a5b79..acff366 100644 (file)
@@ -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
 
index 0156ff8..9704a34 100644 (file)
@@ -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
 
index 25b86d5..eebffa0 100644 (file)
@@ -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
 
index 686168c..a64ac16 100644 (file)
@@ -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