From 185ce3d93e25effe3c8f8992339c177ea4883d4f Mon Sep 17 00:00:00 2001 From: Pauli Date: Thu, 29 Aug 2019 13:02:54 +1000 Subject: [PATCH] ossl_provider_library_context(NULL) returns NULL. This will only be required until everything is moved to providers and a NULL provider pointer won't be possible. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9662) --- crypto/provider_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/provider_core.c b/crypto/provider_core.c index 541a1e169b..356327f375 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -709,7 +709,8 @@ const char *ossl_provider_module_path(const OSSL_PROVIDER *prov) OPENSSL_CTX *ossl_provider_library_context(const OSSL_PROVIDER *prov) { - return prov->libctx; + /* TODO(3.0) just: return prov->libctx; */ + return prov != NULL ? prov->libctx : NULL; } /* Wrappers around calls to the provider */ -- 2.25.1