load_key_certs_crls(): Restore output of fatal errors

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index dde0ee60c003d3d1b9eacd29ac06d8218699b6eb..dee38584c4df8289144a17fc909dd758904690b1 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1740,12 +1740,12 @@ int s_server_main(int argc, char *argv[])
 
     if (nocert == 0) {
         s_key = load_key(s_key_file, s_key_format, 0, pass, engine,
-                         "server certificate private key file");
+                         "server certificate private key");
         if (s_key == NULL)
             goto end;
 
         s_cert = load_cert_pass(s_cert_file, s_cert_format, pass,
-                           "server certificate file");
+                           "server certificate");
 
         if (s_cert == NULL)
             goto end;
@@ -1757,12 +1757,12 @@ int s_server_main(int argc, char *argv[])
 
         if (tlsextcbp.servername != NULL) {
             s_key2 = load_key(s_key_file2, s_key_format, 0, pass, engine,
-                              "second server certificate private key file");
+                              "second server certificate private key");
             if (s_key2 == NULL)
                 goto end;
 
             s_cert2 = load_cert_pass(s_cert_file2, s_cert_format, pass,
-                                "second server certificate file");
+                                "second server certificate");
 
             if (s_cert2 == NULL)
                 goto end;
@@ -1802,12 +1802,12 @@ int s_server_main(int argc, char *argv[])
             s_dkey_file = s_dcert_file;
 
         s_dkey = load_key(s_dkey_file, s_dkey_format,
-                          0, dpass, engine, "second certificate private key file");
+                          0, dpass, engine, "second certificate private key");
         if (s_dkey == NULL)
             goto end;
 
         s_dcert = load_cert_pass(s_dcert_file, s_dcert_format, dpass,
-                            "second server certificate file");
+                            "second server certificate");
 
         if (s_dcert == NULL) {
             ERR_print_errors(bio_err);