Another round of indentation changes: Position braces consistently,

[openssl.git] / crypto / x509 / x509_lu.c

diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index 8dfd75591c85d2c925904d2d7870055cd6ca9a7f..1e6c0401459b979dc05fcd9f538c178c9627cd6c 100644 (file)
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -68,7 +68,7 @@ X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
        X509_LOOKUP *ret;
 
        ret=(X509_LOOKUP *)OPENSSL_malloc(sizeof(X509_LOOKUP));
        X509_LOOKUP *ret;
 
        ret=(X509_LOOKUP *)OPENSSL_malloc(sizeof(X509_LOOKUP));

-       if (ret == NULL) return(NULL);
+       if (ret == NULL) return NULL;

 
        ret->init=0;
        ret->skip=0;
 
        ret->init=0;
        ret->skip=0;


@@ -78,9 +78,9 @@ X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
        if ((method->new_item != NULL) && !method->new_item(ret))
                {
                OPENSSL_free(ret);
        if ((method->new_item != NULL) && !method->new_item(ret))
                {
                OPENSSL_free(ret);

-               return(NULL);
+               return NULL;

                }
                }

-       return(ret);
+       return ret;

        }
 
 void X509_LOOKUP_free(X509_LOOKUP *ctx)
        }
 
 void X509_LOOKUP_free(X509_LOOKUP *ctx)


@@ -94,39 +94,39 @@ void X509_LOOKUP_free(X509_LOOKUP *ctx)
 
 int X509_LOOKUP_init(X509_LOOKUP *ctx)
        {
 
 int X509_LOOKUP_init(X509_LOOKUP *ctx)
        {

-       if (ctx->method == NULL) return(0);
+       if (ctx->method == NULL) return (0);

        if (ctx->method->init != NULL)
        if (ctx->method->init != NULL)

-               return(ctx->method->init(ctx));
+               return ctx->method->init(ctx);

        else
        else

-               return(1);
+               return 1;

        }
 
 int X509_LOOKUP_shutdown(X509_LOOKUP *ctx)
        {
        }
 
 int X509_LOOKUP_shutdown(X509_LOOKUP *ctx)
        {

-       if (ctx->method == NULL) return(0);
+       if (ctx->method == NULL) return 0;

        if (ctx->method->shutdown != NULL)
        if (ctx->method->shutdown != NULL)

-               return(ctx->method->shutdown(ctx));
+               return ctx->method->shutdown(ctx);

        else
        else

-               return(1);
+               return 1;

        }
 
 int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
             char **ret)
        {
        }
 
 int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
             char **ret)
        {

-       if (ctx->method == NULL) return(-1);
+       if (ctx->method == NULL) return -1;

        if (ctx->method->ctrl != NULL)
        if (ctx->method->ctrl != NULL)

-               return(ctx->method->ctrl(ctx,cmd,argc,argl,ret));
+               return ctx->method->ctrl(ctx,cmd,argc,argl,ret);

        else
        else

-               return(1);
+               return 1;

        }
 
 int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
             X509_OBJECT *ret)
        {
        if ((ctx->method == NULL) || (ctx->method->get_by_subject == NULL))
        }
 
 int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
             X509_OBJECT *ret)
        {
        if ((ctx->method == NULL) || (ctx->method->get_by_subject == NULL))

-               return(X509_LU_FAIL);
-       if (ctx->skip) return(0);
-       return(ctx->method->get_by_subject(ctx,type,name,ret));
+               return X509_LU_FAIL;
+       if (ctx->skip) return 0;
+       return ctx->method->get_by_subject(ctx,type,name,ret);

        }
 
 int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,
        }
 
 int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,


