1 files changed, 32 insertions, 27 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c
index 98789b36e9..090fe49b20 100644
--- a/src/lib/libcrypto/x509v3/v3_ia5.c
+++ b/src/lib/libcrypto/x509v3/v3_ia5.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
@@ -64,26 +64,29 @@
 #include <openssl/x509v3.h>
 
 static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
-static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
-const X509V3_EXT_METHOD v3_ns_ia5_list[] = { 
-EXT_IA5STRING(NID_netscape_base_url),
-EXT_IA5STRING(NID_netscape_revocation_url),
-EXT_IA5STRING(NID_netscape_ca_revocation_url),
-EXT_IA5STRING(NID_netscape_renewal_url),
-EXT_IA5STRING(NID_netscape_ca_policy_url),
-EXT_IA5STRING(NID_netscape_ssl_server_name),
-EXT_IA5STRING(NID_netscape_comment),
-EXT_END
-};
+static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
+    X509V3_CTX *ctx, char *str);
 
+const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
+        EXT_IA5STRING(NID_netscape_base_url),
+        EXT_IA5STRING(NID_netscape_revocation_url),
+        EXT_IA5STRING(NID_netscape_ca_revocation_url),
+        EXT_IA5STRING(NID_netscape_renewal_url),
+        EXT_IA5STRING(NID_netscape_ca_policy_url),
+        EXT_IA5STRING(NID_netscape_ssl_server_name),
+        EXT_IA5STRING(NID_netscape_comment),
+        EXT_END
+};
 
-static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-             ASN1_IA5STRING *ia5)
+static char *
+i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5)
 {
         char *tmp;
-        if(!ia5 || !ia5->length) return NULL;
-        if(!(tmp = malloc(ia5->length + 1))) {
-                X509V3err(X509V3_F_I2S_ASN1_IA5STRING,ERR_R_MALLOC_FAILURE);
+
+        if (!ia5 || !ia5->length)
+                return NULL;
+        if (!(tmp = malloc(ia5->length + 1))) {
+                X509V3err(X509V3_F_I2S_ASN1_IA5STRING, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         memcpy(tmp, ia5->data, ia5->length);
@@ -91,23 +94,25 @@ static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
         return tmp;
 }
 
-static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-             X509V3_CTX *ctx, char *str)
+static ASN1_IA5STRING *
+s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str)
 {
         ASN1_IA5STRING *ia5;
-        if(!str) {
-                X509V3err(X509V3_F_S2I_ASN1_IA5STRING,X509V3_R_INVALID_NULL_ARGUMENT);
+        if (!str) {
+                X509V3err(X509V3_F_S2I_ASN1_IA5STRING,
+                    X509V3_R_INVALID_NULL_ARGUMENT);
                 return NULL;
         }
-        if(!(ia5 = M_ASN1_IA5STRING_new())) goto err;
-        if(!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char*)str,
-                            strlen(str))) {
+        if (!(ia5 = M_ASN1_IA5STRING_new()))
+                goto err;
+        if (!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char*)str,
+            strlen(str))) {
                 M_ASN1_IA5STRING_free(ia5);
                 goto err;
         }
         return ia5;
-        err:
-        X509V3err(X509V3_F_S2I_ASN1_IA5STRING,ERR_R_MALLOC_FAILURE);
+
+err:
+        X509V3err(X509V3_F_S2I_ASN1_IA5STRING, ERR_R_MALLOC_FAILURE);
         return NULL;
 }
-