More indentation consistency: for (), while (), if (), return ()
authorBodo Möller <bodo@openssl.org>
Wed, 6 Sep 2000 13:31:44 +0000 (13:31 +0000)
committerBodo Möller <bodo@openssl.org>
Wed, 6 Sep 2000 13:31:44 +0000 (13:31 +0000)
usually get a space between keyword and opening paranthesis
so that they don't look like function calls, where no space is
used.

crypto/x509/x509_vfy.c

index 6293a39..767b74b 100644 (file)
@@ -87,13 +87,13 @@ static STACK *x509_store_method=NULL;
 
 static int null_callback(int ok, X509_STORE_CTX *e)
        {
-       return(ok);
+       return (ok);
        }
 
 #if 0
 static int x509_subject_cmp(X509 **a, X509 **b)
        {
-       return(X509_subject_name_cmp(*a,*b));
+       return (X509_subject_name_cmp(*a,*b));
        }
 #endif
 
@@ -109,7 +109,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
        if (ctx->cert == NULL)
                {
                X509err(X509_F_X509_VERIFY_CERT,X509_R_NO_CERT_SET_FOR_US_TO_VERIFY);
-               return(-1);
+               return (-1);
                }
 
        cb=ctx->verify_cb;
@@ -205,7 +205,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                                ctx->error=X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT;
                                ctx->current_cert=x;
                                ctx->error_depth=i-1;
-                               if(ok == 1) X509_free(xtmp);
+                               if (ok == 1) X509_free(xtmp);
                                ok=cb(0,ctx);
                                if (!ok) goto end;
                                }
@@ -243,14 +243,14 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                ok = ctx->get_issuer(&xtmp, ctx, x);
 
                if (ok < 0) return ok;
-               if(ok == 0) break;
+               if (ok == 0) break;
 
                x = xtmp;
                if (!sk_X509_push(ctx->chain,x))
                        {
                        X509_free(xtmp);
                        X509err(X509_F_X509_VERIFY_CERT,ERR_R_MALLOC_FAILURE);
-                       return(0);
+                       return (0);
                        }
                num++;
                }
@@ -286,15 +286,15 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                }
 
        /* We have the chain complete: now we need to check its purpose */
-       if(ctx->purpose > 0) ok = check_chain_purpose(ctx);
+       if (ctx->purpose > 0) ok = check_chain_purpose(ctx);
 
-       if(!ok) goto end;
+       if (!ok) goto end;
 
        /* The chain extensions are OK: check trust */
 
-       if(ctx->trust > 0) ok = check_trust(ctx);
+       if (ctx->trust > 0) ok = check_trust(ctx);
 
-       if(!ok) goto end;
+       if (!ok) goto end;
 
        /* We may as well copy down any DSA parameters that are required */
        X509_get_pubkey_parameters(NULL,ctx->chain);
@@ -311,7 +311,7 @@ end:
                }
        if (sktmp != NULL) sk_X509_free(sktmp);
        if (chain_ss != NULL) X509_free(chain_ss);
-       return(ok);
+       return (ok);
        }
 
 
@@ -322,10 +322,10 @@ static X509 *find_issuer(X509_STORE_CTX *ctx, STACK_OF(X509) *sk, X509 *x)
 {
        int i;
        X509 *issuer;
-       for(i = 0; i < sk_X509_num(sk); i++)
+       for (i = 0; i < sk_X509_num(sk); i++)
                {
                issuer = sk_X509_value(sk, i);
-               if(ctx->check_issued(ctx, x, issuer))
+               if (ctx->check_issued(ctx, x, issuer))
                        return issuer;
                }
        return NULL;
@@ -382,7 +382,7 @@ static int check_chain_purpose(X509_STORE_CTX *ctx)
        cb=ctx->verify_cb;
        if (cb == NULL) cb=null_callback;
        /* Check all untrusted certificates */
-       for(i = 0; i < ctx->last_untrusted; i++)
+       for (i = 0; i < ctx->last_untrusted; i++)
                {
                x = sk_X509_value(ctx->chain, i);
                if (!X509_check_purpose(x, ctx->purpose, i))
@@ -397,7 +397,7 @@ static int check_chain_purpose(X509_STORE_CTX *ctx)
                        if (!ok) goto end;
                        }
                /* Check pathlen */
-               if((i > 1) && (x->ex_pathlen != -1)
+               if ((i > 1) && (x->ex_pathlen != -1)
                           && (i > (x->ex_pathlen + 1)))
                        {
                        ctx->error = X509_V_ERR_PATH_LENGTH_EXCEEDED;
@@ -409,7 +409,7 @@ static int check_chain_purpose(X509_STORE_CTX *ctx)
                }
        ok = 1;
  end:
-       return(ok);
+       return (ok);
 #endif
 }
 
@@ -436,7 +436,7 @@ static int check_trust(X509_STORE_CTX *ctx)
        else
                ctx->error = X509_V_ERR_CERT_UNTRUSTED;
        ok = cb(0, ctx);
-       return(ok);
+       return (ok);
 #endif
 }
 
