diff options
| author |   jsing <jsing@openbsd.org> | 2018-02-05 00:52:24 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-02-05 00:52:24 +0000 |
| commit | 7add217b8eb9ea81a3752d76fa1861ba7106469a (patch) | |
| tree | 9fbb57f311fdbe920f75b62c64755f814321f458 /lib/libtls/tls_verify.c | |
| parent | use sizeof, rather than the constant. on change in binary. (diff) | |
| download | wireguard-openbsd-7add217b8eb9ea81a3752d76fa1861ba7106469a.tar.xz wireguard-openbsd-7add217b8eb9ea81a3752d76fa1861ba7106469a.zip | |
Be consistent with the goto label names used in libtls code.
No change to generated assembly.
Diffstat (limited to 'lib/libtls/tls_verify.c')
| -rw-r--r-- | lib/libtls/tls_verify.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libtls/tls_verify.c b/lib/libtls/tls_verify.c index 3bd1057d0c4..acbe163ffdf 100644 --- a/lib/libtls/tls_verify.c +++ b/lib/libtls/tls_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_verify.c,v 1.19 2017/04/10 17:11:13 jsing Exp $ */ +/* $OpenBSD: tls_verify.c,v 1.20 2018/02/05 00:52:24 jsing Exp $ */ /* * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> * @@ -215,16 +215,16 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name, subject_name = X509_get_subject_name(cert); if (subject_name == NULL) - goto out; + goto done; common_name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName, NULL, 0); if (common_name_len < 0) - goto out; + goto done; common_name = calloc(common_name_len + 1, 1); if (common_name == NULL) - goto out; + goto done; X509_NAME_get_text_by_NID(subject_name, NID_commonName, common_name, common_name_len + 1); @@ -236,7 +236,7 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name, "NUL byte in Common Name field, " "probably a malicious certificate", name); rv = -1; - goto out; + goto done; } /* @@ -247,13 +247,13 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name, inet_pton(AF_INET6, name, &addrbuf) == 1) { if (strcmp(common_name, name) == 0) *cn_match = 1; - goto out; + goto done; } if (tls_match_name(common_name, name) == 0) *cn_match = 1; - out: + done: free(common_name); return rv; } |