Commit 38899535 authored by Bodo Möller's avatar Bodo Möller
Browse files

Report an error from X509_STORE_load_locations 

when X509_LOOKUP_load_file or X509_LOOKUP_add_dir failed.
parent b6b1f0d0

crypto/x509/x509_d2.c

+4 −2
Original line number Diff line number Diff line
@@ -89,13 +89,15 @@ int X509_STORE_load_locations(X509_STORE *ctx, const char *file, 
		{

		lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file());

		if (lookup == NULL) return(0);

		X509_LOOKUP_load_file(lookup,file,X509_FILETYPE_PEM);

		if (X509_LOOKUP_load_file(lookup,file,X509_FILETYPE_PEM) != 1)

		    return(0);

		}

	if (path != NULL)

		{

		lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_hash_dir());

		if (lookup == NULL) return(0);

		X509_LOOKUP_add_dir(lookup,path,X509_FILETYPE_PEM);

		if (X509_LOOKUP_add_dir(lookup,path,X509_FILETYPE_PEM) != 1)

		    return(0);

		}

	if ((path == NULL) && (file == NULL))

		return(0);