don't try to load cert/key when the "-nocert" option is set

diff --git a/apps/s_server.c b/apps/s_server.c
index 41b9736025b8da01a960882b5defd31054695dc3..8c6fcc240ad357ef3c2684d12f565b37bd95b919 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -832,21 +832,24 @@ bad:
        if (s_key_file == NULL)
                s_key_file = s_cert_file;
 
-       s_key = load_key(bio_err, s_key_file, s_key_format, 0, pass, e,
-                      "server certificate private key file");
-       if (!s_key)
+       if (nocert == 0)
                {
-               ERR_print_errors(bio_err);
-               goto end;
-               }
+               s_key = load_key(bio_err, s_key_file, s_key_format, 0, pass, e,
+                      "server certificate private key file");
+               if (!s_key)
+                       {
+                       ERR_print_errors(bio_err);
+                       goto end;
+                       }
 
-       s_cert = load_cert(bio_err,s_cert_file,s_cert_format,
+               s_cert = load_cert(bio_err,s_cert_file,s_cert_format,
                        NULL, e, "server certificate file");
 
-       if (!s_cert)
-               {
-               ERR_print_errors(bio_err);
-               goto end;
+               if (!s_cert)
+                       {
+                       ERR_print_errors(bio_err);
+                       goto end;
+                       }
                }
 
        if (s_dcert_file)