diff options
author | tb <> | 2022-12-01 13:49:12 +0000 |
---|---|---|
committer | tb <> | 2022-12-01 13:49:12 +0000 |
commit | c36581ceccff1012990506e217c7be4b1aff5235 (patch) | |
tree | 2cb45cb780bc8387ff69684fdf79b9d9c81f26ae /src | |
parent | f416f6aa9cd97f7a0e135e3983f377e9c20a8d6c (diff) | |
download | openbsd-c36581ceccff1012990506e217c7be4b1aff5235.tar.gz openbsd-c36581ceccff1012990506e217c7be4b1aff5235.tar.bz2 openbsd-c36581ceccff1012990506e217c7be4b1aff5235.zip |
Refrain from printing SUCCESS in some of my tests
Silence is good. On failure, the regress framework will make it clear.
Diffstat (limited to 'src')
13 files changed, 16 insertions, 50 deletions
diff --git a/src/regress/lib/libcrypto/bn/general/bn_isqrt.c b/src/regress/lib/libcrypto/bn/general/bn_isqrt.c index 8ea9cead77..b0ec80b939 100644 --- a/src/regress/lib/libcrypto/bn/general/bn_isqrt.c +++ b/src/regress/lib/libcrypto/bn/general/bn_isqrt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_isqrt.c,v 1.8 2022/11/26 16:08:56 tb Exp $ */ | 1 | /* $OpenBSD: bn_isqrt.c,v 1.9 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -323,8 +323,5 @@ main(int argc, char *argv[]) | |||
323 | failed |= check_tables(0); | 323 | failed |= check_tables(0); |
324 | failed |= validate_tables(); | 324 | failed |= validate_tables(); |
325 | 325 | ||
326 | if (!failed) | ||
327 | printf("SUCCESS\n"); | ||
328 | |||
329 | return failed; | 326 | return failed; |
330 | } | 327 | } |
diff --git a/src/regress/lib/libcrypto/bn/general/bn_mod_exp2_mont.c b/src/regress/lib/libcrypto/bn/general/bn_mod_exp2_mont.c index 60bb010b62..f0ebfcbac1 100644 --- a/src/regress/lib/libcrypto/bn/general/bn_mod_exp2_mont.c +++ b/src/regress/lib/libcrypto/bn/general/bn_mod_exp2_mont.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_mod_exp2_mont.c,v 1.1 2022/03/10 04:39:49 tb Exp $ */ | 1 | /* $OpenBSD: bn_mod_exp2_mont.c,v 1.2 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -39,7 +39,5 @@ main(void) | |||
39 | 39 | ||
40 | BN_free(m); | 40 | BN_free(m); |
41 | 41 | ||
42 | printf("SUCCESS\n"); | ||
43 | |||
44 | return 0; | 42 | return 0; |
45 | } | 43 | } |
diff --git a/src/regress/lib/libcrypto/bn/general/bn_mod_sqrt.c b/src/regress/lib/libcrypto/bn/general/bn_mod_sqrt.c index 2017492e2b..71e27a36e1 100644 --- a/src/regress/lib/libcrypto/bn/general/bn_mod_sqrt.c +++ b/src/regress/lib/libcrypto/bn/general/bn_mod_sqrt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_mod_sqrt.c,v 1.1 2022/03/15 16:28:42 tb Exp $ */ | 1 | /* $OpenBSD: bn_mod_sqrt.c,v 1.2 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -125,8 +125,5 @@ main(void) | |||
125 | for (i = 0; i < N_TESTS; i++) | 125 | for (i = 0; i < N_TESTS; i++) |
126 | failed |= mod_sqrt_test(&mod_sqrt_test_data[i]); | 126 | failed |= mod_sqrt_test(&mod_sqrt_test_data[i]); |
127 | 127 | ||
128 | if (!failed) | ||
129 | printf("SUCCESS\n"); | ||
130 | |||
131 | return failed; | 128 | return failed; |
132 | } | 129 | } |
diff --git a/src/regress/lib/libcrypto/bn/general/bn_primes.c b/src/regress/lib/libcrypto/bn/general/bn_primes.c index c61cdb34b8..cf13db6f8e 100644 --- a/src/regress/lib/libcrypto/bn/general/bn_primes.c +++ b/src/regress/lib/libcrypto/bn/general/bn_primes.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_primes.c,v 1.2 2022/11/09 23:28:08 tb Exp $ */ | 1 | /* $OpenBSD: bn_primes.c,v 1.3 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -84,7 +84,5 @@ main(void) | |||
84 | failed |= test_bn_is_prime_fasttest(0); | 84 | failed |= test_bn_is_prime_fasttest(0); |
85 | failed |= test_bn_is_prime_fasttest(1); | 85 | failed |= test_bn_is_prime_fasttest(1); |
86 | 86 | ||
87 | printf("%s\n", failed ? "FAILED" : "SUCCESS"); | ||
88 | |||
89 | return failed; | 87 | return failed; |
90 | } | 88 | } |
diff --git a/src/regress/lib/libcrypto/bn/general/bn_to_string.c b/src/regress/lib/libcrypto/bn/general/bn_to_string.c index 60b3ea3137..901fa98610 100644 --- a/src/regress/lib/libcrypto/bn/general/bn_to_string.c +++ b/src/regress/lib/libcrypto/bn/general/bn_to_string.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_to_string.c,v 1.1 2019/04/13 22:06:31 tb Exp $ */ | 1 | /* $OpenBSD: bn_to_string.c,v 1.2 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -111,6 +111,5 @@ main(int argc, char *argv[]) | |||
111 | 111 | ||
112 | BN_free(bn); | 112 | BN_free(bn); |
113 | 113 | ||
114 | printf("%s\n", failed ? "FAILED" : "SUCCESS"); | ||
115 | return failed; | 114 | return failed; |
116 | } | 115 | } |
diff --git a/src/regress/lib/libcrypto/bn/general/bn_unit.c b/src/regress/lib/libcrypto/bn/general/bn_unit.c index e84ce481a5..f2b3652f88 100644 --- a/src/regress/lib/libcrypto/bn/general/bn_unit.c +++ b/src/regress/lib/libcrypto/bn/general/bn_unit.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_unit.c,v 1.5 2022/11/25 09:32:10 tb Exp $ */ | 1 | /* $OpenBSD: bn_unit.c,v 1.6 2022/12/01 13:49:12 tb Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> |
@@ -75,8 +75,5 @@ main(void) | |||
75 | 75 | ||
76 | failed |= test_bn_print_null_derefs(); | 76 | failed |= test_bn_print_null_derefs(); |
77 | 77 | ||
78 | if (!failed) | ||
79 | printf("SUCCESS\n"); | ||
80 | |||
81 | return failed; | 78 | return failed; |
82 | } | 79 | } |
diff --git a/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c b/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c index 409d65740b..8cd552734c 100644 --- a/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c +++ b/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bn_rand_interval.c,v 1.5 2022/06/19 17:10:02 tb Exp $ */ | 1 | /* $OpenBSD: bn_rand_interval.c,v 1.6 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -104,11 +104,6 @@ main(int argc, char *argv[]) | |||
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | if (success == 1) | ||
108 | printf("SUCCESS\n"); | ||
109 | else | ||
110 | printf("FAIL"); | ||
111 | |||
112 | BN_free(a); | 107 | BN_free(a); |
113 | BN_free(b); | 108 | BN_free(b); |
114 | BN_free(x); | 109 | BN_free(x); |
diff --git a/src/regress/lib/libcrypto/ec/ec_point_conversion.c b/src/regress/lib/libcrypto/ec/ec_point_conversion.c index 8327ac4336..04177a0e87 100644 --- a/src/regress/lib/libcrypto/ec/ec_point_conversion.c +++ b/src/regress/lib/libcrypto/ec/ec_point_conversion.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_point_conversion.c,v 1.6 2021/12/29 22:48:09 tb Exp $ */ | 1 | /* $OpenBSD: ec_point_conversion.c,v 1.7 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2021 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2021 Theo Buehler <tb@openbsd.org> |
4 | * Copyright (c) 2021 Joel Sing <jsing@openbsd.org> | 4 | * Copyright (c) 2021 Joel Sing <jsing@openbsd.org> |
@@ -134,7 +134,7 @@ test_hybrid_corner_case(void) | |||
134 | for (i = 0; i < N_FORMS; i++) | 134 | for (i = 0; i < N_FORMS; i++) |
135 | failed |= roundtrip(group, point, forms[i], x, y); | 135 | failed |= roundtrip(group, point, forms[i], x, y); |
136 | 136 | ||
137 | fprintf(stderr, "%s: %s\n", __func__, failed ? "FAILED" : "SUCCESS"); | 137 | fprintf(stderr, "%s %s\n", __func__, failed ? ": FAILED" : ""); |
138 | 138 | ||
139 | EC_GROUP_free(group); | 139 | EC_GROUP_free(group); |
140 | EC_POINT_free(point); | 140 | EC_POINT_free(point); |
@@ -229,7 +229,7 @@ test_random_points(void) | |||
229 | for (curve_id = 0; curve_id < ncurves; curve_id++) | 229 | for (curve_id = 0; curve_id < ncurves; curve_id++) |
230 | failed |= test_random_points_on_curve(&all_curves[curve_id]); | 230 | failed |= test_random_points_on_curve(&all_curves[curve_id]); |
231 | 231 | ||
232 | fprintf(stderr, "%s: %s\n", __func__, failed ? "FAILED" : "SUCCESS"); | 232 | fprintf(stderr, "%s %s\n", __func__, failed ? ": FAILED" : ""); |
233 | 233 | ||
234 | free(all_curves); | 234 | free(all_curves); |
235 | return failed; | 235 | return failed; |
@@ -869,7 +869,7 @@ test_point_conversions(void) | |||
869 | for (i = 0; i < N_POINT_CONVERSIONS; i++) | 869 | for (i = 0; i < N_POINT_CONVERSIONS; i++) |
870 | failed |= point_conversion_form_y_bit(&point_conversions[i]); | 870 | failed |= point_conversion_form_y_bit(&point_conversions[i]); |
871 | 871 | ||
872 | fprintf(stderr, "%s: %s\n", __func__, failed ? "FAILED" : "SUCCESS"); | 872 | fprintf(stderr, "%s %s\n", __func__, failed ? ": FAILED" : ""); |
873 | 873 | ||
874 | return failed; | 874 | return failed; |
875 | } | 875 | } |
@@ -883,7 +883,5 @@ main(int argc, char **argv) | |||
883 | failed |= test_hybrid_corner_case(); | 883 | failed |= test_hybrid_corner_case(); |
884 | failed |= test_point_conversions(); | 884 | failed |= test_point_conversions(); |
885 | 885 | ||
886 | fprintf(stderr, "%s\n", failed ? "FAILED" : "SUCCESS"); | ||
887 | |||
888 | return failed; | 886 | return failed; |
889 | } | 887 | } |
diff --git a/src/regress/lib/libcrypto/evp/evp_pkey_check.c b/src/regress/lib/libcrypto/evp/evp_pkey_check.c index db26d3aa46..a186347736 100644 --- a/src/regress/lib/libcrypto/evp/evp_pkey_check.c +++ b/src/regress/lib/libcrypto/evp/evp_pkey_check.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_pkey_check.c,v 1.2 2022/01/11 19:27:35 tb Exp $ */ | 1 | /* $OpenBSD: evp_pkey_check.c,v 1.3 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2021-2022 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2021-2022 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -398,7 +398,5 @@ main(void) | |||
398 | failed |= evp_pkey_check_rsa(); | 398 | failed |= evp_pkey_check_rsa(); |
399 | failed |= evp_pkey_check_ec(); | 399 | failed |= evp_pkey_check_ec(); |
400 | 400 | ||
401 | printf("%s\n", failed ? "FAILED" : "SUCCESS"); | ||
402 | |||
403 | return failed; | 401 | return failed; |
404 | } | 402 | } |
diff --git a/src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c b/src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c index 20a385588e..fd922efb09 100644 --- a/src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c +++ b/src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_pkey_cleanup.c,v 1.2 2022/11/26 16:08:56 tb Exp $ */ | 1 | /* $OpenBSD: evp_pkey_cleanup.c,v 1.3 2022/12/01 13:49:12 tb Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> |
@@ -79,8 +79,5 @@ main(void) | |||
79 | for (i = 0; i < N_PKEY_IDS; i++) | 79 | for (i = 0; i < N_PKEY_IDS; i++) |
80 | failed |= test_evp_pkey_ctx_cleanup(pkey_ids[i]); | 80 | failed |= test_evp_pkey_ctx_cleanup(pkey_ids[i]); |
81 | 81 | ||
82 | if (!failed) | ||
83 | printf("SUCCESS\n"); | ||
84 | |||
85 | return failed; | 82 | return failed; |
86 | } | 83 | } |
diff --git a/src/regress/lib/libcrypto/wycheproof/wycheproof-primes.c b/src/regress/lib/libcrypto/wycheproof/wycheproof-primes.c index 669531d135..57bd7a53da 100644 --- a/src/regress/lib/libcrypto/wycheproof/wycheproof-primes.c +++ b/src/regress/lib/libcrypto/wycheproof/wycheproof-primes.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: wycheproof-primes.c,v 1.1 2022/07/07 20:01:20 tb Exp $ */ | 1 | /* $OpenBSD: wycheproof-primes.c,v 1.2 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2022 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -57,7 +57,5 @@ main(void) | |||
57 | for (i = 0; i < N_TESTS; i++) | 57 | for (i = 0; i < N_TESTS; i++) |
58 | failed |= primality_test(&testcases[i]); | 58 | failed |= primality_test(&testcases[i]); |
59 | 59 | ||
60 | printf("%s\n", failed ? "FAILED" : "SUCCESS"); | ||
61 | |||
62 | return failed; | 60 | return failed; |
63 | } | 61 | } |
diff --git a/src/regress/lib/libssl/handshake/handshake_table.c b/src/regress/lib/libssl/handshake/handshake_table.c index b316734524..8ebed9a73e 100644 --- a/src/regress/lib/libssl/handshake/handshake_table.c +++ b/src/regress/lib/libssl/handshake/handshake_table.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: handshake_table.c,v 1.17 2022/03/08 16:59:25 tb Exp $ */ | 1 | /* $OpenBSD: handshake_table.c,v 1.18 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -546,8 +546,5 @@ main(int argc, char *argv[]) | |||
546 | if (!verify_table(hs_table, print)) | 546 | if (!verify_table(hs_table, print)) |
547 | return 1; | 547 | return 1; |
548 | 548 | ||
549 | if (!print) | ||
550 | printf("SUCCESS\n"); | ||
551 | |||
552 | return 0; | 549 | return 0; |
553 | } | 550 | } |
diff --git a/src/regress/lib/libssl/handshake/valid_handshakes_terminate.c b/src/regress/lib/libssl/handshake/valid_handshakes_terminate.c index 5f0e4f2c18..286b860a7d 100644 --- a/src/regress/lib/libssl/handshake/valid_handshakes_terminate.c +++ b/src/regress/lib/libssl/handshake/valid_handshakes_terminate.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: valid_handshakes_terminate.c,v 1.3 2019/04/05 20:25:42 tb Exp $ */ | 1 | /* $OpenBSD: valid_handshakes_terminate.c,v 1.4 2022/12/01 13:49:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -50,8 +50,5 @@ main(int argc, char *argv[]) | |||
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | if (!fail) | ||
54 | printf("SUCCESS\n"); | ||
55 | |||
56 | return fail; | 53 | return fail; |
57 | } | 54 | } |