diff options
| -rw-r--r-- | regress/lib/libtls/verify/verifytest.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/regress/lib/libtls/verify/verifytest.c b/regress/lib/libtls/verify/verifytest.c index 632cacd2716..5f4ac8c111d 100644 --- a/regress/lib/libtls/verify/verifytest.c +++ b/regress/lib/libtls/verify/verifytest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: verifytest.c,v 1.3 2015/02/22 15:14:32 jsing Exp $ */ +/* $OpenBSD: verifytest.c,v 1.4 2015/09/11 12:57:24 beck Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -22,81 +22,81 @@ #include <openssl/x509v3.h> #include <tls.h> -extern int tls_check_servername(struct tls *ctx, X509 *cert, const char *name); +extern int tls_check_name(struct tls *ctx, X509 *cert, const char *name); struct verify_test { const char common_name[128]; const char alt_name[128]; int alt_name_len; int alt_name_type; - const char servername[128]; + const char name[128]; int want; }; struct verify_test verify_tests[] = { { .common_name = "www.openbsd.org", - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = 0, }, { .common_name = "www.openbsd.org", - .servername = "", + .name = "", .want = -1, }, { .common_name = "*.openbsd.org", - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = 0, }, { .common_name = "www.openbsdfoundation.org", - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = -1, }, { .common_name = "w*.openbsd.org", - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = -1, }, { .common_name = "www.*.org", - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = -1, }, { .common_name = "www.openbsd.*", - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = -1, }, { .common_name = "*", - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = -1, }, { .common_name = "*.org", - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = -1, }, { .common_name = "*.org", - .servername = "openbsd.org", + .name = "openbsd.org", .want = -1, }, { .common_name = "1.2.3.4", - .servername = "1.2.3.4", + .name = "1.2.3.4", .want = 0, }, { .common_name = "*.2.3.4", - .servername = "1.2.3.4", + .name = "1.2.3.4", .want = -1, }, { .common_name = "cafe::beef", - .servername = "cafe::beef", + .name = "cafe::beef", .want = 0, }, { @@ -104,7 +104,7 @@ struct verify_test verify_tests[] = { .alt_name = "ftp.openbsd.org", .alt_name_len = -1, .alt_name_type = GEN_DNS, - .servername = "ftp.openbsd.org", + .name = "ftp.openbsd.org", .want = 0, }, { @@ -112,7 +112,7 @@ struct verify_test verify_tests[] = { .alt_name = "*.openbsd.org", .alt_name_len = -1, .alt_name_type = GEN_DNS, - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = 0, }, { @@ -120,7 +120,7 @@ struct verify_test verify_tests[] = { .alt_name = "*.org", .alt_name_len = -1, .alt_name_type = GEN_DNS, - .servername = "www.openbsd.org", + .name = "www.openbsd.org", .want = -1, }, { @@ -128,7 +128,7 @@ struct verify_test verify_tests[] = { .alt_name = "1.2.3.4", .alt_name_len = -1, .alt_name_type = GEN_DNS, - .servername = "1.2.3.4", + .name = "1.2.3.4", .want = -1, }, { @@ -136,7 +136,7 @@ struct verify_test verify_tests[] = { .alt_name = {0x1, 0x2, 0x3, 0x4}, .alt_name_len = 4, .alt_name_type = GEN_IPADD, - .servername = "1.2.3.4", + .name = "1.2.3.4", .want = 0, }, { @@ -147,7 +147,7 @@ struct verify_test verify_tests[] = { }, .alt_name_len = 16, .alt_name_type = GEN_IPADD, - .servername = "cafe::beef", + .name = "cafe::beef", .want = 0, }, }; @@ -213,10 +213,10 @@ do_verify_test(int test_no, struct verify_test *vt) sk_GENERAL_NAME_pop_free(alt_name_stack, GENERAL_NAME_free); } - if (tls_check_servername(tls, cert, vt->servername) != vt->want) { + if (tls_check_name(tls, cert, vt->name) != vt->want) { fprintf(stderr, "FAIL: test %i failed with common name " - "'%s', alt name '%s' and servername '%s'\n", test_no, - vt->common_name, vt->alt_name, vt->servername); + "'%s', alt name '%s' and name '%s'\n", test_no, + vt->common_name, vt->alt_name, vt->name); return (1); } |