1 files changed, 20 insertions, 13 deletions

diff --git a/src/lib/libcrypto/x509/x509spki.c b/src/lib/libcrypto/x509/x509spki.c
index 9f0fbd39e3..b5f67b5a97 100644
--- a/src/lib/libcrypto/x509/x509spki.c
+++ b/src/lib/libcrypto/x509/x509spki.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -60,36 +60,42 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 
-int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey)
+int
+NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey)
 {
-        if ((x == NULL) || (x->spkac == NULL)) return(0);
-        return(X509_PUBKEY_set(&(x->spkac->pubkey),pkey));
+        if ((x == NULL) || (x->spkac == NULL))
+                return (0);
+        return (X509_PUBKEY_set(&(x->spkac->pubkey), pkey));
 }
 
-EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x)
+EVP_PKEY *
+NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x)
 {
         if ((x == NULL) || (x->spkac == NULL))
-                return(NULL);
-        return(X509_PUBKEY_get(x->spkac->pubkey));
+                return (NULL);
+        return (X509_PUBKEY_get(x->spkac->pubkey));
 }
 
 /* Load a Netscape SPKI from a base64 encoded string */
 
-NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(const char *str, int len)
+NETSCAPE_SPKI *
+NETSCAPE_SPKI_b64_decode(const char *str, int len)
 {
         unsigned char *spki_der;
         const unsigned char *p;
         int spki_len;
         NETSCAPE_SPKI *spki;
-        if(len <= 0) len = strlen(str);
+
+        if (len <= 0)
+                len = strlen(str);
         if (!(spki_der = malloc(len + 1))) {
                 X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         spki_len = EVP_DecodeBlock(spki_der, (const unsigned char *)str, len);
-        if(spki_len < 0) {
+        if (spki_len < 0) {
                 X509err(X509_F_NETSCAPE_SPKI_B64_DECODE,
-                                                X509_R_BASE64_DECODE_ERROR);
+                    X509_R_BASE64_DECODE_ERROR);
                 free(spki_der);
                 return NULL;
         }
@@ -101,7 +107,8 @@ NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(const char *str, int len)
 
 /* Generate a base64 encoded string from an SPKI */
 
-char * NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
+char *
+NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
 {
         unsigned char *der_spki, *p;
         char *b64_str;
@@ -109,7 +116,7 @@ char * NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
         der_len = i2d_NETSCAPE_SPKI(spki, NULL);
         der_spki = malloc(der_len);
         b64_str = malloc(der_len * 2);
-        if(!der_spki || !b64_str) {
+        if (!der_spki || !b64_str) {
                 X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE);
                 free(der_spki);
                 free(b64_str);