1 files changed, 43 insertions, 51 deletions

diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c
index 42e6f0ab05..f41fab3367 100644
--- a/src/lib/libcrypto/x509/x509_v3.c
+++ b/src/lib/libcrypto/x509/x509_v3.c
@@ -66,24 +66,24 @@
 #include <openssl/x509v3.h>
 
 int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
-        {
+{
         if (x == NULL) return(0);
         return(sk_X509_EXTENSION_num(x));
-        }
+}
 
 int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid,
                           int lastpos)
-        {
+{
         ASN1_OBJECT *obj;
 
         obj=OBJ_nid2obj(nid);
         if (obj == NULL) return(-2);
         return(X509v3_get_ext_by_OBJ(x,obj,lastpos));
-        }
+}
 
 int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, ASN1_OBJECT *obj,
                           int lastpos)
-        {
+{
         int n;
         X509_EXTENSION *ex;
 
@@ -92,18 +92,17 @@ int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, ASN1_OBJECT *obj,
         if (lastpos < 0)
                 lastpos=0;
         n=sk_X509_EXTENSION_num(sk);
-        for ( ; lastpos < n; lastpos++)
-                {
+        for ( ; lastpos < n; lastpos++) {
                 ex=sk_X509_EXTENSION_value(sk,lastpos);
                 if (OBJ_cmp(ex->object,obj) == 0)
                         return(lastpos);
-                }
-        return(-1);
         }
+        return(-1);
+}
 
 int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
                                int lastpos)
-        {
+{
         int n;
         X509_EXTENSION *ex;
 
@@ -112,53 +111,49 @@ int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
         if (lastpos < 0)
                 lastpos=0;
         n=sk_X509_EXTENSION_num(sk);
-        for ( ; lastpos < n; lastpos++)
-                {
+        for ( ; lastpos < n; lastpos++) {
                 ex=sk_X509_EXTENSION_value(sk,lastpos);
                 if (    ((ex->critical > 0) && crit) ||
                         ((ex->critical <= 0) && !crit))
                         return(lastpos);
-                }
-        return(-1);
         }
+        return(-1);
+}
 
 X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc)
-        {
+{
         if (x == NULL || sk_X509_EXTENSION_num(x) <= loc || loc < 0)
                 return NULL;
         else
                 return sk_X509_EXTENSION_value(x,loc);
-        }
+}
 
 X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc)
-        {
+{
         X509_EXTENSION *ret;
 
         if (x == NULL || sk_X509_EXTENSION_num(x) <= loc || loc < 0)
                 return(NULL);
         ret=sk_X509_EXTENSION_delete(x,loc);
         return(ret);
-        }
+}
 
 STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
                                          X509_EXTENSION *ex, int loc)
-        {
+{
         X509_EXTENSION *new_ex=NULL;
         int n;
         STACK_OF(X509_EXTENSION) *sk=NULL;
 
-        if (x == NULL)
-                {
+        if (x == NULL) {
                 X509err(X509_F_X509V3_ADD_EXT,ERR_R_PASSED_NULL_PARAMETER);
                 goto err2;
-                }
+        }
 
-        if (*x == NULL)
-                {
+        if (*x == NULL) {
                 if ((sk=sk_X509_EXTENSION_new_null()) == NULL)
                         goto err;
-                }
-        else
+        } else
                 sk= *x;
 
         n=sk_X509_EXTENSION_num(sk);
@@ -178,39 +173,36 @@ err2:
         if (new_ex != NULL) X509_EXTENSION_free(new_ex);
         if (sk != NULL) sk_X509_EXTENSION_free(sk);
         return(NULL);
-        }
+}
 
 X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid,
              int crit, ASN1_OCTET_STRING *data)
-        {
+{
         ASN1_OBJECT *obj;
         X509_EXTENSION *ret;
 
         obj=OBJ_nid2obj(nid);
-        if (obj == NULL)
-                {
+        if (obj == NULL) {
                 X509err(X509_F_X509_EXTENSION_CREATE_BY_NID,X509_R_UNKNOWN_NID);
                 return(NULL);
-                }
+        }
         ret=X509_EXTENSION_create_by_OBJ(ex,obj,crit,data);
         if (ret == NULL) ASN1_OBJECT_free(obj);
         return(ret);
-        }
+}
 
 X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
              ASN1_OBJECT *obj, int crit, ASN1_OCTET_STRING *data)
-        {
+{
         X509_EXTENSION *ret;
 
-        if ((ex == NULL) || (*ex == NULL))
-                {
+        if ((ex == NULL) || (*ex == NULL)) {
                 if ((ret=X509_EXTENSION_new()) == NULL)
-                        {
+                {
                         X509err(X509_F_X509_EXTENSION_CREATE_BY_OBJ,ERR_R_MALLOC_FAILURE);
                         return(NULL);
-                        }
                 }
-        else
+        } else
                 ret= *ex;
 
         if (!X509_EXTENSION_set_object(ret,obj))
@@ -226,49 +218,49 @@ err:
         if ((ex == NULL) || (ret != *ex))
                 X509_EXTENSION_free(ret);
         return(NULL);
-        }
+}
 
 int X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj)
-        {
+{
         if ((ex == NULL) || (obj == NULL))
                 return(0);
         ASN1_OBJECT_free(ex->object);
         ex->object=OBJ_dup(obj);
         return(1);
-        }
+}
 
 int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit)
-        {
+{
         if (ex == NULL) return(0);
         ex->critical=(crit)?0xFF:-1;
         return(1);
-        }
+}
 
 int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data)
-        {
+{
         int i;
 
         if (ex == NULL) return(0);
         i=M_ASN1_OCTET_STRING_set(ex->value,data->data,data->length);
         if (!i) return(0);
         return(1);
-        }
+}
 
 ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex)
-        {
+{
         if (ex == NULL) return(NULL);
         return(ex->object);
-        }
+}
 
 ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ex)
-        {
+{
         if (ex == NULL) return(NULL);
         return(ex->value);
-        }
+}
 
 int X509_EXTENSION_get_critical(X509_EXTENSION *ex)
-        {
+{
         if (ex == NULL) return(0);
         if(ex->critical > 0) return 1;
         return 0;
-        }
+}