From: deraadt <deraadt@openbsd.org>
Date: Fri, 18 Apr 2014 09:38:42 +0000 (+0000)
Subject: simplify file:file:... stuff
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=87a7635c73b0449ab3b6c8998f124837d7b238e8;p=openbsd

simplify file:file:... stuff
---

diff --git a/lib/libssl/src/apps/cms.c b/lib/libssl/src/apps/cms.c
index d25b6782971..d9694a41928 100644
--- a/lib/libssl/src/apps/cms.c
+++ b/lib/libssl/src/apps/cms.c
@@ -564,7 +564,7 @@ argerr:
 		BIO_printf(bio_err, "-engine e      use engine e, possibly a hardware device.\n");
 #endif
 		BIO_printf(bio_err, "-passin arg    input file pass phrase source\n");
-		BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err, "-rand file:file:...\n");
 		BIO_printf(bio_err, "               load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err, "               the random number generator\n");
 		BIO_printf(bio_err, "cert.pem       recipient certificate(s) for encryption\n");
diff --git a/lib/libssl/src/apps/dhparam.c b/lib/libssl/src/apps/dhparam.c
index b7a81968605..7679a891fd1 100644
--- a/lib/libssl/src/apps/dhparam.c
+++ b/lib/libssl/src/apps/dhparam.c
@@ -250,7 +250,7 @@ bad:
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err, " -engine e     use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, " -rand file%cfile%c...\n", ':', ':');
+		BIO_printf(bio_err, " -rand file:file:...\n");
 		BIO_printf(bio_err, "               - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err, "               the random number generator\n");
 		BIO_printf(bio_err, " -noout        no output\n");
diff --git a/lib/libssl/src/apps/gendh.c b/lib/libssl/src/apps/gendh.c
index 6e03c8ab167..925b6e41203 100644
--- a/lib/libssl/src/apps/gendh.c
+++ b/lib/libssl/src/apps/gendh.c
@@ -153,7 +153,7 @@ bad:
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err, " -engine e - use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, " -rand file%cfile%c...\n", ':', ':');
+		BIO_printf(bio_err, " -rand file:file:...\n");
 		BIO_printf(bio_err, "           - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err, "             the random number generator\n");
 		goto end;
diff --git a/lib/libssl/src/apps/gendsa.c b/lib/libssl/src/apps/gendsa.c
index 9d89cd07cb9..9bfeb4c16b9 100644
--- a/lib/libssl/src/apps/gendsa.c
+++ b/lib/libssl/src/apps/gendsa.c
@@ -188,7 +188,7 @@ bad:
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err, " -engine e - use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, " -rand file%cfile%c...\n", ':', ':');
+		BIO_printf(bio_err, " -rand file:file:...\n");
 		BIO_printf(bio_err, "           - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err, "             the random number generator\n");
 		BIO_printf(bio_err, " dsaparam-file\n");
diff --git a/lib/libssl/src/apps/genrsa.c b/lib/libssl/src/apps/genrsa.c
index 98ab23a571a..fb879acad52 100644
--- a/lib/libssl/src/apps/genrsa.c
+++ b/lib/libssl/src/apps/genrsa.c
@@ -213,7 +213,7 @@ bad:
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err, " -engine e       use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, " -rand file%cfile%c...\n", ':', ':');
+		BIO_printf(bio_err, " -rand file:file:...\n");
 		BIO_printf(bio_err, "                 load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err, "                 the random number generator\n");
 		goto err;
diff --git a/lib/libssl/src/apps/pkcs12.c b/lib/libssl/src/apps/pkcs12.c
index d08f92eae3c..fc61be467b0 100644
--- a/lib/libssl/src/apps/pkcs12.c
+++ b/lib/libssl/src/apps/pkcs12.c
@@ -375,7 +375,7 @@ pkcs12_main(int argc, char **argv)
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err, "-engine e     use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, "-rand file%cfile%c...\n", ':', ':');
+		BIO_printf(bio_err, "-rand file:file:...\n");
 		BIO_printf(bio_err, "              load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err, "              the random number generator\n");
 		BIO_printf(bio_err, "-CSP name     Microsoft CSP name\n");
diff --git a/lib/libssl/src/apps/rand.c b/lib/libssl/src/apps/rand.c
index 6bb8bfb45dd..96d2b4e26ca 100644
--- a/lib/libssl/src/apps/rand.c
+++ b/lib/libssl/src/apps/rand.c
@@ -153,7 +153,7 @@ rand_main(int argc, char **argv)
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n", ':', ':');
+		BIO_printf(bio_err, "-rand file:file:... - seed PRNG from files\n");
 		BIO_printf(bio_err, "-base64               - base64 encode output\n");
 		BIO_printf(bio_err, "-hex                  - hex encode output\n");
 		goto err;
diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c
index 41911bcd246..4290548de51 100644
--- a/lib/libssl/src/apps/s_client.c
+++ b/lib/libssl/src/apps/s_client.c
@@ -339,7 +339,7 @@ sc_usage(void)
 #ifndef OPENSSL_NO_ENGINE
 	BIO_printf(bio_err, " -engine id    - Initialise and use the specified engine\n");
 #endif
-	BIO_printf(bio_err, " -rand file%cfile%c...\n", ':', ':');
+	BIO_printf(bio_err, " -rand file:file:...\n");
 	BIO_printf(bio_err, " -sess_out arg - file to write SSL session to\n");
 	BIO_printf(bio_err, " -sess_in arg  - file to read SSL session from\n");
 #ifndef OPENSSL_NO_TLSEXT
diff --git a/lib/libssl/src/apps/s_server.c b/lib/libssl/src/apps/s_server.c
index ebe205c4ab1..27925b492d9 100644
--- a/lib/libssl/src/apps/s_server.c
+++ b/lib/libssl/src/apps/s_server.c
@@ -515,7 +515,7 @@ sv_usage(void)
 	BIO_printf(bio_err, " -engine id    - Initialise and use the specified engine\n");
 #endif
 	BIO_printf(bio_err, " -id_prefix arg - Generate SSL/TLS session IDs prefixed by 'arg'\n");
-	BIO_printf(bio_err, " -rand file%cfile%c...\n", ':', ':');
+	BIO_printf(bio_err, " -rand file:file:...\n");
 #ifndef OPENSSL_NO_TLSEXT
 	BIO_printf(bio_err, " -servername host - servername for HostName TLS extension\n");
 	BIO_printf(bio_err, " -servername_fatal - on mismatch send fatal alert (default warning alert)\n");
diff --git a/lib/libssl/src/apps/smime.c b/lib/libssl/src/apps/smime.c
index 22b28ce4b31..4c0e32ccba9 100644
--- a/lib/libssl/src/apps/smime.c
+++ b/lib/libssl/src/apps/smime.c
@@ -427,7 +427,7 @@ argerr:
 		BIO_printf(bio_err, "-engine e      use engine e, possibly a hardware device.\n");
 #endif
 		BIO_printf(bio_err, "-passin arg    input file pass phrase source\n");
-		BIO_printf(bio_err, "-rand file%cfile%c...\n", ':', ':');
+		BIO_printf(bio_err, "-rand file:file:...\n");
 		BIO_printf(bio_err, "               load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err, "               the random number generator\n");
 		BIO_printf(bio_err, "cert.pem       recipient certificate(s) for encryption\n");
diff --git a/lib/libssl/src/apps/srp.c b/lib/libssl/src/apps/srp.c
index d68dc6c03ab..a7bdcef0c99 100644
--- a/lib/libssl/src/apps/srp.c
+++ b/lib/libssl/src/apps/srp.c
@@ -388,7 +388,7 @@ srp_main(int argc, char **argv)
 		for (pp = srp_usage; (*pp != NULL); pp++)
 			BIO_printf(bio_err, "%s", *pp);
 
-		BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err, " -rand file:file:...\n");
 		BIO_printf(bio_err, "                 load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err, "                 the random number generator\n");
 		goto err;
diff --git a/lib/libssl/src/apps/ts.c b/lib/libssl/src/apps/ts.c
index 9d116ffac2f..24e34894fda 100644
--- a/lib/libssl/src/apps/ts.c
+++ b/lib/libssl/src/apps/ts.c
@@ -330,12 +330,11 @@ ts_main(int argc, char **argv)
 
 usage:
 	BIO_printf(bio_err, "usage:\n"
-	    "ts -query [-rand file%cfile%c...] [-config configfile] "
+	    "ts -query [-rand file:file:...] [-config configfile] "
 	    "[-data file_to_hash] [-digest digest_bytes]"
 	    "[-md2|-md4|-md5|-sha|-sha1|-mdc2|-ripemd160] "
 	    "[-policy object_id] [-no_nonce] [-cert] "
-	    "[-in request.tsq] [-out request.tsq] [-text]\n",
-	    ':', ':');
+	    "[-in request.tsq] [-out request.tsq] [-text]\n");
 	BIO_printf(bio_err, "or\n"
 	    "ts -reply [-config configfile] [-section tsa_section] "
 	    "[-queryfile request.tsq] [-passin password] "