diff options
| author | jsing <> | 2020-08-09 16:29:27 +0000 |
|---|---|---|
| committer | jsing <> | 2020-08-09 16:29:27 +0000 |
| commit | e9b7d38b9d7e881874b4b8b08d7296c28475ea06 (patch) | |
| tree | 5449f96b23ef2eb6496e58da616d4003b4c89ecc /src | |
| parent | f05d8c27643318cf8a83535ca7617003ae1e4970 (diff) | |
| download | openbsd-e9b7d38b9d7e881874b4b8b08d7296c28475ea06.tar.gz openbsd-e9b7d38b9d7e881874b4b8b08d7296c28475ea06.tar.bz2 openbsd-e9b7d38b9d7e881874b4b8b08d7296c28475ea06.zip | |
Fix regress test so that it exits non-zero for failure cases.
Diffstat (limited to 'src')
| -rw-r--r-- | src/regress/lib/libssl/unit/ssl_versions.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/regress/lib/libssl/unit/ssl_versions.c b/src/regress/lib/libssl/unit/ssl_versions.c index ec16576ee9..53f71ef22e 100644 --- a/src/regress/lib/libssl/unit/ssl_versions.c +++ b/src/regress/lib/libssl/unit/ssl_versions.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_versions.c,v 1.7 2019/04/04 15:47:15 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_versions.c,v 1.8 2020/08/09 16:29:27 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -686,11 +686,13 @@ test_ssl_min_max_version(void) | |||
| 686 | if (mmvt->want_minver == 0) { | 686 | if (mmvt->want_minver == 0) { |
| 687 | fprintf(stderr, "FAIL: test %zu - successfully set " | 687 | fprintf(stderr, "FAIL: test %zu - successfully set " |
| 688 | "SSL_CTX min version, should have failed\n", i); | 688 | "SSL_CTX min version, should have failed\n", i); |
| 689 | failed++; | ||
| 689 | goto next; | 690 | goto next; |
| 690 | } | 691 | } |
| 691 | if (mmvt->want_maxver == 0) { | 692 | if (mmvt->want_maxver == 0) { |
| 692 | fprintf(stderr, "FAIL: test %zu - successfully set " | 693 | fprintf(stderr, "FAIL: test %zu - successfully set " |
| 693 | "SSL_CTX max version, should have failed\n", i); | 694 | "SSL_CTX max version, should have failed\n", i); |
| 695 | failed++; | ||
| 694 | goto next; | 696 | goto next; |
| 695 | } | 697 | } |
| 696 | 698 | ||
| @@ -698,12 +700,14 @@ test_ssl_min_max_version(void) | |||
| 698 | fprintf(stderr, "FAIL: test %zu - got SSL_CTX min " | 700 | fprintf(stderr, "FAIL: test %zu - got SSL_CTX min " |
| 699 | "version 0x%x, want 0x%x\n", i, | 701 | "version 0x%x, want 0x%x\n", i, |
| 700 | SSL_CTX_get_min_proto_version(ssl_ctx), mmvt->want_minver); | 702 | SSL_CTX_get_min_proto_version(ssl_ctx), mmvt->want_minver); |
| 703 | failed++; | ||
| 701 | goto next; | 704 | goto next; |
| 702 | } | 705 | } |
| 703 | if (SSL_CTX_get_max_proto_version(ssl_ctx) != mmvt->want_maxver) { | 706 | if (SSL_CTX_get_max_proto_version(ssl_ctx) != mmvt->want_maxver) { |
| 704 | fprintf(stderr, "FAIL: test %zu - got SSL_CTX max " | 707 | fprintf(stderr, "FAIL: test %zu - got SSL_CTX max " |
| 705 | "version 0x%x, want 0x%x\n", i, | 708 | "version 0x%x, want 0x%x\n", i, |
| 706 | SSL_CTX_get_max_proto_version(ssl_ctx), mmvt->want_maxver); | 709 | SSL_CTX_get_max_proto_version(ssl_ctx), mmvt->want_maxver); |
| 710 | failed++; | ||
| 707 | goto next; | 711 | goto next; |
| 708 | } | 712 | } |
| 709 | 713 | ||
| @@ -716,12 +720,14 @@ test_ssl_min_max_version(void) | |||
| 716 | fprintf(stderr, "FAIL: test %zu - initial SSL min " | 720 | fprintf(stderr, "FAIL: test %zu - initial SSL min " |
| 717 | "version 0x%x, want 0x%x\n", i, | 721 | "version 0x%x, want 0x%x\n", i, |
| 718 | SSL_get_min_proto_version(ssl), mmvt->want_minver); | 722 | SSL_get_min_proto_version(ssl), mmvt->want_minver); |
| 723 | failed++; | ||
| 719 | goto next; | 724 | goto next; |
| 720 | } | 725 | } |
| 721 | if (SSL_get_max_proto_version(ssl) != mmvt->want_maxver) { | 726 | if (SSL_get_max_proto_version(ssl) != mmvt->want_maxver) { |
| 722 | fprintf(stderr, "FAIL: test %zu - initial SSL max " | 727 | fprintf(stderr, "FAIL: test %zu - initial SSL max " |
| 723 | "version 0x%x, want 0x%x\n", i, | 728 | "version 0x%x, want 0x%x\n", i, |
| 724 | SSL_get_max_proto_version(ssl), mmvt->want_maxver); | 729 | SSL_get_max_proto_version(ssl), mmvt->want_maxver); |
| 730 | failed++; | ||
| 725 | goto next; | 731 | goto next; |
| 726 | } | 732 | } |
| 727 | 733 | ||
| @@ -745,11 +751,13 @@ test_ssl_min_max_version(void) | |||
| 745 | if (mmvt->want_minver == 0) { | 751 | if (mmvt->want_minver == 0) { |
| 746 | fprintf(stderr, "FAIL: test %zu - successfully set SSL " | 752 | fprintf(stderr, "FAIL: test %zu - successfully set SSL " |
| 747 | "min version, should have failed\n", i); | 753 | "min version, should have failed\n", i); |
| 754 | failed++; | ||
| 748 | goto next; | 755 | goto next; |
| 749 | } | 756 | } |
| 750 | if (mmvt->want_maxver == 0) { | 757 | if (mmvt->want_maxver == 0) { |
| 751 | fprintf(stderr, "FAIL: test %zu - successfully set SSL " | 758 | fprintf(stderr, "FAIL: test %zu - successfully set SSL " |
| 752 | "max version, should have failed\n", i); | 759 | "max version, should have failed\n", i); |
| 760 | failed++; | ||
| 753 | goto next; | 761 | goto next; |
| 754 | } | 762 | } |
| 755 | 763 | ||
| @@ -757,12 +765,14 @@ test_ssl_min_max_version(void) | |||
| 757 | fprintf(stderr, "FAIL: test %zu - got SSL min " | 765 | fprintf(stderr, "FAIL: test %zu - got SSL min " |
| 758 | "version 0x%x, want 0x%x\n", i, | 766 | "version 0x%x, want 0x%x\n", i, |
| 759 | SSL_get_min_proto_version(ssl), mmvt->want_minver); | 767 | SSL_get_min_proto_version(ssl), mmvt->want_minver); |
| 768 | failed++; | ||
| 760 | goto next; | 769 | goto next; |
| 761 | } | 770 | } |
| 762 | if (SSL_get_max_proto_version(ssl) != mmvt->want_maxver) { | 771 | if (SSL_get_max_proto_version(ssl) != mmvt->want_maxver) { |
| 763 | fprintf(stderr, "FAIL: test %zu - got SSL max " | 772 | fprintf(stderr, "FAIL: test %zu - got SSL max " |
| 764 | "version 0x%x, want 0x%x\n", i, | 773 | "version 0x%x, want 0x%x\n", i, |
| 765 | SSL_get_max_proto_version(ssl), mmvt->want_maxver); | 774 | SSL_get_max_proto_version(ssl), mmvt->want_maxver); |
| 775 | failed++; | ||
| 766 | goto next; | 776 | goto next; |
| 767 | } | 777 | } |
| 768 | 778 | ||
