generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename typed version of M_ASN1_get M_ASN1_get_x to avoid conflicts.

Browse Source 
Remove more bogus shadow warnings.
This commit is contained in:
Dr. Stephen Henson
2005-04-20 21:48:06 +00:00
parent 836ec0c764
commit 2c45bf2bc9
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/x509/x509_vfy.c
View File

@@ -102,7 +102,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
X509_VERIFY_PARAM *param = ctx->param;
int depth,i,ok=0;
int num;
int (*cb)(int ok,X509_STORE_CTX *ctx);
int (*cb)(int xok,X509_STORE_CTX *xctx);
STACK_OF(X509) *sktmp=NULL;
if (ctx->cert == NULL)
{
@@ -388,7 +388,7 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
#else
int i, ok=0, must_be_ca;
X509 *x;
int (*cb)(int ok,X509_STORE_CTX *ctx);
int (*cb)(int xok,X509_STORE_CTX *xctx);
int proxy_path_length = 0;
int allow_proxy_certs =
!!(ctx->param->flags & X509_V_FLAG_ALLOW_PROXY_CERTS);
@@ -531,7 +531,7 @@ static int check_trust(X509_STORE_CTX *ctx)
#else
int i, ok;
X509 *x;
int (*cb)(int ok,X509_STORE_CTX *ctx);
int (*cb)(int xok,X509_STORE_CTX *xctx);
cb=ctx->verify_cb;
/* For now just check the last certificate in the chain */
i = sk_X509_num(ctx->chain) - 1;
@@ -941,7 +941,7 @@ static int internal_verify(X509_STORE_CTX *ctx)
int ok=0,n;
X509 *xs,*xi;
EVP_PKEY *pkey=NULL;
int (*cb)(int ok,X509_STORE_CTX *ctx);
int (*cb)(int xok,X509_STORE_CTX *xctx);
cb=ctx->verify_cb;