diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2020-09-17 09:48:29 +0200 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-12-08 18:23:29 +0100 |
| commit | c60b5723194952d2e4bbfc1e4a3eb07b7581edd9 (patch) | |
| tree | d0825a667604c06cdb2539d2171c00b17bdadb0f /test/ossl_store_test.c | |
| parent | e0b5058c11e8059fc6290139f8fc21898fe0ca63 (diff) | |
| download | openssl-c60b5723194952d2e4bbfc1e4a3eb07b7581edd9.zip openssl-c60b5723194952d2e4bbfc1e4a3eb07b7581edd9.tar.gz openssl-c60b5723194952d2e4bbfc1e4a3eb07b7581edd9.tar.bz2 | |
STORE: clear err after ossl_store_get0_loader_int
This commit clears the error that might have been set when
ossl_store_get0_loader_int has been called as it will try to retrieve
a loader for the scheme on an empty store, which will cause the error
OSSL_STORE_R_UNREGISTERED_SCHEME to be set.
The motivation for this after returning from
ossl_store_get0_loader_int, OSSL_STORE_attach will continue and try to
fetch a OSSL_STORE_LOADER from the provider.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12901)
Diffstat (limited to 'test/ossl_store_test.c')
| -rw-r--r-- | test/ossl_store_test.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/test/ossl_store_test.c b/test/ossl_store_test.c index f48c282..7424aed 100644 --- a/test/ossl_store_test.c +++ b/test/ossl_store_test.c @@ -132,6 +132,33 @@ static int test_store_get_params(int idx) return 1; } +/* + * This test verifies that calling OSSL_STORE_ATTACH does not set an + * "unregistered scheme" error when called. + */ +static int test_store_attach_unregistered_scheme(void) +{ + int ret; + OSSL_STORE_CTX *store_ctx; + OSSL_PROVIDER *provider; + OSSL_LIB_CTX *libctx; + BIO *bio; + libctx = OSSL_LIB_CTX_new(); + provider = OSSL_PROVIDER_load(libctx, "default"); + bio = BIO_new_file("test/certs/sm2-root.crt", "r"); + + ret = TEST_ptr(store_ctx = OSSL_STORE_attach(bio, "file", libctx, NULL, + NULL, NULL, NULL, NULL)) && + TEST_int_ne(ERR_GET_LIB(ERR_peek_error()), ERR_LIB_OSSL_STORE) && + TEST_int_ne(ERR_GET_REASON(ERR_peek_error()), + OSSL_STORE_R_UNREGISTERED_SCHEME); + + BIO_free(bio); + OSSL_STORE_close(store_ctx); + OSSL_PROVIDER_unload(provider); + OSSL_LIB_CTX_free(libctx); + return ret; +} const OPTIONS *test_get_options(void) { @@ -172,5 +199,6 @@ int setup_tests(void) ADD_TEST(test_store_open); ADD_TEST(test_store_search_by_key_fingerprint_fail); ADD_ALL_TESTS(test_store_get_params, 3); + ADD_TEST(test_store_attach_unregistered_scheme); return 1; } |