diff options
| author | tb <> | 2022-01-05 07:50:40 +0000 |
|---|---|---|
| committer | tb <> | 2022-01-05 07:50:40 +0000 |
| commit | b558c595e5afb498ed15f1643ba71fa9a3923b45 (patch) | |
| tree | 8babc374a7b33c0dcff4a156558fea7f708dc411 /src | |
| parent | 6a84e3bf371065aba96d0c301e5f83493d7eae97 (diff) | |
| download | openbsd-b558c595e5afb498ed15f1643ba71fa9a3923b45.tar.gz openbsd-b558c595e5afb498ed15f1643ba71fa9a3923b45.tar.bz2 openbsd-b558c595e5afb498ed15f1643ba71fa9a3923b45.zip | |
Remove bandaid to work around expected range_should_be_prefix() problem.
Diffstat (limited to 'src')
| -rw-r--r-- | src/regress/lib/libcrypto/x509/rfc3779/rfc3779.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/regress/lib/libcrypto/x509/rfc3779/rfc3779.c b/src/regress/lib/libcrypto/x509/rfc3779/rfc3779.c index b7f6c11626..99040af2b6 100644 --- a/src/regress/lib/libcrypto/x509/rfc3779/rfc3779.c +++ b/src/regress/lib/libcrypto/x509/rfc3779/rfc3779.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rfc3779.c,v 1.2 2021/12/24 03:11:56 tb Exp $ */ | 1 | /* $OpenBSD: rfc3779.c,v 1.3 2022/01/05 07:50:40 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2021 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2021 Theo Buehler <tb@openbsd.org> |
| 4 | * | 4 | * |
| @@ -465,7 +465,6 @@ struct build_addr_block_test_data { | |||
| 465 | struct ip_addr_block addrs[16]; | 465 | struct ip_addr_block addrs[16]; |
| 466 | char der[128]; | 466 | char der[128]; |
| 467 | size_t der_len; | 467 | size_t der_len; |
| 468 | int memcmp_fails; | ||
| 469 | int is_canonical; | 468 | int is_canonical; |
| 470 | int inherits; | 469 | int inherits; |
| 471 | unsigned int afis[4]; | 470 | unsigned int afis[4]; |
| @@ -754,7 +753,6 @@ struct build_addr_block_test_data build_addr_block_tests[] = { | |||
| 754 | 0x30, 0x04, 0x03, 0x02, 0x00, 0x7f, | 753 | 0x30, 0x04, 0x03, 0x02, 0x00, 0x7f, |
| 755 | }, | 754 | }, |
| 756 | .der_len = 14, | 755 | .der_len = 14, |
| 757 | .memcmp_fails = 1, | ||
| 758 | .is_canonical = 1, | 756 | .is_canonical = 1, |
| 759 | .inherits = 0, | 757 | .inherits = 0, |
| 760 | .afis = { | 758 | .afis = { |
| @@ -898,9 +896,7 @@ build_addr_block_test(struct build_addr_block_test_data *test) | |||
| 898 | if (memcmp_failed) { | 896 | if (memcmp_failed) { |
| 899 | report_hexdump(__func__, test->description, "memcmp DER failed", | 897 | report_hexdump(__func__, test->description, "memcmp DER failed", |
| 900 | test->der, test->der_len, out, out_len); | 898 | test->der, test->der_len, out, out_len); |
| 901 | if (!test->memcmp_fails) | 899 | goto err; |
| 902 | goto err; | ||
| 903 | fprintf(stderr, "ignoring expected failure\n"); | ||
| 904 | } | 900 | } |
| 905 | 901 | ||
| 906 | if (X509v3_addr_inherits(addrs) != test->inherits) { | 902 | if (X509v3_addr_inherits(addrs) != test->inherits) { |