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 5f91ed19c73705c108623eb32fd8fef4237a5e59..c752d0b01b636d393ac0b137f42f88f70760ea28 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -247,12 +247,22 @@ int main(int argc, char *argv[])
                        debug=1;
                else if (strcmp(*argv,"-reuse") == 0)
                        reuse=1;
-#ifndef NO_DH
                else if (strcmp(*argv,"-dhe1024") == 0)
+                       {
+#ifndef NO_DH
                        dhe1024=1;
+#else
+                       fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";
+#endif
+                       }
                else if (strcmp(*argv,"-dhe1024dsa") == 0)
+                       {
+#ifndef 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)