projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rid the world of yet more evil casts.
[openssl.git]
/
crypto
/
x509
/
x509_lu.c
diff --git
a/crypto/x509/x509_lu.c
b/crypto/x509/x509_lu.c
index 2c7e10a46e37c7dc6df5a8de6f82373959ae8667..a70ce771a4bba6c503adbfb794c87659d75d2fb2 100644
(file)
--- a/
crypto/x509/x509_lu.c
+++ b/
crypto/x509/x509_lu.c
@@
-109,7
+109,7
@@
int X509_LOOKUP_shutdown(ctx)
X509_LOOKUP *ctx;
{
if (ctx->method == NULL) return(0);
X509_LOOKUP *ctx;
{
if (ctx->method == NULL) return(0);
- if (ctx->method->
init
!= NULL)
+ if (ctx->method->
shutdown
!= NULL)
return(ctx->method->shutdown(ctx));
else
return(1);
return(ctx->method->shutdown(ctx));
else
return(1);
@@
-175,7
+175,7
@@
X509_OBJECT *ret;
{
if ((ctx->method == NULL) || (ctx->method->get_by_alias == NULL))
return(X509_LU_FAIL);
{
if ((ctx->method == NULL) || (ctx->method->get_by_alias == NULL))
return(X509_LU_FAIL);
- return(ctx->method->get_by_alias(ctx,str,len,ret));
+ return(ctx->method->get_by_alias(ctx,
type,
str,len,ret));
}
static unsigned long x509_object_hash(a)
}
static unsigned long x509_object_hash(a)
@@
-231,6
+231,7
@@
X509_STORE *X509_STORE_new()
ret->verify_cb=NULL;
memset(&ret->ex_data,0,sizeof(CRYPTO_EX_DATA));
ret->references=1;
ret->verify_cb=NULL;
memset(&ret->ex_data,0,sizeof(CRYPTO_EX_DATA));
ret->references=1;
+ ret->depth=0;
return(ret);
}
return(ret);
}
@@
-258,6
+259,9
@@
X509_STORE *vfy;
STACK *sk;
X509_LOOKUP *lu;
STACK *sk;
X509_LOOKUP *lu;
+ if(vfy == NULL)
+ return;
+
sk=vfy->get_cert_methods;
for (i=0; i<sk_num(sk); i++)
{
sk=vfy->get_cert_methods;
for (i=0; i<sk_num(sk); i++)
{
@@
-318,7
+322,7
@@
X509_OBJECT *ret;
X509_OBJECT stmp,*tmp;
int i,j;
X509_OBJECT stmp,*tmp;
int i,j;
- tmp=X509_OBJECT_retrive_by_subject(ctx->certs,type,name);
+ tmp=X509_OBJECT_retri
e
ve_by_subject(ctx->certs,type,name);
if (tmp == NULL)
{
if (tmp == NULL)
{
@@
-381,7
+385,7
@@
X509_OBJECT *a;
}
}
}
}
-X509_OBJECT *X509_OBJECT_retrive_by_subject(h,type,name)
+X509_OBJECT *X509_OBJECT_retri
e
ve_by_subject(h,type,name)
LHASH *h;
int type;
X509_NAME *name;
LHASH *h;
int type;
X509_NAME *name;