@@ -134,24 +134,24 @@ int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,
        {
        if ((ctx->method == NULL) ||
                (ctx->method->get_by_issuer_serial == NULL))
        {
        if ((ctx->method == NULL) ||
                (ctx->method->get_by_issuer_serial == NULL))

-               return(X509_LU_FAIL);
-       return(ctx->method->get_by_issuer_serial(ctx,type,name,serial,ret));
+               return X509_LU_FAIL;
+       return ctx->method->get_by_issuer_serial(ctx,type,name,serial,ret);

        }
 
 int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
             unsigned char *bytes, int len, X509_OBJECT *ret)
        {
        if ((ctx->method == NULL) || (ctx->method->get_by_fingerprint == NULL))
        }
 
 int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
             unsigned char *bytes, int len, X509_OBJECT *ret)
        {
        if ((ctx->method == NULL) || (ctx->method->get_by_fingerprint == NULL))

-               return(X509_LU_FAIL);
-       return(ctx->method->get_by_fingerprint(ctx,type,bytes,len,ret));
+               return X509_LU_FAIL;
+       return ctx->method->get_by_fingerprint(ctx,type,bytes,len,ret);

        }
 
 int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str, int len,
             X509_OBJECT *ret)
        {
        if ((ctx->method == NULL) || (ctx->method->get_by_alias == NULL))
        }
 
 int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str, int len,
             X509_OBJECT *ret)
        {
        if ((ctx->method == NULL) || (ctx->method->get_by_alias == NULL))

-               return(X509_LU_FAIL);
-       return(ctx->method->get_by_alias(ctx,type,str,len,ret));
+               return X509_LU_FAIL;
+       return ctx->method->get_by_alias(ctx,type,str,len,ret);

        }
 
   
        }
 
   


@@ -160,7 +160,7 @@ static int x509_object_cmp(const X509_OBJECT * const *a, const X509_OBJECT * con
        int ret;
 
        ret=((*a)->type - (*b)->type);
        int ret;
 
        ret=((*a)->type - (*b)->type);

-       if (ret) return(ret);
+       if (ret) return ret;

        switch ((*a)->type)
                {
        case X509_LU_X509:
        switch ((*a)->type)
                {
        case X509_LU_X509:


@@ -173,7 +173,7 @@ static int x509_object_cmp(const X509_OBJECT * const *a, const X509_OBJECT * con
                /* abort(); */
                return 0;
                }
                /* abort(); */
                return 0;
                }

-       return(ret);
+       return ret;

        }
 
 X509_STORE *X509_STORE_new(void)
        }
 
 X509_STORE *X509_STORE_new(void)


@@ -181,7 +181,7 @@ X509_STORE *X509_STORE_new(void)
        X509_STORE *ret;
 
        if ((ret=(X509_STORE *)OPENSSL_malloc(sizeof(X509_STORE))) == NULL)
        X509_STORE *ret;
 
        if ((ret=(X509_STORE *)OPENSSL_malloc(sizeof(X509_STORE))) == NULL)

-               return(NULL);
+               return NULL;

        ret->objs = sk_X509_OBJECT_new(x509_object_cmp);
        ret->cache=1;
        ret->get_cert_methods=sk_X509_LOOKUP_new_null();
        ret->objs = sk_X509_OBJECT_new(x509_object_cmp);
        ret->cache=1;
        ret->get_cert_methods=sk_X509_LOOKUP_new_null();


@@ -190,7 +190,7 @@ X509_STORE *X509_STORE_new(void)
        memset(&ret->ex_data,0,sizeof(CRYPTO_EX_DATA));
        ret->references=1;
        ret->depth=0;
        memset(&ret->ex_data,0,sizeof(CRYPTO_EX_DATA));
        ret->references=1;
        ret->depth=0;

-       return(ret);
+       return ret;

        }
 
 static void cleanup(X509_OBJECT *a)
        }
 
 static void cleanup(X509_OBJECT *a)


@@ -217,7 +217,7 @@ void X509_STORE_free(X509_STORE *vfy)
        STACK_OF(X509_LOOKUP) *sk;
        X509_LOOKUP *lu;
 
        STACK_OF(X509_LOOKUP) *sk;
        X509_LOOKUP *lu;
 

-       if(vfy == NULL)
+       if (vfy == NULL)

            return;
 
        sk=vfy->get_cert_methods;
            return;
 
        sk=vfy->get_cert_methods;


@@ -246,22 +246,22 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m)
                lu=sk_X509_LOOKUP_value(sk,i);
                if (m == lu->method)
                        {
                lu=sk_X509_LOOKUP_value(sk,i);
                if (m == lu->method)
                        {

-                       return(lu);
+                       return lu;

                        }
                }
        /* a new one */
        lu=X509_LOOKUP_new(m);
        if (lu == NULL)
                        }
                }
        /* a new one */
        lu=X509_LOOKUP_new(m);
        if (lu == NULL)

