merge with openssl-0.9.7-stable-SNAP-20020911,

new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@

1 files changed, 11 insertions, 1 deletions

diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 1afdfa7750..4f6379e160 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/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)