diff options
author | tb <> | 2020-05-24 20:01:58 +0000 |
---|---|---|
committer | tb <> | 2020-05-24 20:01:58 +0000 |
commit | f11256d96dcd0d3a8ffb2a69809876112aff58d0 (patch) | |
tree | b8ab07cac7a55b0d49915f30eb337350ea288368 /src | |
parent | 6b123c2514b62068e195a1c693bfc13d5b796a74 (diff) | |
download | openbsd-f11256d96dcd0d3a8ffb2a69809876112aff58d0.tar.gz openbsd-f11256d96dcd0d3a8ffb2a69809876112aff58d0.tar.bz2 openbsd-f11256d96dcd0d3a8ffb2a69809876112aff58d0.zip |
Previous commit caught a few errx() cases by accident. undo them.
Diffstat (limited to 'src')
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index 171c77580f..fe500a9d6f 100644 --- a/src/regress/lib/libssl/tlsext/tlsexttest.c +++ b/src/regress/lib/libssl/tlsext/tlsexttest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tlsexttest.c,v 1.39 2020/05/24 15:10:06 tb Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.40 2020/05/24 20:01:58 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
@@ -169,7 +169,7 @@ test_tlsext_alpn_client(void) | |||
169 | goto err; | 169 | goto err; |
170 | } | 170 | } |
171 | if (!CBB_finish(&cbb, &data, &dlen)) | 171 | if (!CBB_finish(&cbb, &data, &dlen)) |
172 | errx(1, "failed to finish CBB\n"); | 172 | errx(1, "failed to finish CBB"); |
173 | 173 | ||
174 | if (dlen != sizeof(tlsext_alpn_single_proto)) { | 174 | if (dlen != sizeof(tlsext_alpn_single_proto)) { |
175 | FAIL("got client ALPN with length %zu, " | 175 | FAIL("got client ALPN with length %zu, " |
@@ -241,7 +241,7 @@ test_tlsext_alpn_client(void) | |||
241 | goto err; | 241 | goto err; |
242 | } | 242 | } |
243 | if (!CBB_finish(&cbb, &data, &dlen)) | 243 | if (!CBB_finish(&cbb, &data, &dlen)) |
244 | errx(1, "failed to finish CBB\n"); | 244 | errx(1, "failed to finish CBB"); |
245 | 245 | ||
246 | if (dlen != sizeof(tlsext_alpn_multiple_protos)) { | 246 | if (dlen != sizeof(tlsext_alpn_multiple_protos)) { |
247 | FAIL("got client ALPN with length %zu, " | 247 | FAIL("got client ALPN with length %zu, " |
@@ -364,7 +364,7 @@ test_tlsext_alpn_server(void) | |||
364 | goto err; | 364 | goto err; |
365 | } | 365 | } |
366 | if (!CBB_finish(&cbb, &data, &dlen)) | 366 | if (!CBB_finish(&cbb, &data, &dlen)) |
367 | errx(1, "failed to finish CBB\n"); | 367 | errx(1, "failed to finish CBB"); |
368 | 368 | ||
369 | if (dlen != sizeof(tlsext_alpn_single_proto)) { | 369 | if (dlen != sizeof(tlsext_alpn_single_proto)) { |
370 | FAIL("got client ALPN with length %zu, " | 370 | FAIL("got client ALPN with length %zu, " |
@@ -574,7 +574,7 @@ test_tlsext_supportedgroups_client(void) | |||
574 | } | 574 | } |
575 | 575 | ||
576 | if (!CBB_finish(&cbb, &data, &dlen)) | 576 | if (!CBB_finish(&cbb, &data, &dlen)) |
577 | errx(1, "failed to finish CBB\n"); | 577 | errx(1, "failed to finish CBB"); |
578 | 578 | ||
579 | if (dlen != sizeof(tlsext_supportedgroups_client_default)) { | 579 | if (dlen != sizeof(tlsext_supportedgroups_client_default)) { |
580 | FAIL("got client Ellipticcurves with length %zu, " | 580 | FAIL("got client Ellipticcurves with length %zu, " |
@@ -663,7 +663,7 @@ test_tlsext_supportedgroups_client(void) | |||
663 | } | 663 | } |
664 | 664 | ||
665 | if (!CBB_finish(&cbb, &data, &dlen)) | 665 | if (!CBB_finish(&cbb, &data, &dlen)) |
666 | errx(1, "failed to finish CBB\n"); | 666 | errx(1, "failed to finish CBB"); |
667 | 667 | ||
668 | if (dlen != sizeof(tlsext_supportedgroups_client_nistp192and224)) { | 668 | if (dlen != sizeof(tlsext_supportedgroups_client_nistp192and224)) { |
669 | FAIL("got client Ellipticcurves with length %zu, " | 669 | FAIL("got client Ellipticcurves with length %zu, " |
@@ -879,7 +879,7 @@ test_tlsext_ecpf_client(void) | |||
879 | } | 879 | } |
880 | 880 | ||
881 | if (!CBB_finish(&cbb, &data, &dlen)) | 881 | if (!CBB_finish(&cbb, &data, &dlen)) |
882 | errx(1, "failed to finish CBB\n"); | 882 | errx(1, "failed to finish CBB"); |
883 | 883 | ||
884 | if (dlen != sizeof(tlsext_ecpf_hello_uncompressed)) { | 884 | if (dlen != sizeof(tlsext_ecpf_hello_uncompressed)) { |
885 | FAIL("got client ECPointFormats with length %zu, " | 885 | FAIL("got client ECPointFormats with length %zu, " |
@@ -967,7 +967,7 @@ test_tlsext_ecpf_client(void) | |||
967 | } | 967 | } |
968 | 968 | ||
969 | if (!CBB_finish(&cbb, &data, &dlen)) | 969 | if (!CBB_finish(&cbb, &data, &dlen)) |
970 | errx(1, "failed to finish CBB\n"); | 970 | errx(1, "failed to finish CBB"); |
971 | 971 | ||
972 | if (dlen != sizeof(tlsext_ecpf_hello_prefer_order)) { | 972 | if (dlen != sizeof(tlsext_ecpf_hello_prefer_order)) { |
973 | FAIL("got client ECPointFormats with length %zu, " | 973 | FAIL("got client ECPointFormats with length %zu, " |
@@ -1092,7 +1092,7 @@ test_tlsext_ecpf_server(void) | |||
1092 | } | 1092 | } |
1093 | 1093 | ||
1094 | if (!CBB_finish(&cbb, &data, &dlen)) | 1094 | if (!CBB_finish(&cbb, &data, &dlen)) |
1095 | errx(1, "failed to finish CBB\n"); | 1095 | errx(1, "failed to finish CBB"); |
1096 | 1096 | ||
1097 | if (dlen != sizeof(tlsext_ecpf_hello_uncompressed)) { | 1097 | if (dlen != sizeof(tlsext_ecpf_hello_uncompressed)) { |
1098 | FAIL("got server ECPointFormats with length %zu, " | 1098 | FAIL("got server ECPointFormats with length %zu, " |
@@ -1175,7 +1175,7 @@ test_tlsext_ecpf_server(void) | |||
1175 | } | 1175 | } |
1176 | 1176 | ||
1177 | if (!CBB_finish(&cbb, &data, &dlen)) | 1177 | if (!CBB_finish(&cbb, &data, &dlen)) |
1178 | errx(1, "failed to finish CBB\n"); | 1178 | errx(1, "failed to finish CBB"); |
1179 | 1179 | ||
1180 | if (dlen != sizeof(tlsext_ecpf_hello_prefer_order)) { | 1180 | if (dlen != sizeof(tlsext_ecpf_hello_prefer_order)) { |
1181 | FAIL("got server ECPointFormats with length %zu, " | 1181 | FAIL("got server ECPointFormats with length %zu, " |
@@ -1322,7 +1322,7 @@ test_tlsext_ri_client(void) | |||
1322 | } | 1322 | } |
1323 | 1323 | ||
1324 | if (!CBB_finish(&cbb, &data, &dlen)) | 1324 | if (!CBB_finish(&cbb, &data, &dlen)) |
1325 | errx(1, "failed to finish CBB\n"); | 1325 | errx(1, "failed to finish CBB"); |
1326 | 1326 | ||
1327 | if (dlen != sizeof(tlsext_ri_client)) { | 1327 | if (dlen != sizeof(tlsext_ri_client)) { |
1328 | FAIL("got client RI with length %zu, " | 1328 | FAIL("got client RI with length %zu, " |
@@ -1436,7 +1436,7 @@ test_tlsext_ri_server(void) | |||
1436 | } | 1436 | } |
1437 | 1437 | ||
1438 | if (!CBB_finish(&cbb, &data, &dlen)) | 1438 | if (!CBB_finish(&cbb, &data, &dlen)) |
1439 | errx(1, "failed to finish CBB\n"); | 1439 | errx(1, "failed to finish CBB"); |
1440 | 1440 | ||
1441 | if (dlen != sizeof(tlsext_ri_server)) { | 1441 | if (dlen != sizeof(tlsext_ri_server)) { |
1442 | FAIL("got server RI with length %zu, " | 1442 | FAIL("got server RI with length %zu, " |
@@ -1553,7 +1553,7 @@ test_tlsext_sigalgs_client(void) | |||
1553 | } | 1553 | } |
1554 | 1554 | ||
1555 | if (!CBB_finish(&cbb, &data, &dlen)) | 1555 | if (!CBB_finish(&cbb, &data, &dlen)) |
1556 | errx(1, "failed to finish CBB\n"); | 1556 | errx(1, "failed to finish CBB"); |
1557 | 1557 | ||
1558 | if (dlen != sizeof(tlsext_sigalgs_client)) { | 1558 | if (dlen != sizeof(tlsext_sigalgs_client)) { |
1559 | fprintf(stderr, "FAIL: got client sigalgs with length %zu, " | 1559 | fprintf(stderr, "FAIL: got client sigalgs with length %zu, " |
@@ -1625,7 +1625,7 @@ test_tlsext_sigalgs_server(void) | |||
1625 | } | 1625 | } |
1626 | 1626 | ||
1627 | if (!CBB_finish(&cbb, &data, &dlen)) | 1627 | if (!CBB_finish(&cbb, &data, &dlen)) |
1628 | errx(1, "failed to finish CBB\n"); | 1628 | errx(1, "failed to finish CBB"); |
1629 | 1629 | ||
1630 | CBS_init(&cbs, tlsext_sigalgs_client, sizeof(tlsext_sigalgs_client)); | 1630 | CBS_init(&cbs, tlsext_sigalgs_client, sizeof(tlsext_sigalgs_client)); |
1631 | if (tlsext_sigalgs_client_parse(ssl, &cbs, &alert)) { | 1631 | if (tlsext_sigalgs_client_parse(ssl, &cbs, &alert)) { |
@@ -1701,7 +1701,7 @@ test_tlsext_sni_client(void) | |||
1701 | } | 1701 | } |
1702 | 1702 | ||
1703 | if (!CBB_finish(&cbb, &data, &dlen)) | 1703 | if (!CBB_finish(&cbb, &data, &dlen)) |
1704 | errx(1, "failed to finish CBB\n"); | 1704 | errx(1, "failed to finish CBB"); |
1705 | 1705 | ||
1706 | if (dlen != sizeof(tlsext_sni_client)) { | 1706 | if (dlen != sizeof(tlsext_sni_client)) { |
1707 | FAIL("got client SNI with length %zu, " | 1707 | FAIL("got client SNI with length %zu, " |
@@ -1818,7 +1818,7 @@ test_tlsext_sni_server(void) | |||
1818 | } | 1818 | } |
1819 | 1819 | ||
1820 | if (!CBB_finish(&cbb, &data, &dlen)) | 1820 | if (!CBB_finish(&cbb, &data, &dlen)) |
1821 | errx(1, "failed to finish CBB\n"); | 1821 | errx(1, "failed to finish CBB"); |
1822 | 1822 | ||
1823 | if (dlen != sizeof(tlsext_sni_server)) { | 1823 | if (dlen != sizeof(tlsext_sni_server)) { |
1824 | FAIL("got server SNI with length %zu, " | 1824 | FAIL("got server SNI with length %zu, " |
@@ -1912,7 +1912,7 @@ test_tlsext_ocsp_client(void) | |||
1912 | goto err; | 1912 | goto err; |
1913 | } | 1913 | } |
1914 | if (!CBB_finish(&cbb, &data, &dlen)) | 1914 | if (!CBB_finish(&cbb, &data, &dlen)) |
1915 | errx(1, "failed to finish CBB\n"); | 1915 | errx(1, "failed to finish CBB"); |
1916 | 1916 | ||
1917 | if (dlen != sizeof(tls_ocsp_client_default)) { | 1917 | if (dlen != sizeof(tls_ocsp_client_default)) { |
1918 | FAIL("got ocsp client with length %zu, " | 1918 | FAIL("got ocsp client with length %zu, " |
@@ -1987,7 +1987,7 @@ test_tlsext_ocsp_server(void) | |||
1987 | } | 1987 | } |
1988 | 1988 | ||
1989 | if (!CBB_finish(&cbb, &data, &dlen)) | 1989 | if (!CBB_finish(&cbb, &data, &dlen)) |
1990 | errx(1, "failed to finish CBB\n"); | 1990 | errx(1, "failed to finish CBB"); |
1991 | 1991 | ||
1992 | failure = 0; | 1992 | failure = 0; |
1993 | 1993 | ||
@@ -2392,7 +2392,7 @@ test_tlsext_srtp_client(void) | |||
2392 | goto err; | 2392 | goto err; |
2393 | } | 2393 | } |
2394 | if (!CBB_finish(&cbb, &data, &dlen)) | 2394 | if (!CBB_finish(&cbb, &data, &dlen)) |
2395 | errx(1, "failed to finish CBB\n"); | 2395 | errx(1, "failed to finish CBB"); |
2396 | 2396 | ||
2397 | if (dlen != sizeof(tlsext_srtp_single)) { | 2397 | if (dlen != sizeof(tlsext_srtp_single)) { |
2398 | FAIL("got client SRTP with length %zu, " | 2398 | FAIL("got client SRTP with length %zu, " |
@@ -2461,7 +2461,7 @@ test_tlsext_srtp_client(void) | |||
2461 | goto err; | 2461 | goto err; |
2462 | } | 2462 | } |
2463 | if (!CBB_finish(&cbb, &data, &dlen)) | 2463 | if (!CBB_finish(&cbb, &data, &dlen)) |
2464 | errx(1, "failed to finish CBB\n"); | 2464 | errx(1, "failed to finish CBB"); |
2465 | 2465 | ||
2466 | if (dlen != sizeof(tlsext_srtp_multiple)) { | 2466 | if (dlen != sizeof(tlsext_srtp_multiple)) { |
2467 | FAIL("got client SRTP with length %zu, " | 2467 | FAIL("got client SRTP with length %zu, " |
@@ -2625,7 +2625,7 @@ test_tlsext_srtp_server(void) | |||
2625 | goto err; | 2625 | goto err; |
2626 | } | 2626 | } |
2627 | if (!CBB_finish(&cbb, &data, &dlen)) | 2627 | if (!CBB_finish(&cbb, &data, &dlen)) |
2628 | errx(1, "failed to finish CBB\n"); | 2628 | errx(1, "failed to finish CBB"); |
2629 | 2629 | ||
2630 | if (dlen != sizeof(tlsext_srtp_single)) { | 2630 | if (dlen != sizeof(tlsext_srtp_single)) { |
2631 | FAIL("got server SRTP with length %zu, " | 2631 | FAIL("got server SRTP with length %zu, " |
@@ -2749,7 +2749,7 @@ test_tlsext_clienthello_build(void) | |||
2749 | goto err; | 2749 | goto err; |
2750 | } | 2750 | } |
2751 | if (!CBB_finish(&cbb, &data, &dlen)) | 2751 | if (!CBB_finish(&cbb, &data, &dlen)) |
2752 | errx(1, "failed to finish CBB\n"); | 2752 | errx(1, "failed to finish CBB"); |
2753 | 2753 | ||
2754 | if (dlen != sizeof(tlsext_clienthello_default)) { | 2754 | if (dlen != sizeof(tlsext_clienthello_default)) { |
2755 | FAIL("got clienthello extensions with length %zu, " | 2755 | FAIL("got clienthello extensions with length %zu, " |
@@ -2785,7 +2785,7 @@ test_tlsext_clienthello_build(void) | |||
2785 | goto err; | 2785 | goto err; |
2786 | } | 2786 | } |
2787 | if (!CBB_finish(&cbb, &data, &dlen)) | 2787 | if (!CBB_finish(&cbb, &data, &dlen)) |
2788 | errx(1, "failed to finish CBB\n"); | 2788 | errx(1, "failed to finish CBB"); |
2789 | 2789 | ||
2790 | if (dlen != sizeof(tlsext_clienthello_disabled)) { | 2790 | if (dlen != sizeof(tlsext_clienthello_disabled)) { |
2791 | FAIL("got clienthello extensions with length %zu, " | 2791 | FAIL("got clienthello extensions with length %zu, " |
@@ -2853,7 +2853,7 @@ test_tlsext_serverhello_build(void) | |||
2853 | goto err; | 2853 | goto err; |
2854 | } | 2854 | } |
2855 | if (!CBB_finish(&cbb, &data, &dlen)) | 2855 | if (!CBB_finish(&cbb, &data, &dlen)) |
2856 | errx(1, "failed to finish CBB\n"); | 2856 | errx(1, "failed to finish CBB"); |
2857 | 2857 | ||
2858 | if (dlen != sizeof(tlsext_serverhello_default)) { | 2858 | if (dlen != sizeof(tlsext_serverhello_default)) { |
2859 | FAIL("got serverhello extensions with length %zu, " | 2859 | FAIL("got serverhello extensions with length %zu, " |
@@ -2890,7 +2890,7 @@ test_tlsext_serverhello_build(void) | |||
2890 | goto err; | 2890 | goto err; |
2891 | } | 2891 | } |
2892 | if (!CBB_finish(&cbb, &data, &dlen)) | 2892 | if (!CBB_finish(&cbb, &data, &dlen)) |
2893 | errx(1, "failed to finish CBB\n"); | 2893 | errx(1, "failed to finish CBB"); |
2894 | 2894 | ||
2895 | if (dlen != sizeof(tlsext_serverhello_enabled)) { | 2895 | if (dlen != sizeof(tlsext_serverhello_enabled)) { |
2896 | FAIL("got serverhello extensions with length %zu, " | 2896 | FAIL("got serverhello extensions with length %zu, " |