summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranton <>2024-08-23 12:56:26 +0000
committeranton <>2024-08-23 12:56:26 +0000
commit56917f3bcb61bebc42b4cdbb89e6e6bdefe00e06 (patch)
tree82c161d2c7fabe4bd4e52ad455006b0476f08e3e
parent9f36be6501ec7fb1d11687ff58c3e992193af31e (diff)
downloadopenbsd-56917f3bcb61bebc42b4cdbb89e6e6bdefe00e06.tar.gz
openbsd-56917f3bcb61bebc42b4cdbb89e6e6bdefe00e06.tar.bz2
openbsd-56917f3bcb61bebc42b4cdbb89e6e6bdefe00e06.zip
Remove unwanted trailing newlines from err/warn format strings.
-rw-r--r--src/regress/lib/libcrypto/bn/bn_mod_sqrt.c4
-rw-r--r--src/regress/lib/libcrypto/bn/bn_word.c10
-rw-r--r--src/regress/lib/libcrypto/x509/callback.c4
-rw-r--r--src/regress/lib/libcrypto/x509/callbackfailures.c4
-rw-r--r--src/regress/lib/libcrypto/x509/expirecallback.c4
-rw-r--r--src/regress/lib/libcrypto/x509/policy/policy.c4
-rw-r--r--src/regress/lib/libcrypto/x509/verify.c4
-rw-r--r--src/regress/lib/libssl/key_schedule/key_schedule.c4
8 files changed, 19 insertions, 19 deletions
diff --git a/src/regress/lib/libcrypto/bn/bn_mod_sqrt.c b/src/regress/lib/libcrypto/bn/bn_mod_sqrt.c
index 7ab7905136..345ab4cb61 100644
--- a/src/regress/lib/libcrypto/bn/bn_mod_sqrt.c
+++ b/src/regress/lib/libcrypto/bn/bn_mod_sqrt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn_mod_sqrt.c,v 1.10 2023/04/11 10:10:52 tb Exp $ */ 1/* $OpenBSD: bn_mod_sqrt.c,v 1.11 2024/08/23 12:56:26 anton Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2022,2023 Theo Buehler <tb@openbsd.org> 4 * Copyright (c) 2022,2023 Theo Buehler <tb@openbsd.org>
@@ -2865,7 +2865,7 @@ mod_sqrt_test(struct mod_sqrt_test *test, BN_CTX *ctx)
2865 if (!BN_hex2bn(&want, test->sqrt)) 2865 if (!BN_hex2bn(&want, test->sqrt))
2866 errx(1, "BN_hex2bn(%s)", test->sqrt); 2866 errx(1, "BN_hex2bn(%s)", test->sqrt);
2867 if (!BN_mod_sub(diff, want, got, p, ctx)) 2867 if (!BN_mod_sub(diff, want, got, p, ctx))
2868 errx(1, "BN_mod_sub() failed\n"); 2868 errx(1, "BN_mod_sub() failed");
2869 2869
2870 if (!BN_is_zero(diff)) { 2870 if (!BN_is_zero(diff)) {
2871 fprintf(stderr, "a: %s\n", test->a); 2871 fprintf(stderr, "a: %s\n", test->a);
diff --git a/src/regress/lib/libcrypto/bn/bn_word.c b/src/regress/lib/libcrypto/bn/bn_word.c
index 0a543add97..2ec518ed1b 100644
--- a/src/regress/lib/libcrypto/bn/bn_word.c
+++ b/src/regress/lib/libcrypto/bn/bn_word.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn_word.c,v 1.1 2023/03/11 14:04:21 jsing Exp $ */ 1/* $OpenBSD: bn_word.c,v 1.2 2024/08/23 12:56:26 anton Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2023 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -51,7 +51,7 @@ check_bn_word_test(const char *op_name, const BIGNUM *bn,
51 } 51 }
52 52
53 if ((out_hex = BN_bn2hex(bn)) == NULL) 53 if ((out_hex = BN_bn2hex(bn)) == NULL)
54 errx(1, "BN_bn2hex() failed\n"); 54 errx(1, "BN_bn2hex() failed");
55 55
56 if (strcmp(out_hex, bwt->out_hex) != 0) { 56 if (strcmp(out_hex, bwt->out_hex) != 0) {
57 fprintf(stderr, "FAIL %s: Got hex %s, want %s\n", 57 fprintf(stderr, "FAIL %s: Got hex %s, want %s\n",
@@ -82,7 +82,7 @@ test_bn_word(int (*bn_word_op)(BIGNUM *, BN_ULONG), const char *op_name,
82 int failed = 0; 82 int failed = 0;
83 83
84 if ((bn = BN_new()) == NULL) 84 if ((bn = BN_new()) == NULL)
85 errx(1, "BN_new() failed\n"); 85 errx(1, "BN_new() failed");
86 86
87 for (i = 0; i < num_tests; i++) { 87 for (i = 0; i < num_tests; i++) {
88 bwt = &bwts[i]; 88 bwt = &bwts[i];
@@ -428,7 +428,7 @@ test_bn_div_word(void)
428 int failed = 0; 428 int failed = 0;
429 429
430 if ((bn = BN_new()) == NULL) 430 if ((bn = BN_new()) == NULL)
431 errx(1, "BN_new() failed\n"); 431 errx(1, "BN_new() failed");
432 432
433 for (i = 0; i < N_BN_DIV_WORD_TESTS; i++) { 433 for (i = 0; i < N_BN_DIV_WORD_TESTS; i++) {
434 bwt = &bn_div_word_tests[i]; 434 bwt = &bn_div_word_tests[i];
@@ -574,7 +574,7 @@ test_bn_mod_word(void)
574 int failed = 0; 574 int failed = 0;
575 575
576 if ((bn = BN_new()) == NULL) 576 if ((bn = BN_new()) == NULL)
577 errx(1, "BN_new() failed\n"); 577 errx(1, "BN_new() failed");
578 578
579 for (i = 0; i < N_BN_MOD_WORD_TESTS; i++) { 579 for (i = 0; i < N_BN_MOD_WORD_TESTS; i++) {
580 bwt = &bn_mod_word_tests[i]; 580 bwt = &bn_mod_word_tests[i];
diff --git a/src/regress/lib/libcrypto/x509/callback.c b/src/regress/lib/libcrypto/x509/callback.c
index a01ffd5d6f..c4d1575ae8 100644
--- a/src/regress/lib/libcrypto/x509/callback.c
+++ b/src/regress/lib/libcrypto/x509/callback.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: callback.c,v 1.4 2023/01/28 19:12:20 tb Exp $ */ 1/* $OpenBSD: callback.c,v 1.5 2024/08/23 12:56:26 anton Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -158,7 +158,7 @@ verify_cert(const char *roots_dir, const char *roots_file,
158 158
159 verify_err = X509_STORE_CTX_get_error(xsc); 159 verify_err = X509_STORE_CTX_get_error(xsc);
160 if (verify_err == 0) 160 if (verify_err == 0)
161 errx(1, "Error unset on failure!\n"); 161 errx(1, "Error unset on failure!");
162 162
163 fprintf(stderr, "failed to verify at %d: %s\n", 163 fprintf(stderr, "failed to verify at %d: %s\n",
164 X509_STORE_CTX_get_error_depth(xsc), 164 X509_STORE_CTX_get_error_depth(xsc),
diff --git a/src/regress/lib/libcrypto/x509/callbackfailures.c b/src/regress/lib/libcrypto/x509/callbackfailures.c
index 53570e1532..9230122146 100644
--- a/src/regress/lib/libcrypto/x509/callbackfailures.c
+++ b/src/regress/lib/libcrypto/x509/callbackfailures.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: callbackfailures.c,v 1.2 2023/01/28 19:12:20 tb Exp $ */ 1/* $OpenBSD: callbackfailures.c,v 1.3 2024/08/23 12:56:26 anton Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -167,7 +167,7 @@ verify_cert(const char *roots_dir, const char *roots_file,
167 167
168 verify_err = X509_STORE_CTX_get_error(xsc); 168 verify_err = X509_STORE_CTX_get_error(xsc);
169 if (verify_err == 0) 169 if (verify_err == 0)
170 errx(1, "Error unset on failure!\n"); 170 errx(1, "Error unset on failure!");
171 171
172 fprintf(stderr, "failed to verify at %d: %s\n", 172 fprintf(stderr, "failed to verify at %d: %s\n",
173 X509_STORE_CTX_get_error_depth(xsc), 173 X509_STORE_CTX_get_error_depth(xsc),
diff --git a/src/regress/lib/libcrypto/x509/expirecallback.c b/src/regress/lib/libcrypto/x509/expirecallback.c
index 88cef6fd01..bd3f568f86 100644
--- a/src/regress/lib/libcrypto/x509/expirecallback.c
+++ b/src/regress/lib/libcrypto/x509/expirecallback.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: expirecallback.c,v 1.3 2023/01/28 19:12:20 tb Exp $ */ 1/* $OpenBSD: expirecallback.c,v 1.4 2024/08/23 12:56:26 anton Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -172,7 +172,7 @@ verify_cert(const char *roots_dir, const char *roots_file,
172 } 172 }
173 173
174 if (*error == 0) 174 if (*error == 0)
175 errx(1, "Error unset on failure!\n"); 175 errx(1, "Error unset on failure!");
176 176
177 fprintf(stderr, "failed to verify at %d: %s\n", 177 fprintf(stderr, "failed to verify at %d: %s\n",
178 *error_depth, X509_verify_cert_error_string(*error)); 178 *error_depth, X509_verify_cert_error_string(*error));
diff --git a/src/regress/lib/libcrypto/x509/policy/policy.c b/src/regress/lib/libcrypto/x509/policy/policy.c
index f5c9700b2b..17ac78dd23 100644
--- a/src/regress/lib/libcrypto/x509/policy/policy.c
+++ b/src/regress/lib/libcrypto/x509/policy/policy.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: policy.c,v 1.12 2023/06/02 08:35:10 tb Exp $ */ 1/* $OpenBSD: policy.c,v 1.13 2024/08/23 12:56:26 anton Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2023 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2023 Bob Beck <beck@openbsd.org>
@@ -182,7 +182,7 @@ verify_cert(const char *roots_file, const char *intermediate_file,
182 } 182 }
183 183
184 if (*error == 0) 184 if (*error == 0)
185 errx(1, "Error unset on failure!\n"); 185 errx(1, "Error unset on failure!");
186 186
187 fprintf(stderr, "failed to verify at %d: %s\n", 187 fprintf(stderr, "failed to verify at %d: %s\n",
188 *error_depth, X509_verify_cert_error_string(*error)); 188 *error_depth, X509_verify_cert_error_string(*error));
diff --git a/src/regress/lib/libcrypto/x509/verify.c b/src/regress/lib/libcrypto/x509/verify.c
index e49180f7f1..b4b4e06cf7 100644
--- a/src/regress/lib/libcrypto/x509/verify.c
+++ b/src/regress/lib/libcrypto/x509/verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: verify.c,v 1.11 2023/01/28 19:12:20 tb Exp $ */ 1/* $OpenBSD: verify.c,v 1.12 2024/08/23 12:56:26 anton Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -162,7 +162,7 @@ verify_cert(const char *roots_dir, const char *roots_file,
162 } 162 }
163 163
164 if (*error == 0) 164 if (*error == 0)
165 errx(1, "Error unset on failure!\n"); 165 errx(1, "Error unset on failure!");
166 166
167 fprintf(stderr, "failed to verify at %d: %s\n", 167 fprintf(stderr, "failed to verify at %d: %s\n",
168 *error_depth, X509_verify_cert_error_string(*error)); 168 *error_depth, X509_verify_cert_error_string(*error));
diff --git a/src/regress/lib/libssl/key_schedule/key_schedule.c b/src/regress/lib/libssl/key_schedule/key_schedule.c
index f937d042c4..cbf5ea9df7 100644
--- a/src/regress/lib/libssl/key_schedule/key_schedule.c
+++ b/src/regress/lib/libssl/key_schedule/key_schedule.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key_schedule.c,v 1.10 2022/11/26 16:08:56 tb Exp $ */ 1/* $OpenBSD: key_schedule.c,v 1.11 2024/08/23 12:56:26 anton Exp $ */
2/* 2/*
3 * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -188,7 +188,7 @@ main (int argc, char **argv)
188 struct tls13_secrets *secrets; 188 struct tls13_secrets *secrets;
189 189
190 if ((secrets = tls13_secrets_create(EVP_sha256(), 0)) == NULL) 190 if ((secrets = tls13_secrets_create(EVP_sha256(), 0)) == NULL)
191 errx(1,"failed to create secrets\n"); 191 errx(1, "failed to create secrets");
192 192
193 secrets->insecure = 1; /* don't explicit_bzero when done */ 193 secrets->insecure = 1; /* don't explicit_bzero when done */
194 194