diff options
author | tedu <> | 2014-04-18 01:59:00 +0000 |
---|---|---|
committer | tedu <> | 2014-04-18 01:59:00 +0000 |
commit | 513bec93d6747369737d3a618ef58a44410059f6 (patch) | |
tree | 88ee4831e2437f9075e786ffb662bb05fe0e3df6 /src/lib/libcrypto/x509/x509_r2x.c | |
parent | 1fca82b89342502ff32bda59bd067e303ff9d5ab (diff) | |
download | openbsd-513bec93d6747369737d3a618ef58a44410059f6.tar.gz openbsd-513bec93d6747369737d3a618ef58a44410059f6.tar.bz2 openbsd-513bec93d6747369737d3a618ef58a44410059f6.zip |
blunt force knf
Diffstat (limited to 'src/lib/libcrypto/x509/x509_r2x.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_r2x.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c index 254a14693d..f084447334 100644 --- a/src/lib/libcrypto/x509/x509_r2x.c +++ b/src/lib/libcrypto/x509/x509_r2x.c | |||
@@ -66,27 +66,25 @@ | |||
66 | #include <openssl/buffer.h> | 66 | #include <openssl/buffer.h> |
67 | 67 | ||
68 | X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) | 68 | X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) |
69 | { | 69 | { |
70 | X509 *ret=NULL; | 70 | X509 *ret=NULL; |
71 | X509_CINF *xi=NULL; | 71 | X509_CINF *xi=NULL; |
72 | X509_NAME *xn; | 72 | X509_NAME *xn; |
73 | 73 | ||
74 | if ((ret=X509_new()) == NULL) | 74 | if ((ret=X509_new()) == NULL) { |
75 | { | ||
76 | X509err(X509_F_X509_REQ_TO_X509,ERR_R_MALLOC_FAILURE); | 75 | X509err(X509_F_X509_REQ_TO_X509,ERR_R_MALLOC_FAILURE); |
77 | goto err; | 76 | goto err; |
78 | } | 77 | } |
79 | 78 | ||
80 | /* duplicate the request */ | 79 | /* duplicate the request */ |
81 | xi=ret->cert_info; | 80 | xi=ret->cert_info; |
82 | 81 | ||
83 | if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) | 82 | if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) { |
84 | { | ||
85 | if ((xi->version=M_ASN1_INTEGER_new()) == NULL) goto err; | 83 | if ((xi->version=M_ASN1_INTEGER_new()) == NULL) goto err; |
86 | if (!ASN1_INTEGER_set(xi->version,2)) goto err; | 84 | if (!ASN1_INTEGER_set(xi->version,2)) goto err; |
87 | /* xi->extensions=ri->attributes; <- bad, should not ever be done | 85 | /* xi->extensions=ri->attributes; <- bad, should not ever be done |
88 | ri->attributes=NULL; */ | 86 | ri->attributes=NULL; */ |
89 | } | 87 | } |
90 | 88 | ||
91 | xn=X509_REQ_get_subject_name(r); | 89 | xn=X509_REQ_get_subject_name(r); |
92 | if (X509_set_subject_name(ret,X509_NAME_dup(xn)) == 0) | 90 | if (X509_set_subject_name(ret,X509_NAME_dup(xn)) == 0) |
@@ -103,12 +101,11 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) | |||
103 | 101 | ||
104 | if (!X509_sign(ret,pkey,EVP_md5())) | 102 | if (!X509_sign(ret,pkey,EVP_md5())) |
105 | goto err; | 103 | goto err; |
106 | if (0) | 104 | if (0) { |
107 | { | ||
108 | err: | 105 | err: |
109 | X509_free(ret); | 106 | X509_free(ret); |
110 | ret=NULL; | 107 | ret=NULL; |
111 | } | ||
112 | return(ret); | ||
113 | } | 108 | } |
109 | return(ret); | ||
110 | } | ||
114 | 111 | ||