1 files changed, 88 insertions, 62 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c
index a2b0322e44..81ba50ca03 100644
--- a/src/lib/libcrypto/x509v3/v3_sxnet.c
+++ b/src/lib/libcrypto/x509v3/v3_sxnet.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
@@ -67,24 +67,25 @@
 
 #define SXNET_TEST
 
-static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent);
+static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
+    int indent);
 #ifdef SXNET_TEST
 static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-                                                STACK_OF(CONF_VALUE) *nval);
+    STACK_OF(CONF_VALUE) *nval);
 #endif
 const X509V3_EXT_METHOD v3_sxnet = {
-NID_sxnet, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(SXNET),
-0,0,0,0,
-0,0,
-0, 
+        NID_sxnet, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(SXNET),
+        0, 0, 0, 0,
+        0, 0,
+        0,
 #ifdef SXNET_TEST
-(X509V3_EXT_V2I)sxnet_v2i,
+        (X509V3_EXT_V2I)sxnet_v2i,
 #else
-0,
+        0,
 #endif
-(X509V3_EXT_I2R)sxnet_i2r,
-0,
-NULL
+        (X509V3_EXT_I2R)sxnet_i2r,
+        0,
+        NULL
 };
 
 ASN1_SEQUENCE(SXNETID) = {
@@ -101,16 +102,17 @@ ASN1_SEQUENCE(SXNET) = {
 
 IMPLEMENT_ASN1_FUNCTIONS(SXNET)
 
-static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
-             int indent)
+static int
+sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent)
 {
         long v;
         char *tmp;
         SXNETID *id;
         int i;
+
         v = ASN1_INTEGER_get(sx->version);
         BIO_printf(out, "%*sVersion: %ld (0x%lX)", indent, "", v + 1, v);
-        for(i = 0; i < sk_SXNETID_num(sx->ids); i++) {
+        for (i = 0; i < sk_SXNETID_num(sx->ids); i++) {
                 id = sk_SXNETID_value(sx->ids, i);
                 tmp = i2s_ASN1_INTEGER(NULL, id->zone);
                 BIO_printf(out, "\n%*sZone: %s, User: ", indent, "", tmp);
@@ -127,34 +129,36 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
  * they should really be separate values for each user.
  */
 
-
-static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-             STACK_OF(CONF_VALUE) *nval)
+static SXNET *
+sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval)
 {
         CONF_VALUE *cnf;
         SXNET *sx = NULL;
         int i;
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
+
+        for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
                 cnf = sk_CONF_VALUE_value(nval, i);
-                if(!SXNET_add_id_asc(&sx, cnf->name, cnf->value, -1))
-                                                                 return NULL;
+                if (!SXNET_add_id_asc(&sx, cnf->name, cnf->value, -1))
+                        return NULL;
         }
         return sx;
 }
-                
-        
+
 #endif
 
 /* Strong Extranet utility functions */
 
 /* Add an id given the zone as an ASCII number */
 
-int SXNET_add_id_asc(SXNET **psx, char *zone, char *user,
-             int userlen)
+int
+SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen)
 {
         ASN1_INTEGER *izone = NULL;
-        if(!(izone = s2i_ASN1_INTEGER(NULL, zone))) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_ASC,X509V3_R_ERROR_CONVERTING_ZONE);
+
+        if (!(izone = s2i_ASN1_INTEGER(NULL, zone))) {
+                X509V3err(X509V3_F_SXNET_ADD_ID_ASC,
+                    X509V3_R_ERROR_CONVERTING_ZONE);
                 return 0;
         }
         return SXNET_add_id_INTEGER(psx, izone, user, userlen);
@@ -162,17 +166,18 @@ int SXNET_add_id_asc(SXNET **psx, char *zone, char *user,
 
 /* Add an id given the zone as an unsigned long */
 
-int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user,
-             int userlen)
+int
+SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen)
 {
         ASN1_INTEGER *izone = NULL;
-        if(!(izone = M_ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_ULONG,ERR_R_MALLOC_FAILURE);
+
+        if (!(izone = M_ASN1_INTEGER_new()) ||
+            !ASN1_INTEGER_set(izone, lzone)) {
+                X509V3err(X509V3_F_SXNET_ADD_ID_ULONG, ERR_R_MALLOC_FAILURE);
                 M_ASN1_INTEGER_free(izone);
                 return 0;
         }
         return SXNET_add_id_INTEGER(psx, izone, user, userlen);
-        
 }
 
 /* Add an id given the zone as an ASN1_INTEGER.
@@ -180,52 +185,67 @@ int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user,
  * free it up afterwards.
  */
 
-int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user,
-             int userlen)
+int
+SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user, int userlen)
 {
         SXNET *sx = NULL;
         SXNETID *id = NULL;
-        if(!psx || !zone || !user) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_INVALID_NULL_ARGUMENT);
+
+        if (!psx || !zone || !user) {
+                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,
+                    X509V3_R_INVALID_NULL_ARGUMENT);
                 return 0;
         }
