Output prog name within error message

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3141)

diff --git a/apps/s_client.c b/apps/s_client.c
index d7a3a80e2b409b2fc4990c36c4d5f7dc878a66b6..c86d36c5b6f26699fbc01aaff7253a06cbe231fa 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1487,17 +1487,17 @@ int s_client_main(int argc, char **argv)
     }
 #endif
     if (max_send_fragment > SSL3_RT_MAX_PLAIN_LENGTH) {
-        BIO_printf(bio_err, "Bad max send fragment size\n");
+        BIO_printf(bio_err, "%s: Bad max send fragment size\n", prog);
         goto end;
     }
 
     if (split_send_fragment > SSL3_RT_MAX_PLAIN_LENGTH) {
-        BIO_printf(bio_err, "Bad split send fragment size\n");
+        BIO_printf(bio_err, "%s: Bad split send fragment size\n", prog);
         goto end;
     }
 
     if (max_pipelines > SSL_MAX_PIPELINES) {
-        BIO_printf(bio_err, "Bad max pipelines value\n");
+        BIO_printf(bio_err, "%s: Bad max pipelines value\n", prog);
         goto end;
     }
 

diff --git a/apps/s_server.c b/apps/s_server.c
index 5faeb21a8b80d32c996e4e500cca78389bc208d5..22131bf84fe6d17cc15ba3ed889e428856ebd6b2 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1575,17 +1575,17 @@ int s_server_main(int argc, char *argv[])
     }
 #endif
     if (max_send_fragment > SSL3_RT_MAX_PLAIN_LENGTH) {
-        BIO_printf(bio_err, "Bad max send fragment size\n");
+        BIO_printf(bio_err, "%s: Bad max send fragment size\n", prog);
         goto end;
     }
 
     if (split_send_fragment > SSL3_RT_MAX_PLAIN_LENGTH) {
-        BIO_printf(bio_err, "Bad split send fragment size\n");
+        BIO_printf(bio_err, "%s:Bad split send fragment size\n", prog);
         goto end;
     }
 
     if (max_pipelines > SSL_MAX_PIPELINES) {
-        BIO_printf(bio_err, "Bad max pipelines value\n");
+        BIO_printf(bio_err, "%s:too large max-pipelines value\n", prog);
         goto end;
     }