mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

clear error queue on success and return NULL if no cert could be read

Browse Source 
PR: 1088
This commit is contained in:
Nils Larsch 2005-06-01 08:38:44 +00:00
parent 88737991d2
commit 1d42741a19
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ssl/ssl_cert.c
View File

@ -635,14 +635,13 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
BIO *in; BIO *in;
X509 *x=NULL; X509 *x=NULL;
X509_NAME *xn=NULL; X509_NAME *xn=NULL;
STACK_OF(X509_NAME) *ret,*sk; STACK_OF(X509_NAME) *ret = NULL,*sk;
ret=sk_X509_NAME_new_null();
sk=sk_X509_NAME_new(xname_cmp); sk=sk_X509_NAME_new(xname_cmp);
in=BIO_new(BIO_s_file_internal()); in=BIO_new(BIO_s_file_internal());
if ((ret == NULL) || (sk == NULL) || (in == NULL)) if ((sk == NULL) || (in == NULL))
{ {
SSLerr(SSL_F_SSL_LOAD_CLIENT_CA_FILE,ERR_R_MALLOC_FAILURE); SSLerr(SSL_F_SSL_LOAD_CLIENT_CA_FILE,ERR_R_MALLOC_FAILURE);
goto err; goto err;
@ -655,6 +654,15 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
{ {
if (PEM_read_bio_X509(in,&x,NULL,NULL) == NULL) if (PEM_read_bio_X509(in,&x,NULL,NULL) == NULL)
break; break;
if (ret == NULL)
{
ret = sk_X509_NAME_new_null();
if (ret == NULL)
{
SSLerr(SSL_F_SSL_LOAD_CLIENT_CA_FILE,ERR_R_MALLOC_FAILURE);
goto err;
}
}
if ((xn=X509_get_subject_name(x)) == NULL) goto err; if ((xn=X509_get_subject_name(x)) == NULL) goto err;
/* check for duplicates */ /* check for duplicates */
xn=X509_NAME_dup(xn); xn=X509_NAME_dup(xn);
@ -677,6 +685,8 @@ err:
if (sk != NULL) sk_X509_NAME_free(sk); if (sk != NULL) sk_X509_NAME_free(sk);
if (in != NULL) BIO_free(in); if (in != NULL) BIO_free(in);
if (x != NULL) X509_free(x); if (x != NULL) X509_free(x);
if (ret != NULL)
ERR_clear_error();
return(ret); return(ret);
} }
#endif #endif