1 files changed, 27 insertions, 24 deletions

diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c
index f084447334..530a214c1d 100644
--- a/src/lib/libcrypto/x509/x509_r2x.c
+++ b/src/lib/libcrypto/x509/x509_r2x.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -65,47 +65,50 @@
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 
-X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
+X509 *
+X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
 {
-        X509 *ret=NULL;
-        X509_CINF *xi=NULL;
+        X509 *ret = NULL;
+        X509_CINF *xi = NULL;
         X509_NAME *xn;
 
-        if ((ret=X509_new()) == NULL) {
-                X509err(X509_F_X509_REQ_TO_X509,ERR_R_MALLOC_FAILURE);
+        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;
+        xi = ret->cert_info;
 
         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;
+                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)
+        xn = X509_REQ_get_subject_name(r);
+        if (X509_set_subject_name(ret, X509_NAME_dup(xn)) == 0)
                 goto err;
-        if (X509_set_issuer_name(ret,X509_NAME_dup(xn)) == 0)
+        if (X509_set_issuer_name(ret, X509_NAME_dup(xn)) == 0)
                 goto err;
 
-        if (X509_gmtime_adj(xi->validity->notBefore,0) == NULL)
+        if (X509_gmtime_adj(xi->validity->notBefore, 0) == NULL)
                 goto err;
-        if (X509_gmtime_adj(xi->validity->notAfter,(long)60*60*24*days) == NULL)
+        if (X509_gmtime_adj(xi->validity->notAfter,
+            (long)60 * 60 * 24 * days) == NULL)
                 goto err;
 
-        X509_set_pubkey(ret,X509_REQ_get_pubkey(r));
+        X509_set_pubkey(ret, X509_REQ_get_pubkey(r));
 
-        if (!X509_sign(ret,pkey,EVP_md5()))
+        if (!X509_sign(ret, pkey, EVP_md5()))
                 goto err;
         if (0) {
 err:
                 X509_free(ret);
-                ret=NULL;
+                ret = NULL;
         }
-        return(ret);
+        return (ret);
 }
-