From 38899535f85784442395aeab921b25fc79266491 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Tue, 26 Oct 1999 01:52:16 +0000 Subject: [PATCH] Report an error from X509_STORE_load_locations when X509_LOOKUP_load_file or X509_LOOKUP_add_dir failed. --- crypto/x509/x509_d2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c index 5f0da4c9f2..753d53eb43 100644 --- a/crypto/x509/x509_d2.c +++ b/crypto/x509/x509_d2.c @@ -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); -- 2.25.1