From 513bec93d6747369737d3a618ef58a44410059f6 Mon Sep 17 00:00:00 2001 From: tedu <> Date: Fri, 18 Apr 2014 01:59:00 +0000 Subject: blunt force knf --- src/lib/libcrypto/x509/x509_r2x.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/lib/libcrypto/x509/x509_r2x.c') 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 @@ #include X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) - { +{ X509 *ret=NULL; X509_CINF *xi=NULL; X509_NAME *xn; - if ((ret=X509_new()) == NULL) - { + if ((ret=X509_new()) == NULL) { X509err(X509_F_X509_REQ_TO_X509,ERR_R_MALLOC_FAILURE); goto err; - } + } /* duplicate the request */ xi=ret->cert_info; - if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) - { + if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) { if ((xi->version=M_ASN1_INTEGER_new()) == NULL) goto err; if (!ASN1_INTEGER_set(xi->version,2)) goto err; /* xi->extensions=ri->attributes; <- bad, should not ever be done ri->attributes=NULL; */ - } + } xn=X509_REQ_get_subject_name(r); 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) if (!X509_sign(ret,pkey,EVP_md5())) goto err; - if (0) - { + if (0) { err: X509_free(ret); ret=NULL; - } - return(ret); } + return(ret); +} -- cgit v1.2.3-55-g6feb