From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 27 Oct 2025 14:48:40 +0000 (+0100)
Subject: CRYPTO_R_ cannot be used with ERR_LIB_OSSL_STORE
X-Git-Tag: 3.6-PRE-CLANG-FORMAT-WEBKIT~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a39eb52409f51ea39b46ea327a1d4a40f37bf484;p=thirdparty%2Fopenssl.git

CRYPTO_R_ cannot be used with ERR_LIB_OSSL_STORE

Use ERR_R_PASSED_NULL_PARAMETER instead.

Fixes e9e643bc580e4ba0c6f8f9b4dd2ce59397b1b786

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29006)

(cherry picked from commit 376f7ee4d123f3842d85ef3c03fd070fb411ec0f)
---

diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
index 5d9601617cc..386a33ce9c5 100644
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.c
@@ -78,7 +78,7 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
     size_t i;
 
     if (uri == NULL) {
-        ERR_raise(ERR_LIB_OSSL_STORE, CRYPTO_R_INVALID_NULL_ARGUMENT);
+        ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }