summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-05-11 07:35:27 +0000
committertb <>2023-05-11 07:35:27 +0000
commit01d52bf8f3e9786643d6b21f45d1f3e55558554c (patch)
treef6c714a09108145c518788a33468a27604e55b0b
parent2b61392827ac5fa56e300c731887f0caddcb4ad8 (diff)
downloadopenbsd-01d52bf8f3e9786643d6b21f45d1f3e55558554c.tar.gz
openbsd-01d52bf8f3e9786643d6b21f45d1f3e55558554c.tar.bz2
openbsd-01d52bf8f3e9786643d6b21f45d1f3e55558554c.zip
tls_verify.c: give up on variable alignment in this file
The previous commit resulted in misalignment, which impacts my OCD worse than no alignment at all. Alignment wasn't consistently done in this file anyway. op tells me it won't affect current efforts in reducing the diff.
-rw-r--r--src/lib/libtls/tls_verify.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libtls/tls_verify.c b/src/lib/libtls/tls_verify.c
index fbbed7969c..0cb86f686d 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.22 2023/05/10 13:48:54 op Exp $ */ 1/* $OpenBSD: tls_verify.c,v 1.23 2023/05/11 07:35:27 tb 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 *
@@ -115,7 +115,7 @@ tls_check_subject_altname(struct tls *ctx, X509 *cert, const char *name,
115 115
116 count = sk_GENERAL_NAME_num(altname_stack); 116 count = sk_GENERAL_NAME_num(altname_stack);
117 for (i = 0; i < count; i++) { 117 for (i = 0; i < count; i++) {
118 GENERAL_NAME *altname; 118 GENERAL_NAME *altname;
119 119
120 altname = sk_GENERAL_NAME_value(altname_stack, i); 120 altname = sk_GENERAL_NAME_value(altname_stack, i);
121 121
@@ -126,8 +126,8 @@ tls_check_subject_altname(struct tls *ctx, X509 *cert, const char *name,
126 continue; 126 continue;
127 127
128 if (type == GEN_DNS) { 128 if (type == GEN_DNS) {
129 const unsigned char *data; 129 const unsigned char *data;
130 int format, len; 130 int format, len;
131 131
132 format = ASN1_STRING_type(altname->d.dNSName); 132 format = ASN1_STRING_type(altname->d.dNSName);
133 if (format == V_ASN1_IA5STRING) { 133 if (format == V_ASN1_IA5STRING) {
@@ -171,8 +171,8 @@ tls_check_subject_altname(struct tls *ctx, X509 *cert, const char *name,
171 } 171 }
172 172
173 } else if (type == GEN_IPADD) { 173 } else if (type == GEN_IPADD) {
174 const unsigned char *data; 174 const unsigned char *data;
175 int datalen; 175 int datalen;
176 176
177 datalen = ASN1_STRING_length(altname->d.iPAddress); 177 datalen = ASN1_STRING_length(altname->d.iPAddress);
178 data = ASN1_STRING_get0_data(altname->d.iPAddress); 178 data = ASN1_STRING_get0_data(altname->d.iPAddress);