diff options
author | tedu <> | 2014-04-18 00:58:49 +0000 |
---|---|---|
committer | tedu <> | 2014-04-18 00:58:49 +0000 |
commit | a1df5b66c7ad477a535e56a504d8da47e1998cfa (patch) | |
tree | b216ca6fba673789f2c494699c4cf41d23337bfa /src/lib/libcrypto/asn1/x_x509a.c | |
parent | 07f5c09b19f56c323fa22ebd5efb5a4df9f5dc4d (diff) | |
download | openbsd-a1df5b66c7ad477a535e56a504d8da47e1998cfa.tar.gz openbsd-a1df5b66c7ad477a535e56a504d8da47e1998cfa.tar.bz2 openbsd-a1df5b66c7ad477a535e56a504d8da47e1998cfa.zip |
lob a few more knf grenades in here to soften things up.
Diffstat (limited to 'src/lib/libcrypto/asn1/x_x509a.c')
-rw-r--r-- | src/lib/libcrypto/asn1/x_x509a.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/x_x509a.c b/src/lib/libcrypto/asn1/x_x509a.c index 9449f517be..287d780830 100644 --- a/src/lib/libcrypto/asn1/x_x509a.c +++ b/src/lib/libcrypto/asn1/x_x509a.c | |||
@@ -91,8 +91,7 @@ static X509_CERT_AUX *aux_get(X509 *x) | |||
91 | int X509_alias_set1(X509 *x, unsigned char *name, int len) | 91 | int X509_alias_set1(X509 *x, unsigned char *name, int len) |
92 | { | 92 | { |
93 | X509_CERT_AUX *aux; | 93 | X509_CERT_AUX *aux; |
94 | if (!name) | 94 | if (!name) { |
95 | { | ||
96 | if (!x || !x->aux || !x->aux->alias) | 95 | if (!x || !x->aux || !x->aux->alias) |
97 | return 1; | 96 | return 1; |
98 | ASN1_UTF8STRING_free(x->aux->alias); | 97 | ASN1_UTF8STRING_free(x->aux->alias); |
@@ -107,8 +106,7 @@ int X509_alias_set1(X509 *x, unsigned char *name, int len) | |||
107 | int X509_keyid_set1(X509 *x, unsigned char *id, int len) | 106 | int X509_keyid_set1(X509 *x, unsigned char *id, int len) |
108 | { | 107 | { |
109 | X509_CERT_AUX *aux; | 108 | X509_CERT_AUX *aux; |
110 | if (!id) | 109 | if (!id) { |
111 | { | ||
112 | if (!x || !x->aux || !x->aux->keyid) | 110 | if (!x || !x->aux || !x->aux->keyid) |
113 | return 1; | 111 | return 1; |
114 | ASN1_OCTET_STRING_free(x->aux->keyid); | 112 | ASN1_OCTET_STRING_free(x->aux->keyid); |