@@ -556,7 +556,7 @@ static int internal_verify(X509_STORE_CTX *ctx)
                }
        ok=1;
 end:
-       return(ok);
+       return (ok);
        }
 
 int X509_cmp_current_time(ASN1_TIME *ctm)
@@ -577,7 +577,7 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time)
        str=(char *)ctm->data;
        if (ctm->type == V_ASN1_UTCTIME)
                {
-               if ((i < 11) || (i > 17)) return(0);
+               if ((i < 11) || (i > 17)) return (0);
                memcpy(p,str,10);
                p+=10;
                str+=10;
@@ -600,7 +600,7 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time)
                if (*str == '.')
                        {
                        str++;
-                       while((*str >= '0') && (*str <= '9')) str++;
+                       while ((*str >= '0') && (*str <= '9')) str++;
                        }
                
                }
@@ -612,7 +612,7 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time)
        else
                {
                if ((*str != '+') && (str[5] != '-'))
-                       return(0);
+                       return (0);
                offset=((str[1]-'0')*10+(str[2]-'0'))*60;
                offset+=(str[3]-'0')*10+(str[4]-'0');
                if (*str == '-')
@@ -624,7 +624,7 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time)
 
        X509_time_adj(&atm,-offset*60, cmp_time);
 
-       if(ctm->type == V_ASN1_UTCTIME)
+       if (ctm->type == V_ASN1_UTCTIME)
                {
                i=(buff1[0]-'0')*10+(buff1[1]-'0');
                if (i < 50) i+=100; /* cf. RFC 2459 */
@@ -636,9 +636,9 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time)
                }
        i=strcmp(buff1,buff2);
        if (i == 0) /* wait a second then return younger :-) */
-               return(-1);
+               return (-1);
        else
-               return(i);
+               return (i);
        }
 
 ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj)
@@ -650,12 +650,12 @@ ASN1_TIME *X509_time_adj(ASN1_TIME *s, long adj, time_t *in_tm)
        {
        time_t t;
 
-       if(in_tm) t = *in_tm;
+       if (in_tm) t = *in_tm;
        else time(&t);
 
        t+=adj;
-       if(!s) return ASN1_TIME_set(s, t);
-       if(s->type == V_ASN1_UTCTIME) return(ASN1_UTCTIME_set(s,t));
+       if (!s) return ASN1_TIME_set(s, t);
+       if (s->type == V_ASN1_UTCTIME) return (ASN1_UTCTIME_set(s,t));
        return ASN1_GENERALIZEDTIME_set(s, t);
        }
 
@@ -664,7 +664,7 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
        EVP_PKEY *ktmp=NULL,*ktmp2;
        int i,j;
 
