diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libtls/tls_verify.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/libtls/tls_verify.c b/src/lib/libtls/tls_verify.c index 2b0ac653be..eec72bade8 100644 --- a/src/lib/libtls/tls_verify.c +++ b/src/lib/libtls/tls_verify.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls_verify.c,v 1.14 2015/09/29 10:17:04 deraadt Exp $ */ | 1 | /* $OpenBSD: tls_verify.c,v 1.15 2015/09/29 13:10:53 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> | 3 | * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> |
| 4 | * | 4 | * |
| @@ -88,10 +88,7 @@ static int | |||
| 88 | tls_check_subject_altname(struct tls *ctx, X509 *cert, const char *name) | 88 | tls_check_subject_altname(struct tls *ctx, X509 *cert, const char *name) |
| 89 | { | 89 | { |
| 90 | STACK_OF(GENERAL_NAME) *altname_stack = NULL; | 90 | STACK_OF(GENERAL_NAME) *altname_stack = NULL; |
| 91 | union { | 91 | union tls_addr addrbuf; |
| 92 | struct in_addr ip4; | ||
| 93 | struct in6_addr ip6; | ||
| 94 | } addrbuf; | ||
| 95 | int addrlen, type; | 92 | int addrlen, type; |
| 96 | int count, i; | 93 | int count, i; |
| 97 | int rv = -1; | 94 | int rv = -1; |
| @@ -202,12 +199,9 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name) | |||
| 202 | { | 199 | { |
| 203 | X509_NAME *subject_name; | 200 | X509_NAME *subject_name; |
| 204 | char *common_name = NULL; | 201 | char *common_name = NULL; |
| 202 | union tls_addr addrbuf; | ||
| 205 | int common_name_len; | 203 | int common_name_len; |
| 206 | int rv = -1; | 204 | int rv = -1; |
| 207 | union { | ||
| 208 | struct in_addr ip4; | ||
| 209 | struct in6_addr ip6; | ||
| 210 | } addrbuf; | ||
| 211 | 205 | ||
| 212 | subject_name = X509_get_subject_name(cert); | 206 | subject_name = X509_get_subject_name(cert); |
| 213 | if (subject_name == NULL) | 207 | if (subject_name == NULL) |
