summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2019-08-29 13:02:54 +1000
committerPauli <paul.dale@oracle.com>2019-09-06 19:27:57 +1000
commit185ce3d93e25effe3c8f8992339c177ea4883d4f (patch)
treed7217e5a80a14d3787790fead9097dc18ce23577 /crypto
parent9d8e1569aa2adee724497ab016c5086ccbccad33 (diff)
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 <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9662)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/provider_core.c3
1 files changed, 2 insertions, 1 deletions
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 */