diff options
author | tb <> | 2019-04-21 08:07:47 +0000 |
---|---|---|
committer | tb <> | 2019-04-21 08:07:47 +0000 |
commit | 3b6754802f797dc8df0764966cad58c88924eb7a (patch) | |
tree | b3ac0d9eb21cd1e8af0991b0d68bf2378fb8291b | |
parent | 8fe7e4af1deb4047204d1a997cdc4a3c36010372 (diff) | |
download | openbsd-3b6754802f797dc8df0764966cad58c88924eb7a.tar.gz openbsd-3b6754802f797dc8df0764966cad58c88924eb7a.tar.bz2 openbsd-3b6754802f797dc8df0764966cad58c88924eb7a.zip |
fix some style nits to reduce noise in an upcoming diff
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_akey.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c index e2e5730c7d..3b57fd21f7 100644 --- a/src/lib/libcrypto/x509v3/v3_akey.c +++ b/src/lib/libcrypto/x509v3/v3_akey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_akey.c,v 1.19 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: v3_akey.c,v 1.20 2019/04/21 08:07:47 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -87,9 +87,9 @@ const X509V3_EXT_METHOD v3_akey_id = { | |||
87 | .usr_data = NULL, | 87 | .usr_data = NULL, |
88 | }; | 88 | }; |
89 | 89 | ||
90 | static | 90 | static STACK_OF(CONF_VALUE) * |
91 | STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | 91 | i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, AUTHORITY_KEYID *akeyid, |
92 | AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist) | 92 | STACK_OF(CONF_VALUE) *extlist) |
93 | { | 93 | { |
94 | char *tmp; | 94 | char *tmp; |
95 | 95 | ||
@@ -109,14 +109,14 @@ STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | |||
109 | return extlist; | 109 | return extlist; |
110 | } | 110 | } |
111 | 111 | ||
112 | /* Currently two options: | 112 | /* |
113 | * Currently two options: | ||
113 | * keyid: use the issuers subject keyid, the value 'always' means its is | 114 | * keyid: use the issuers subject keyid, the value 'always' means its is |
114 | * an error if the issuer certificate doesn't have a key id. | 115 | * an error if the issuer certificate doesn't have a key id. |
115 | * issuer: use the issuers cert issuer and serial number. The default is | 116 | * issuer: use the issuers cert issuer and serial number. The default is |
116 | * to only use this if keyid is not present. With the option 'always' | 117 | * to only use this if keyid is not present. With the option 'always' |
117 | * this is always included. | 118 | * this is always included. |
118 | */ | 119 | */ |
119 | |||
120 | static AUTHORITY_KEYID * | 120 | static AUTHORITY_KEYID * |
121 | v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | 121 | v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, |
122 | STACK_OF(CONF_VALUE) *values) | 122 | STACK_OF(CONF_VALUE) *values) |
@@ -139,8 +139,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
139 | keyid = 1; | 139 | keyid = 1; |
140 | if (cnf->value && !strcmp(cnf->value, "always")) | 140 | if (cnf->value && !strcmp(cnf->value, "always")) |
141 | keyid = 2; | 141 | keyid = 2; |
142 | } | 142 | } else if (!strcmp(cnf->name, "issuer")) { |
143 | else if (!strcmp(cnf->name, "issuer")) { | ||
144 | issuer = 1; | 143 | issuer = 1; |
145 | if (cnf->value && !strcmp(cnf->value, "always")) | 144 | if (cnf->value && !strcmp(cnf->value, "always")) |
146 | issuer = 2; | 145 | issuer = 2; |
@@ -199,7 +198,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
199 | 198 | ||
200 | return akeyid; | 199 | return akeyid; |
201 | 200 | ||
202 | err: | 201 | err: |
203 | AUTHORITY_KEYID_free(akeyid); | 202 | AUTHORITY_KEYID_free(akeyid); |
204 | GENERAL_NAME_free(gen); | 203 | GENERAL_NAME_free(gen); |
205 | sk_GENERAL_NAME_free(gens); | 204 | sk_GENERAL_NAME_free(gens); |