diff options
author | tb <> | 2020-05-24 14:35:26 +0000 |
---|---|---|
committer | tb <> | 2020-05-24 14:35:26 +0000 |
commit | b3f91ed9f62967ca942230fe244f1403cbe05a2b (patch) | |
tree | 8603beab21176c2e4beea1f1e91418fe70ef009d | |
parent | 3897abf3f7fbae4cfd94912a4a3ccdcbbfe8470a (diff) | |
download | openbsd-b3f91ed9f62967ca942230fe244f1403cbe05a2b.tar.gz openbsd-b3f91ed9f62967ca942230fe244f1403cbe05a2b.tar.bz2 openbsd-b3f91ed9f62967ca942230fe244f1403cbe05a2b.zip |
address some nits from jsing
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index 5cf39e63ae..7c61ec40dd 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.37 2020/05/23 17:13:24 beck Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.38 2020/05/24 14:35:26 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> |
@@ -3560,14 +3560,16 @@ unsigned char *valid_hostnames[] = { | |||
3560 | }; | 3560 | }; |
3561 | 3561 | ||
3562 | static int | 3562 | static int |
3563 | test_tlsext_valid_hostnames(void) { | 3563 | test_tlsext_valid_hostnames(void) |
3564 | { | ||
3564 | int i, failure = 0; | 3565 | int i, failure = 0; |
3566 | |||
3565 | for (i = 0; valid_hostnames[i] != NULL; i++) { | 3567 | for (i = 0; valid_hostnames[i] != NULL; i++) { |
3566 | CBS cbs; | 3568 | CBS cbs; |
3567 | CBS_init(&cbs, valid_hostnames[i], strlen(valid_hostnames[i])); | 3569 | CBS_init(&cbs, valid_hostnames[i], strlen(valid_hostnames[i])); |
3568 | if (!tlsext_sni_is_valid_hostname(&cbs)) { | 3570 | if (!tlsext_sni_is_valid_hostname(&cbs)) { |
3569 | fprintf(stderr, "FAIL: %s\n", valid_hostnames[i]); | 3571 | FAIL("Valid hostname '%s' rejected\n", |
3570 | FAIL("Valid hostname rejected"); | 3572 | valid_hostnames[i]); |
3571 | failure = 1; | 3573 | failure = 1; |
3572 | goto done; | 3574 | goto done; |
3573 | } | 3575 | } |
@@ -3595,15 +3597,17 @@ unsigned char *invalid_hostnames[] = { | |||
3595 | }; | 3597 | }; |
3596 | 3598 | ||
3597 | static int | 3599 | static int |
3598 | test_tlsext_invalid_hostnames(void) { | 3600 | test_tlsext_invalid_hostnames(void) |
3601 | { | ||
3599 | int i, failure = 0; | 3602 | int i, failure = 0; |
3600 | CBS cbs; | 3603 | CBS cbs; |
3604 | |||
3601 | for (i = 0; invalid_hostnames[i] != NULL; i++) { | 3605 | for (i = 0; invalid_hostnames[i] != NULL; i++) { |
3602 | CBS_init(&cbs, invalid_hostnames[i], | 3606 | CBS_init(&cbs, invalid_hostnames[i], |
3603 | strlen(invalid_hostnames[i])); | 3607 | strlen(invalid_hostnames[i])); |
3604 | if (tlsext_sni_is_valid_hostname(&cbs)) { | 3608 | if (tlsext_sni_is_valid_hostname(&cbs)) { |
3605 | fprintf(stderr, "%s\n", invalid_hostnames[i]); | 3609 | FAIL("Invalid hostname '%s' accepted\n", |
3606 | FAIL("Invalid hostname accepted"); | 3610 | invalid_hostnames[i]); |
3607 | failure = 1; | 3611 | failure = 1; |
3608 | goto done; | 3612 | goto done; |
3609 | } | 3613 | } |