diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2019-04-21 08:07:48 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2019-04-21 08:07:48 +0000 |
| commit | e41b042052afd0782ce6ff67b4a0000be77d7cc6 (patch) | |
| tree | 07eaff285b8ea109edb324fba7186840a6e8178d | |
| parent | 19c1120155e22936ba66ffd59f42803fce3e8216 (diff) | |
fix some style nits to reduce noise in an upcoming diff
| -rw-r--r-- | lib/libcrypto/x509v3/v3_akey.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/libcrypto/x509v3/v3_akey.c b/lib/libcrypto/x509v3/v3_akey.c index e2e5730c7d4..3b57fd21f70 100644 --- a/lib/libcrypto/x509v3/v3_akey.c +++ b/lib/libcrypto/x509v3/v3_akey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_akey.c,v 1.19 2017/01/29 17:49:23 beck Exp $ */ +/* $OpenBSD: v3_akey.c,v 1.20 2019/04/21 08:07:47 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -87,9 +87,9 @@ const X509V3_EXT_METHOD v3_akey_id = { .usr_data = NULL, }; -static -STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, - AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist) +static STACK_OF(CONF_VALUE) * +i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, AUTHORITY_KEYID *akeyid, + STACK_OF(CONF_VALUE) *extlist) { char *tmp; @@ -109,14 +109,14 @@ STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, return extlist; } -/* Currently two options: +/* + * Currently two options: * keyid: use the issuers subject keyid, the value 'always' means its is * an error if the issuer certificate doesn't have a key id. * issuer: use the issuers cert issuer and serial number. The default is * to only use this if keyid is not present. With the option 'always' * this is always included. */ - static AUTHORITY_KEYID * v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values) @@ -139,8 +139,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, keyid = 1; if (cnf->value && !strcmp(cnf->value, "always")) keyid = 2; - } - else if (!strcmp(cnf->name, "issuer")) { + } else if (!strcmp(cnf->name, "issuer")) { issuer = 1; if (cnf->value && !strcmp(cnf->value, "always")) issuer = 2; @@ -199,7 +198,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, return akeyid; -err: + err: AUTHORITY_KEYID_free(akeyid); GENERAL_NAME_free(gen); sk_GENERAL_NAME_free(gens); |