diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-06 13:51:50 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-15 20:20:08 +0200 |
| commit | 6d382c74b375f1f8c44f04ec3de95ff781598a3b (patch) | |
| tree | 4991b57879da3810fbf912c3d169232755380432 /crypto | |
| parent | 60d5331350a5e557908eed0ba7420dba2ad3b79f (diff) | |
Use OSSL_STORE for load_{,pub}key() and load_cert() in apps/lib/apps.c
This also adds the more flexible and general load_key_cert_crl()
as well as helper functions get_passwd(), cleanse(), and clear_free()
to be used also in apps/cmp.c etc.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11755)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/store/store_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c index 15c0862019..e1fc591894 100644 --- a/crypto/store/store_lib.c +++ b/crypto/store/store_lib.c @@ -231,6 +231,8 @@ int OSSL_STORE_close(OSSL_STORE_CTX *ctx) { int loader_ret; + if (ctx == NULL) + return 1; OSSL_TRACE1(STORE, "Closing %p\n", (void *)ctx->loader_ctx); loader_ret = ctx->loader->close(ctx->loader_ctx); |