-        if(userlen == -1) userlen = strlen(user);
-        if(userlen > 64) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_USER_TOO_LONG);
+        if (userlen == -1)
+                userlen = strlen(user);
+        if (userlen > 64) {
+                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,
+                    X509V3_R_USER_TOO_LONG);
                 return 0;
         }
-        if(!*psx) {
-                if(!(sx = SXNET_new())) goto err;
-                if(!ASN1_INTEGER_set(sx->version, 0)) goto err;
+        if (!*psx) {
+                if (!(sx = SXNET_new()))
+                        goto err;
+                if (!ASN1_INTEGER_set(sx->version, 0))
+                        goto err;
                 *psx = sx;
-        } else sx = *psx;
-        if(SXNET_get_id_INTEGER(sx, zone)) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_DUPLICATE_ZONE_ID);
+        } else
+                sx = *psx;
+        if (SXNET_get_id_INTEGER(sx, zone)) {
+                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,
+                    X509V3_R_DUPLICATE_ZONE_ID);
                 return 0;
         }
 
-        if(!(id = SXNETID_new())) goto err;
-        if(userlen == -1) userlen = strlen(user);
-                
-        if(!M_ASN1_OCTET_STRING_set(id->user, user, userlen)) goto err;
-        if(!sk_SXNETID_push(sx->ids, id)) goto err;
+        if (!(id = SXNETID_new()))
+                goto err;
+        if (userlen == -1)
+                userlen = strlen(user);
+
+        if (!M_ASN1_OCTET_STRING_set(id->user, user, userlen))
+                goto err;
+        if (!sk_SXNETID_push(sx->ids, id))
+                goto err;
         id->zone = zone;
         return 1;
-        
-        err:
-        X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,ERR_R_MALLOC_FAILURE);
+
+err:
+        X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER, ERR_R_MALLOC_FAILURE);
         SXNETID_free(id);
         SXNET_free(sx);
         *psx = NULL;
         return 0;
 }
 
-ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone)
+ASN1_OCTET_STRING *
+SXNET_get_id_asc(SXNET *sx, char *zone)
 {
         ASN1_INTEGER *izone = NULL;
         ASN1_OCTET_STRING *oct;
-        if(!(izone = s2i_ASN1_INTEGER(NULL, zone))) {
-                X509V3err(X509V3_F_SXNET_GET_ID_ASC,X509V3_R_ERROR_CONVERTING_ZONE);
+
+        if (!(izone = s2i_ASN1_INTEGER(NULL, zone))) {
+                X509V3err(X509V3_F_SXNET_GET_ID_ASC,
+                    X509V3_R_ERROR_CONVERTING_ZONE);
                 return NULL;
         }
         oct = SXNET_get_id_INTEGER(sx, izone);
@@ -233,12 +253,15 @@ ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone)
         return oct;
 }
 
-ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
+ASN1_OCTET_STRING *
+SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
 {
         ASN1_INTEGER *izone = NULL;
         ASN1_OCTET_STRING *oct;
-        if(!(izone = M_ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) {
-                X509V3err(X509V3_F_SXNET_GET_ID_ULONG,ERR_R_MALLOC_FAILURE);
+
+        if (!(izone = M_ASN1_INTEGER_new()) ||
+            !ASN1_INTEGER_set(izone, lzone)) {
+                X509V3err(X509V3_F_SXNET_GET_ID_ULONG, ERR_R_MALLOC_FAILURE);
                 M_ASN1_INTEGER_free(izone);
                 return NULL;
         }
@@ -247,13 +270,16 @@ ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
         return oct;
 }
 
-ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone)
+ASN1_OCTET_STRING *
+SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone)
 {
         SXNETID *id;
         int i;
-        for(i = 0; i < sk_SXNETID_num(sx->ids); i++) {
+
+        for (i = 0; i < sk_SXNETID_num(sx->ids); i++) {
                 id = sk_SXNETID_value(sx->ids, i);
-                if(!M_ASN1_INTEGER_cmp(id->zone, zone)) return id->user;
+                if (!M_ASN1_INTEGER_cmp(id->zone, zone))
+                        return id->user;
         }
         return NULL;
 }