diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2005-04-20 21:48:06 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2005-04-20 21:48:06 +0000 |
| commit | 2c45bf2bc9be4704c63b024d5721c1f537adb0f2 (patch) | |
| tree | ef7f30f18ea2cee15e32b2400b21cb296b8150ec /crypto/x509 | |
| parent | 836ec0c76488d5056096d33c4868e3d4b9a3eac1 (diff) | |
Rename typed version of M_ASN1_get M_ASN1_get_x to avoid conflicts.
Remove more bogus shadow warnings.
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_vfy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 4a30827c83..9be7aca007 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -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; |