From: Richard Levitte <levitte@openssl.org>
Date: Wed, 14 Aug 2002 12:18:36 +0000 (+0000)
Subject: Instead of returning errors when certain flags are unusable, just ignore them.
X-Git-Tag: OpenSSL_0_9_7-beta4~199
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=74a25e9cd94f2526d6624aba03e461963a750273;p=oweals%2Fopenssl.git

Instead of returning errors when certain flags are unusable, just ignore them.
That will make the test go through even if DH (or in some cases ECDH) aren't
built into OpenSSL.
PR: 216, part 2
---

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 1afdfa7750..4f6379e160 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -400,12 +400,22 @@ int main(int argc, char *argv[])
 			debug=1;
 		else if	(strcmp(*argv,"-reuse") == 0)
 			reuse=1;
-#ifndef OPENSSL_NO_DH
 		else if	(strcmp(*argv,"-dhe1024") == 0)
+			{
+#ifndef OPENSSL_NO_DH
 			dhe1024=1;
+#else
+			fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";
+#endif
+			}
 		else if	(strcmp(*argv,"-dhe1024dsa") == 0)
+			{
+#ifndef OPENSSL_NO_DH
 			dhe1024dsa=1;
+#else
+			fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";
 #endif
+			}
 		else if	(strcmp(*argv,"-no_dhe") == 0)
 			no_dhe=1;
 		else if	(strcmp(*argv,"-ssl2") == 0)