-       if ((pkey != NULL) && !EVP_PKEY_missing_parameters(pkey)) return(1);
+       if ((pkey != NULL) && !EVP_PKEY_missing_parameters(pkey)) return (1);
 
        for (i=0; i<sk_X509_num(chain); i++)
                {
@@ -672,7 +672,7 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
                if (ktmp == NULL)
                        {
                        X509err(X509_F_X509_GET_PUBKEY_PARAMETERS,X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY);
-                       return(0);
+                       return (0);
                        }
                if (!EVP_PKEY_missing_parameters(ktmp))
                        break;
@@ -685,7 +685,7 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
        if (ktmp == NULL)
                {
                X509err(X509_F_X509_GET_PUBKEY_PARAMETERS,X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN);
-               return(0);
+               return (0);
                }
 
        /* first, populate the other certs */
@@ -698,31 +698,31 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
        
        if (pkey != NULL) EVP_PKEY_copy_parameters(pkey,ktmp);
        EVP_PKEY_free(ktmp);
-       return(1);
+       return (1);
        }
 
 int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
         {
         x509_store_ctx_num++;
-        return(CRYPTO_get_ex_new_index(x509_store_ctx_num-1,
+        return (CRYPTO_get_ex_new_index(x509_store_ctx_num-1,
                &x509_store_ctx_method,
                 argl,argp,new_func,dup_func,free_func));
         }
 
 int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx, int idx, void *data)
        {
-       return(CRYPTO_set_ex_data(&ctx->ex_data,idx,data));
+       return (CRYPTO_set_ex_data(&ctx->ex_data,idx,data));
        }
 
 void *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx, int idx)
        {
-       return(CRYPTO_get_ex_data(&ctx->ex_data,idx));
+       return (CRYPTO_get_ex_data(&ctx->ex_data,idx));
        }
 
 int X509_STORE_CTX_get_error(X509_STORE_CTX *ctx)
        {
-       return(ctx->error);
+       return (ctx->error);
        }
 
 void X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int err)
@@ -732,17 +732,17 @@ void X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int err)
 
 int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx)
        {
-       return(ctx->error_depth);
+       return (ctx->error_depth);
        }
 
 X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx)
        {
-       return(ctx->current_cert);
+       return (ctx->current_cert);
        }
 
 STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx)
        {
-       return(ctx->chain);
+       return (ctx->chain);
        }
 
 STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx)
@@ -750,13 +750,13 @@ STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx)
        int i;
        X509 *x;
        STACK_OF(X509) *chain;
-       if(!ctx->chain || !(chain = sk_X509_dup(ctx->chain))) return NULL;
-       for(i = 0; i < sk_X509_num(chain); i++)
+       if (!ctx->chain || !(chain = sk_X509_dup(ctx->chain))) return NULL;
+       for (i = 0; i < sk_X509_num(chain); i++)
                {
                x = sk_X509_value(chain, i);
                CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
                }
-       return(chain);
+       return (chain);
        }
 
 void X509_STORE_CTX_set_cert(X509_STORE_CTX *ctx, X509 *x)
@@ -800,17 +800,17 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
                {
                X509_PURPOSE *ptmp;
                idx = X509_PURPOSE_get_by_id(purpose);
-               if(idx == -1)
+               if (idx == -1)
                        {
                        X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT,
                                                X509_R_UNKNOWN_PURPOSE_ID);
                        return 0;
                        }
                ptmp = X509_PURPOSE_get0(idx);
-               if(ptmp->trust == X509_TRUST_DEFAULT)
+               if (ptmp->trust == X509_TRUST_DEFAULT)
                        {
                        idx = X509_PURPOSE_get_by_id(def_purpose);
-                       if(idx == -1)
+                       if (idx == -1)
                                {
                                X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT,
                                                X509_R_UNKNOWN_PURPOSE_ID);
@@ -819,12 +819,12 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
                        ptmp = X509_PURPOSE_get0(idx);
                        }
                /* If trust not set then get from purpose default */
-               if(!trust) trust = ptmp->trust;
+               if (!trust) trust = ptmp->trust;
                }
-       if(trust)
+       if (trust)
                {
                idx = X509_TRUST_get_by_id(trust);
-               if(idx == -1)
+               if (idx == -1)
                        {
                        X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT,
                                                X509_R_UNKNOWN_TRUST_ID);
@@ -832,8 +832,8 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
                        }
                }
 
-       if(purpose) ctx->purpose = purpose;
-       if(trust) ctx->trust = trust;
+       if (purpose) ctx->purpose = purpose;
+       if (trust) ctx->trust = trust;
        return 1;
 }
 
@@ -891,7 +891,7 @@ void X509_STORE_CTX_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk)
 
 void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx)
        {
-       if(ctx->cleanup) ctx->cleanup(ctx);
+       if (ctx->cleanup) ctx->cleanup(ctx);
        if (ctx->chain != NULL)
                {
                sk_X509_pop_free(ctx->chain,X509_free);