-               return(NULL);
+               return NULL;

        else
                {
                lu->store_ctx=v;
                if (sk_X509_LOOKUP_push(v->get_cert_methods,lu))
        else
                {
                lu->store_ctx=v;
                if (sk_X509_LOOKUP_push(v->get_cert_methods,lu))

-                       return(lu);
+                       return lu;

                else
                        {
                        X509_LOOKUP_free(lu);
                else
                        {
                        X509_LOOKUP_free(lu);

-                       return(NULL);
+                       return NULL;

                        }
                }
        }
                        }
                }
        }


@@ -285,7 +285,7 @@ int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,
                        if (j < 0)
                                {
                                vs->current_method=j;
                        if (j < 0)
                                {
                                vs->current_method=j;

-                               return(j);
+                               return j;

                                }
                        else if (j)
                                {
                                }
                        else if (j)
                                {


@@ -295,7 +295,7 @@ int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,
                        }
                vs->current_method=0;
                if (tmp == NULL)
                        }
                vs->current_method=0;
                if (tmp == NULL)

-                       return(0);
+                       return 0;

                }
 
 /*     if (ret->data.ptr != NULL)
                }
 
 /*     if (ret->data.ptr != NULL)


@@ -306,7 +306,7 @@ int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,
 
        X509_OBJECT_up_ref_count(ret);
 
 
        X509_OBJECT_up_ref_count(ret);
 

-       return(1);
+       return 1;

        }
 
 int X509_STORE_add_cert(X509_STORE *ctx, X509 *x)
        }
 
 int X509_STORE_add_cert(X509_STORE *ctx, X509 *x)


@@ -314,12 +314,12 @@ int X509_STORE_add_cert(X509_STORE *ctx, X509 *x)
        X509_OBJECT *obj;
        int ret=1;
 
        X509_OBJECT *obj;
        int ret=1;
 

-       if (x == NULL) return(0);
+       if (x == NULL) return 0;

        obj=(X509_OBJECT *)OPENSSL_malloc(sizeof(X509_OBJECT));
        if (obj == NULL)
                {
                X509err(X509_F_X509_STORE_ADD_CERT,ERR_R_MALLOC_FAILURE);
        obj=(X509_OBJECT *)OPENSSL_malloc(sizeof(X509_OBJECT));
        if (obj == NULL)
                {
                X509err(X509_F_X509_STORE_ADD_CERT,ERR_R_MALLOC_FAILURE);

-               return(0);
+               return 0;

                }
        obj->type=X509_LU_X509;
        obj->data.x509=x;
                }
        obj->type=X509_LU_X509;
        obj->data.x509=x;


@@ -340,7 +340,7 @@ int X509_STORE_add_cert(X509_STORE *ctx, X509 *x)
 
        CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);
 
 
        CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);
 

-       return(ret);    
+       return ret;

        }
 
 int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x)
        }
 
 int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x)


@@ -348,12 +348,12 @@ int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x)
        X509_OBJECT *obj;
        int ret=1;
 
        X509_OBJECT *obj;
        int ret=1;
 

-       if (x == NULL) return(0);
+       if (x == NULL) return 0;

        obj=(X509_OBJECT *)OPENSSL_malloc(sizeof(X509_OBJECT));
        if (obj == NULL)
                {
                X509err(X509_F_X509_STORE_ADD_CRL,ERR_R_MALLOC_FAILURE);
        obj=(X509_OBJECT *)OPENSSL_malloc(sizeof(X509_OBJECT));
        if (obj == NULL)
                {
                X509err(X509_F_X509_STORE_ADD_CRL,ERR_R_MALLOC_FAILURE);

-               return(0);
+               return 0;

                }
        obj->type=X509_LU_CRL;
        obj->data.crl=x;
                }
        obj->type=X509_LU_CRL;
        obj->data.crl=x;


@@ -373,7 +373,7 @@ int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x)
 
        CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);
 
 
        CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);
 

-       return(ret);    
+       return ret;

        }
 
 void X509_OBJECT_up_ref_count(X509_OBJECT *a)
        }
 
 void X509_OBJECT_up_ref_count(X509_OBJECT *a)


@@ -437,7 +437,7 @@ X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h, int type,
 {
        int idx;
        idx = X509_OBJECT_idx_by_subject(h, type, name);
 {
        int idx;
        idx = X509_OBJECT_idx_by_subject(h, type, name);

-       if(idx==-1) return NULL;
+       if (idx==-1) return NULL;

        return sk_X509_OBJECT_value(h, idx);
 }
 
        return sk_X509_OBJECT_value(h, idx);
 }
 


@@ -446,13 +446,16 @@ X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x
        int idx, i;
        X509_OBJECT *obj;
        idx = sk_X509_OBJECT_find(h, x);
        int idx, i;
        X509_OBJECT *obj;
        idx = sk_X509_OBJECT_find(h, x);

-       if(idx == -1) return NULL;
-       if(x->type != X509_LU_X509) return sk_X509_OBJECT_value(h, idx);
-       for(i = idx; i < sk_X509_OBJECT_num(h); i++) {
+       if (idx == -1) return NULL;
+       if (x->type != X509_LU_X509) return sk_X509_OBJECT_value(h, idx);
+       for (i = idx; i < sk_X509_OBJECT_num(h); i++)
+               {

                obj = sk_X509_OBJECT_value(h, i);
                obj = sk_X509_OBJECT_value(h, i);

-               if(x509_object_cmp((const X509_OBJECT **)&obj, (const X509_OBJECT **)&x)) return NULL;
-               if((x->type != X509_LU_X509) || !X509_cmp(obj->data.x509, x->data.x509)) return obj;
-       }
+               if (x509_object_cmp((const X509_OBJECT **)&obj, (const X509_OBJECT **)&x))
+                       return NULL;
+               if ((x->type != X509_LU_X509) || !X509_cmp(obj->data.x509, x->data.x509))
+                       return obj;
+               }

        return NULL;
 }
 
        return NULL;
 }
 


@@ -494,28 +497,31 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
                return 0;
                }
        /* If certificate matches all OK */
                return 0;
                }
        /* If certificate matches all OK */

