From: Pauli <paul.dale@oracle.com>
Date: Fri, 17 Apr 2020 11:50:50 +0000 (+1000)
Subject: apps: undeprecate the conditioned out apps
X-Git-Tag: openssl-3.0.0-alpha1~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=61b2afb50ac3ba061765c71b6345a6e83917d27d;p=oweals%2Fopenssl.git

apps: undeprecate the conditioned out apps

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11225)
---

diff --git a/apps/build.info b/apps/build.info
index 06b5ca46d8..f2c62c94dc 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -34,18 +34,21 @@ ENDIF
 IF[{- !$disabled{'ts'} -}]
   $OPENSSLSRC=$OPENSSLSRC ts.c
 ENDIF
+IF[{- !$disabled{'dh'} -}]
+$OPENSSLSRC=$OPENSSLSRC dhparam.c
+ENDIF
+IF[{- !$disabled{'dsa'} -}]
+$OPENSSLSRC=$OPENSSLSRC dsa.c dsaparam.c gendsa.c
+ENDIF
+IF[{- !$disabled{'engine'} -}]
+$OPENSSLSRC=$OPENSSLSRC engine.c
+ENDIF
+IF[{- !$disabled{'rsa'} -}]
+$OPENSSLSRC=$OPENSSLSRC rsa.c genrsa.c
+ENDIF
 IF[{- !$disabled{'deprecated-3.0'} -}]
-  IF[{- !$disabled{'dh'} -}]
-    $OPENSSLSRC=$OPENSSLSRC dhparam.c
-  ENDIF
-  IF[{- !$disabled{'dsa'} -}]
-    $OPENSSLSRC=$OPENSSLSRC dsa.c dsaparam.c gendsa.c
-  ENDIF
-  IF[{- !$disabled{'engine'} -}]
-    $OPENSSLSRC=$OPENSSLSRC engine.c
-  ENDIF
   IF[{- !$disabled{'rsa'} -}]
-    $OPENSSLSRC=$OPENSSLSRC rsa.c rsautl.c genrsa.c
+    $OPENSSLSRC=$OPENSSLSRC rsautl.c
   ENDIF
 ENDIF
 IF[{- !$disabled{'cmp'} -}]