Mechanical KNF in preparation for changing

1 files changed, 64 insertions, 62 deletions

diff --git a/src/lib/libcrypto/ct/ct_x509v3.c b/src/lib/libcrypto/ct/ct_x509v3.c
index 19c2a852d2..32312e2c6b 100644
--- a/src/lib/libcrypto/ct/ct_x509v3.c
+++ b/src/lib/libcrypto/ct/ct_x509v3.c
@@ -13,92 +13,94 @@
 
 #include "ct_local.h"
 
-static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val)
+static char *
+i2s_poison(const X509V3_EXT_METHOD *method, void *val)
 {
-    return OPENSSL_strdup("NULL");
+        return OPENSSL_strdup("NULL");
 }
 
-static void *s2i_poison(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, const char *str)
+static void *
+s2i_poison(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, const char *str)
 {
-   return ASN1_NULL_new();
+        return ASN1_NULL_new();
 }
 
-static int i2r_SCT_LIST(X509V3_EXT_METHOD *method, STACK_OF(SCT) *sct_list,
-                 BIO *out, int indent)
+static int
+i2r_SCT_LIST(X509V3_EXT_METHOD *method, STACK_OF(SCT) *sct_list, BIO *out,
+    int indent)
 {
-    SCT_LIST_print(sct_list, out, indent, "\n", NULL);
-    return 1;
+        SCT_LIST_print(sct_list, out, indent, "\n", NULL);
+        return 1;
 }
 
-static int set_sct_list_source(STACK_OF(SCT) *s, sct_source_t source)
+static int
+set_sct_list_source(STACK_OF(SCT) *s, sct_source_t source)
 {
-    if (s != NULL) {
-        int i;
+        if (s != NULL) {
+                int i;
 
-        for (i = 0; i < sk_SCT_num(s); i++) {
-            int res = SCT_set_source(sk_SCT_value(s, i), source);
+                for (i = 0; i < sk_SCT_num(s); i++) {
+                        int res = SCT_set_source(sk_SCT_value(s, i), source);
 
-            if (res != 1) {
-                return 0;
-            }
-        }
-    }
-    return 1;
+                        if (res != 1) {
+                                return 0;
+                        }
+                }
+        }
+        return 1;
 }
 
-static STACK_OF(SCT) *x509_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
-                                            const unsigned char **pp,
-                                            long len)
+static STACK_OF(SCT) *
+x509_ext_d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp, long len)
 {
-     STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
+        STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
 
-     if (set_sct_list_source(s, SCT_SOURCE_X509V3_EXTENSION) != 1) {
-         SCT_LIST_free(s);
-         *a = NULL;
-         return NULL;
-     }
-     return s;
+        if (set_sct_list_source(s, SCT_SOURCE_X509V3_EXTENSION) != 1) {
+                SCT_LIST_free(s);
+                *a = NULL;
+                return NULL;
+        }
+        return s;
 }
 
-static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
-                                            const unsigned char **pp,
-                                            long len)
+static STACK_OF(SCT) *o
+csp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp, long len)
 {
-    STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
+        STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
 
-    if (set_sct_list_source(s, SCT_SOURCE_OCSP_STAPLED_RESPONSE) != 1) {
-        SCT_LIST_free(s);
-        *a = NULL;
-        return NULL;
-    }
-    return s;
+        if (set_sct_list_source(s, SCT_SOURCE_OCSP_STAPLED_RESPONSE) != 1) {
+                SCT_LIST_free(s);
+                *a = NULL;
+                return NULL;
+        }
+        return s;
 }
 
 /* Handlers for X509v3/OCSP Certificate Transparency extensions */
 const X509V3_EXT_METHOD v3_ct_scts[3] = {
-    /* X509v3 extension in certificates that contains SCTs */
-    { NID_ct_precert_scts, 0, NULL,
-    NULL, (X509V3_EXT_FREE)SCT_LIST_free,
-    (X509V3_EXT_D2I)x509_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
-    NULL, NULL,
-    NULL, NULL,
-    (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
-    NULL },
+        /* X509v3 extension in certificates that contains SCTs */
+        { NID_ct_precert_scts, 0, NULL,
+          NULL, (X509V3_EXT_FREE)SCT_LIST_free,
+          (X509V3_EXT_D2I)x509_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
+          NULL, NULL,
+          NULL, NULL,
+          (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
+          NULL },
 
-    /* X509v3 extension to mark a certificate as a pre-certificate */
-    { NID_ct_precert_poison, 0, ASN1_ITEM_ref(ASN1_NULL),
-    NULL, NULL, NULL, NULL,
-    i2s_poison, s2i_poison,
-    NULL, NULL,
-    NULL, NULL,
-    NULL },
+        /* X509v3 extension to mark a certificate as a pre-certificate */
+        { NID_ct_precert_poison, 0, ASN1_ITEM_ref(ASN1_NULL),
+          NULL, NULL, NULL, NULL,
+          i2s_poison, s2i_poison,
+          NULL, NULL,
+          NULL, NULL,
+          NULL },
 
-    /* OCSP extension that contains SCTs */
-    { NID_ct_cert_scts, 0, NULL,
-    0, (X509V3_EXT_FREE)SCT_LIST_free,
-    (X509V3_EXT_D2I)ocsp_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
-    NULL, NULL,
-    NULL, NULL,
-    (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
-    NULL },
+        /* OCSP extension that contains SCTs */
+        { NID_ct_cert_scts, 0, NULL,
+          0, (X509V3_EXT_FREE)SCT_LIST_free,
+          (X509V3_EXT_D2I)ocsp_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
+          NULL, NULL,
+          NULL, NULL,
+          (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
+          NULL },
 };