-       if(ctx->check_issued(ctx, x, obj.data.x509)) {
-                       *issuer = obj.data.x509;
-                       return 1;
-       }
+       if (ctx->check_issued(ctx, x, obj.data.x509))
+               {
+               *issuer = obj.data.x509;
+               return 1;
+               }

        X509_OBJECT_free_contents(&obj);
        /* Else find index of first matching cert */
        idx = X509_OBJECT_idx_by_subject(ctx->ctx->objs, X509_LU_X509, xn);
        /* This shouldn't normally happen since we already have one match */
        X509_OBJECT_free_contents(&obj);
        /* Else find index of first matching cert */
        idx = X509_OBJECT_idx_by_subject(ctx->ctx->objs, X509_LU_X509, xn);
        /* This shouldn't normally happen since we already have one match */

-       if(idx == -1) return 0;
+       if (idx == -1) return 0;

 
        /* Look through all matching certificates for a suitable issuer */
 
        /* Look through all matching certificates for a suitable issuer */

-       for(i = idx; i < sk_X509_OBJECT_num(ctx->ctx->objs); i++) {
+       for (i = idx; i < sk_X509_OBJECT_num(ctx->ctx->objs); i++)
+               {

                pobj = sk_X509_OBJECT_value(ctx->ctx->objs, i);
                /* See if we've ran out of matches */
                pobj = sk_X509_OBJECT_value(ctx->ctx->objs, i);
                /* See if we've ran out of matches */

-               if(pobj->type != X509_LU_X509) return 0;
-               if(X509_NAME_cmp(xn, X509_get_subject_name(pobj->data.x509))) return 0;
-               if(ctx->check_issued(ctx, x, pobj->data.x509)) {
+               if (pobj->type != X509_LU_X509) return 0;
+               if (X509_NAME_cmp(xn, X509_get_subject_name(pobj->data.x509))) return 0;
+               if (ctx->check_issued(ctx, x, pobj->data.x509))
+                       {

                        *issuer = pobj->data.x509;
                        X509_OBJECT_up_ref_count(pobj);
                        return 1;
                        *issuer = pobj->data.x509;
                        X509_OBJECT_up_ref_count(pobj);
                        return 1;

+                       }

                }
                }

-       }

        return 0;
 }
 
        return 0;
 }