From: Dr. David von Oheimb <dev@ddvo.net>
Date: Fri, 25 Apr 2025 10:54:00 +0000 (+0200)
Subject: by_store.c: suppress in cache_objects() likely non-relevant error queue entries calli... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6f858b1912b68d98a45fb3cebc832519dea7c85;p=thirdparty%2Fopenssl.git

by_store.c: suppress in cache_objects() likely non-relevant error queue entries calling OSSL_STORE_find()

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27498)
---

diff --git a/crypto/x509/by_store.c b/crypto/x509/by_store.c
index d1e186f4fc2..39eb0a34173 100644
--- a/crypto/x509/by_store.c
+++ b/crypto/x509/by_store.c
@@ -43,8 +43,11 @@ static int cache_objects(X509_LOOKUP *lctx, const char *uri,
      * but it's a nice optimization when it can be applied (such as on an
      * actual directory with a thousand CA certs).
      */
-    if (criterion != NULL)
+    if (criterion != NULL) {
+        ERR_set_mark();
         OSSL_STORE_find(ctx, criterion);
+        ERR_pop_to_mark();
+    }
 
     for (;;) {
         OSSL_STORE_INFO *info = OSSL_STORE_load(ctx);