summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-02-23 14:55:54 +0000
committertb <>2023-02-23 14:55:54 +0000
commit8f4cd3e0e032f13354ee58ce3544243dfb8b9553 (patch)
treeeb5a617eed6a31df27cd8267e28c1991e80ced7d
parente8192f57c4e5910ce7badced4a24c8827810d567 (diff)
downloadopenbsd-8f4cd3e0e032f13354ee58ce3544243dfb8b9553.tar.gz
openbsd-8f4cd3e0e032f13354ee58ce3544243dfb8b9553.tar.bz2
openbsd-8f4cd3e0e032f13354ee58ce3544243dfb8b9553.zip
openssl speed: avoid bad plural
Remedy a case of twitching eyes caused by seeing "Doing ... rsa's for 10s". If this breaks someone's script, so be it. ok jsing sthen
-rw-r--r--src/usr.bin/openssl/speed.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c
index 1db42ca4f5..ce350aaeba 100644
--- a/src/usr.bin/openssl/speed.c
+++ b/src/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: speed.c,v 1.29 2022/11/11 17:07:39 joshua Exp $ */ 1/* $OpenBSD: speed.c,v 1.30 2023/02/23 14:55:54 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1515,7 +1515,7 @@ speed_main(int argc, char **argv)
1515 } 1515 }
1516 d = Time_F(STOP); 1516 d = Time_F(STOP);
1517 BIO_printf(bio_err, mr ? "+R1:%ld:%d:%.2f\n" 1517 BIO_printf(bio_err, mr ? "+R1:%ld:%d:%.2f\n"
1518 : "%ld %d bit private RSA's in %.2fs\n", 1518 : "%ld %d bit private RSA in %.2fs\n",
1519 count, rsa_bits[j], d); 1519 count, rsa_bits[j], d);
1520 rsa_results[j][0] = d / (double) count; 1520 rsa_results[j][0] = d / (double) count;
1521 rsa_count = count; 1521 rsa_count = count;
@@ -1544,7 +1544,7 @@ speed_main(int argc, char **argv)
1544 } 1544 }
1545 d = Time_F(STOP); 1545 d = Time_F(STOP);
1546 BIO_printf(bio_err, mr ? "+R2:%ld:%d:%.2f\n" 1546 BIO_printf(bio_err, mr ? "+R2:%ld:%d:%.2f\n"
1547 : "%ld %d bit public RSA's in %.2fs\n", 1547 : "%ld %d bit public RSA in %.2fs\n",
1548 count, rsa_bits[j], d); 1548 count, rsa_bits[j], d);
1549 rsa_results[j][1] = d / (double) count; 1549 rsa_results[j][1] = d / (double) count;
1550 } 1550 }
@@ -1970,7 +1970,7 @@ pkey_print_message(const char *str, const char *str2, long num,
1970 int bits, int tm) 1970 int bits, int tm)
1971{ 1971{
1972 BIO_printf(bio_err, mr ? "+DTP:%d:%s:%s:%d\n" 1972 BIO_printf(bio_err, mr ? "+DTP:%d:%s:%s:%d\n"
1973 : "Doing %d bit %s %s's for %ds: ", bits, str, str2, tm); 1973 : "Doing %d bit %s %s for %ds: ", bits, str, str2, tm);
1974 (void) BIO_flush(bio_err); 1974 (void) BIO_flush(bio_err);
1975 alarm(tm); 1975 alarm(tm);
1976} 1976}
@@ -1979,7 +1979,7 @@ static void
1979print_result(int alg, int run_no, int count, double time_used) 1979print_result(int alg, int run_no, int count, double time_used)
1980{ 1980{
1981 BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n" 1981 BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n"
1982 : "%d %s's in %.2fs\n", count, names[alg], time_used); 1982 : "%d %s in %.2fs\n", count, names[alg], time_used);
1983 results[alg][run_no] = ((double) count) / time_used * lengths[run_no]; 1983 results[alg][run_no] = ((double) count) / time_used * lengths[run_no];
1984} 1984}
1985 1985