[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  8bb9c60ba82ae8e5dcd105258996d9c2fe3ac472 (commit)
      from  075b1f2f42c9ab1f5c80078cad70de0216748b6d (commit)


- Log -----------------------------------------------------------------
commit 8bb9c60ba82ae8e5dcd105258996d9c2fe3ac472
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Feb 12 20:05:29 2020 +1000

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11067)

-----------------------------------------------------------------------

Summary of changes:
 apps/build.info | 4 ++--
 apps/dhparam.c  | 2 +-
 apps/dsa.c      | 2 +-
 apps/dsaparam.c | 2 +-
 apps/gendsa.c   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/build.info b/apps/build.info
index c8835d765c..ad3ef74ad4 100644
--- 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 e2a5b7946d..acff366158 100644
--- 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 0156ff8373..9704a34c39 100644
--- 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 25b86d5cc6..eebffa0ee5 100644
--- 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 686168c692..a64ac16a97 100644
--- 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