1 files changed, 134 insertions, 101 deletions

diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c
index f41fab3367..cabace584b 100644
--- a/src/lib/libcrypto/x509/x509_v3.c
+++ b/src/lib/libcrypto/x509/x509_v3.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -65,202 +65,235 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
+int
+X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
 {
-        if (x == NULL) return(0);
-        return(sk_X509_EXTENSION_num(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)
+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));
+        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
+X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, ASN1_OBJECT *obj,
+    int lastpos)
 {
         int n;
         X509_EXTENSION *ex;
 
-        if (sk == NULL) return(-1);
+        if (sk == NULL)
+                return (-1);
         lastpos++;
         if (lastpos < 0)
-                lastpos=0;
-        n=sk_X509_EXTENSION_num(sk);
-        for ( ; lastpos < n; lastpos++) {
-                ex=sk_X509_EXTENSION_value(sk,lastpos);
-                if (OBJ_cmp(ex->object,obj) == 0)
-                        return(lastpos);
+                lastpos = 0;
+        n = sk_X509_EXTENSION_num(sk);
+        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
+X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
+    int lastpos)
 {
         int n;
         X509_EXTENSION *ex;
 
-        if (sk == NULL) return(-1);
+        if (sk == NULL)
+                return (-1);
         lastpos++;
         if (lastpos < 0)
-                lastpos=0;
-        n=sk_X509_EXTENSION_num(sk);
-        for ( ; lastpos < n; lastpos++) {
-                ex=sk_X509_EXTENSION_value(sk,lastpos);
-                if (    ((ex->critical > 0) && crit) ||
-                        ((ex->critical <= 0) && !crit))
-                        return(lastpos);
+                lastpos = 0;
+        n = sk_X509_EXTENSION_num(sk);
+        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)
+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);
+                return sk_X509_EXTENSION_value(x, loc);
 }
 
-X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int 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);
+                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)
+STACK_OF(X509_EXTENSION) *
+X509v3_add_ext(STACK_OF(X509_EXTENSION) **x, X509_EXTENSION *ex, int loc)
 {
-        X509_EXTENSION *new_ex=NULL;
+        X509_EXTENSION *new_ex = NULL;
         int n;
-        STACK_OF(X509_EXTENSION) *sk=NULL;
+        STACK_OF(X509_EXTENSION) *sk = NULL;
 
         if (x == NULL) {
-                X509err(X509_F_X509V3_ADD_EXT,ERR_R_PASSED_NULL_PARAMETER);
+                X509err(X509_F_X509V3_ADD_EXT, ERR_R_PASSED_NULL_PARAMETER);
                 goto err2;
         }
 
         if (*x == NULL) {
-                if ((sk=sk_X509_EXTENSION_new_null()) == NULL)
+                if ((sk = sk_X509_EXTENSION_new_null()) == NULL)
                         goto err;
         } else
                 sk= *x;
 
-        n=sk_X509_EXTENSION_num(sk);
-        if (loc > n) loc=n;
-        else if (loc < 0) loc=n;
+        n = sk_X509_EXTENSION_num(sk);
+        if (loc > n)
+                loc = n;
+        else if (loc < 0)
+                loc = n;
 
-        if ((new_ex=X509_EXTENSION_dup(ex)) == NULL)
+        if ((new_ex = X509_EXTENSION_dup(ex)) == NULL)
                 goto err2;
-        if (!sk_X509_EXTENSION_insert(sk,new_ex,loc))
+        if (!sk_X509_EXTENSION_insert(sk, new_ex, loc))
                 goto err;
         if (*x == NULL)
-                *x=sk;
-        return(sk);
+                *x = sk;
+        return (sk);
+
 err:
-        X509err(X509_F_X509V3_ADD_EXT,ERR_R_MALLOC_FAILURE);
+        X509err(X509_F_X509V3_ADD_EXT, ERR_R_MALLOC_FAILURE);
 err2:
-        if (new_ex != NULL) X509_EXTENSION_free(new_ex);
-        if (sk != NULL) sk_X509_EXTENSION_free(sk);
-        return(NULL);
+        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)
+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);
+        obj = OBJ_nid2obj(nid);
         if (obj == NULL) {
-                X509err(X509_F_X509_EXTENSION_CREATE_BY_NID,X509_R_UNKNOWN_NID);
-                return(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);
+        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 *
+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 ((ret=X509_EXTENSION_new()) == NULL)
-                {
-                        X509err(X509_F_X509_EXTENSION_CREATE_BY_OBJ,ERR_R_MALLOC_FAILURE);
-                        return(NULL);
+                if ((ret = X509_EXTENSION_new()) == NULL) {
+                        X509err(X509_F_X509_EXTENSION_CREATE_BY_OBJ,
+                            ERR_R_MALLOC_FAILURE);
+                        return (NULL);
                 }
         } else
                 ret= *ex;
 
-        if (!X509_EXTENSION_set_object(ret,obj))
+        if (!X509_EXTENSION_set_object(ret, obj))
                 goto err;
-        if (!X509_EXTENSION_set_critical(ret,crit))
+        if (!X509_EXTENSION_set_critical(ret, crit))
                 goto err;
-        if (!X509_EXTENSION_set_data(ret,data))
+        if (!X509_EXTENSION_set_data(ret, data))
                 goto err;
-        
-        if ((ex != NULL) && (*ex == NULL)) *ex=ret;
-        return(ret);
+
+        if ((ex != NULL) && (*ex == NULL))
+                *ex = ret;
+        return (ret);
+
 err:
         if ((ex == NULL) || (ret != *ex))
                 X509_EXTENSION_free(ret);
-        return(NULL);
+        return (NULL);
 }
 
-int X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj)
+int
+X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj)
 {
         if ((ex == NULL) || (obj == NULL))
-                return(0);
+                return (0);
         ASN1_OBJECT_free(ex->object);
-        ex->object=OBJ_dup(obj);
-        return(1);
+        ex->object = OBJ_dup(obj);
+        return (1);
 }
 
-int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit)
+int
+X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit)
 {
-        if (ex == NULL) return(0);
-        ex->critical=(crit)?0xFF:-1;
-        return(1);
+        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
+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);
+        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)
+ASN1_OBJECT *
+X509_EXTENSION_get_object(X509_EXTENSION *ex)
 {
-        if (ex == NULL) return(NULL);
-        return(ex->object);
+        if (ex == NULL)
+                return (NULL);
+        return (ex->object);
 }
 
-ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ex)
+ASN1_OCTET_STRING *
+X509_EXTENSION_get_data(X509_EXTENSION *ex)
 {
-        if (ex == NULL) return(NULL);
-        return(ex->value);
+        if (ex == NULL)
+                return (NULL);
+        return (ex->value);
 }
 
-int X509_EXTENSION_get_critical(X509_EXTENSION *ex)
+int
+X509_EXTENSION_get_critical(X509_EXTENSION *ex)
 {
-        if (ex == NULL) return(0);
-        if(ex->critical > 0) return 1;
+        if (ex == NULL)
+                return (0);
+        if (ex->critical > 0)
+                return 1;
         return 0;
 }