1 files changed, 27 insertions, 24 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_pmaps.c b/src/lib/libcrypto/x509v3/v3_pmaps.c
index 865bcd3980..bf5f291877 100644
--- a/src/lib/libcrypto/x509v3/v3_pmaps.c
+++ b/src/lib/libcrypto/x509v3/v3_pmaps.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,19 +64,18 @@
 #include <openssl/x509v3.h>
 
 static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-static STACK_OF(CONF_VALUE) *
-i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, void *pmps,
-                    STACK_OF(CONF_VALUE) *extlist);
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(
+    const X509V3_EXT_METHOD *method, void *pmps, STACK_OF(CONF_VALUE) *extlist);
 
 const X509V3_EXT_METHOD v3_policy_mappings = {
         NID_policy_mappings, 0,
         ASN1_ITEM_ref(POLICY_MAPPINGS),
-        0,0,0,0,
-        0,0,
+        0, 0, 0, 0,
+        0, 0,
         i2v_POLICY_MAPPINGS,
         v2i_POLICY_MAPPINGS,
-        0,0,
+        0, 0,
         NULL
 };
 
@@ -85,24 +84,24 @@ ASN1_SEQUENCE(POLICY_MAPPING) = {
         ASN1_SIMPLE(POLICY_MAPPING, subjectDomainPolicy, ASN1_OBJECT)
 } ASN1_SEQUENCE_END(POLICY_MAPPING)
 
-ASN1_ITEM_TEMPLATE(POLICY_MAPPINGS) = 
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, POLICY_MAPPINGS,
-                                                                POLICY_MAPPING)
+ASN1_ITEM_TEMPLATE(POLICY_MAPPINGS) =
+ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, POLICY_MAPPINGS,
+    POLICY_MAPPING)
 ASN1_ITEM_TEMPLATE_END(POLICY_MAPPINGS)
 
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
 
-
 static STACK_OF(CONF_VALUE) *
 i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, void *a,
-                    STACK_OF(CONF_VALUE) *ext_list)
+    STACK_OF(CONF_VALUE) *ext_list)
 {
         POLICY_MAPPINGS *pmaps = a;
         POLICY_MAPPING *pmap;
         int i;
         char obj_tmp1[80];
         char obj_tmp2[80];
-        for(i = 0; i < sk_POLICY_MAPPING_num(pmaps); i++) {
+
+        for (i = 0; i < sk_POLICY_MAPPING_num(pmaps); i++) {
                 pmap = sk_POLICY_MAPPING_value(pmaps, i);
                 i2t_ASN1_OBJECT(obj_tmp1, 80, pmap->issuerDomainPolicy);
                 i2t_ASN1_OBJECT(obj_tmp2, 80, pmap->subjectDomainPolicy);
@@ -111,8 +110,9 @@ i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, void *a,
         return ext_list;
 }
 
-static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+static void *
+v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval)
 {
         POLICY_MAPPINGS *pmaps;
         POLICY_MAPPING *pmap;
@@ -120,31 +120,34 @@ static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
         CONF_VALUE *val;
         int i;
 
-        if(!(pmaps = sk_POLICY_MAPPING_new_null())) {
-                X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,ERR_R_MALLOC_FAILURE);
+        if (!(pmaps = sk_POLICY_MAPPING_new_null())) {
+                X509V3err(X509V3_F_V2I_POLICY_MAPPINGS, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
 
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
+        for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
                 val = sk_CONF_VALUE_value(nval, i);
-                if(!val->value || !val->name) {
+                if (!val->value || !val->name) {
                         sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free);
-                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,X509V3_R_INVALID_OBJECT_IDENTIFIER);
+                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,
+                            X509V3_R_INVALID_OBJECT_IDENTIFIER);
                         X509V3_conf_err(val);
                         return NULL;
                 }
                 obj1 = OBJ_txt2obj(val->name, 0);
                 obj2 = OBJ_txt2obj(val->value, 0);
-                if(!obj1 || !obj2) {
+                if (!obj1 || !obj2) {
                         sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free);
-                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,X509V3_R_INVALID_OBJECT_IDENTIFIER);
+                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,
+                            X509V3_R_INVALID_OBJECT_IDENTIFIER);
                         X509V3_conf_err(val);
                         return NULL;
                 }
                 pmap = POLICY_MAPPING_new();
                 if (!pmap) {
                         sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free);
-                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,ERR_R_MALLOC_FAILURE);
+                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,
+                            ERR_R_MALLOC_FAILURE);
                         return NULL;
                 }
                 pmap->issuerDomainPolicy = obj1;