From 29dc6e00f2a1ec93bbacc5127cecf3412e95e57f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 30 Jul 2019 16:42:53 +0100 Subject: [PATCH] Load the config file by default Previously we only loaded the config file by default for libssl. Now we do it for libcrypto too. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9492) --- crypto/asn1/a_strnid.c | 3 + crypto/engine/eng_table.c | 3 + crypto/objects/obj_dat.c | 96 +++++++++++++++---------- crypto/property/property.c | 4 ++ crypto/provider.c | 8 +-- crypto/provider_conf.c | 4 +- crypto/provider_core.c | 35 +++++++-- doc/internal/man3/ossl_provider_new.pod | 16 ++++- doc/man3/OPENSSL_init_crypto.pod | 12 ++-- include/internal/provider.h | 6 +- test/provider_internal_test.c | 7 +- 11 files changed, 131 insertions(+), 63 deletions(-) diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c index 209e1ed491..630ac19259 100644 --- a/crypto/asn1/a_strnid.c +++ b/crypto/asn1/a_strnid.c @@ -129,6 +129,9 @@ ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid) int idx; ASN1_STRING_TABLE fnd; + /* "stable" can be impacted by config, so load the config file first */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); + fnd.nid = nid; if (stable) { idx = sk_ASN1_STRING_TABLE_find(stable, &fnd); diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c index c3afa583d0..62e9416869 100644 --- a/crypto/engine/eng_table.c +++ b/crypto/engine/eng_table.c @@ -197,6 +197,9 @@ ENGINE *engine_table_select_int(ENGINE_TABLE **table, int nid, const char *f, ENGINE_PILE tmplate, *fnd = NULL; int initres, loop = 0; + /* Load the config before trying to check if engines are available */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); + if (!(*table)) { OSSL_TRACE3(ENGINE_TABLE, "%s:%d, nid=%d, nothing registered!\n", diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index ec9e131337..c4155a3dfc 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -228,20 +228,23 @@ ASN1_OBJECT *OBJ_nid2obj(int n) return NULL; } return (ASN1_OBJECT *)&(nid_objs[n]); - } else if (added == NULL) - return NULL; - else { - ad.type = ADDED_NID; - ad.obj = &ob; - ob.nid = n; - adp = lh_ADDED_OBJ_retrieve(added, &ad); - if (adp != NULL) - return adp->obj; - else { - OBJerr(OBJ_F_OBJ_NID2OBJ, OBJ_R_UNKNOWN_NID); - return NULL; - } } + + /* Make sure we've loaded config before checking for any "added" objects */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); + + if (added == NULL) + return NULL; + + ad.type = ADDED_NID; + ad.obj = &ob; + ob.nid = n; + adp = lh_ADDED_OBJ_retrieve(added, &ad); + if (adp != NULL) + return adp->obj; + + OBJerr(OBJ_F_OBJ_NID2OBJ, OBJ_R_UNKNOWN_NID); + return NULL; } const char *OBJ_nid2sn(int n) @@ -255,20 +258,23 @@ const char *OBJ_nid2sn(int n) return NULL; } return nid_objs[n].sn; - } else if (added == NULL) - return NULL; - else { - ad.type = ADDED_NID; - ad.obj = &ob; - ob.nid = n; - adp = lh_ADDED_OBJ_retrieve(added, &ad); - if (adp != NULL) - return adp->obj->sn; - else { - OBJerr(OBJ_F_OBJ_NID2SN, OBJ_R_UNKNOWN_NID); - return NULL; - } } + + /* Make sure we've loaded config before checking for any "added" objects */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); + + if (added == NULL) + return NULL; + + ad.type = ADDED_NID; + ad.obj = &ob; + ob.nid = n; + adp = lh_ADDED_OBJ_retrieve(added, &ad); + if (adp != NULL) + return adp->obj->sn; + + OBJerr(OBJ_F_OBJ_NID2SN, OBJ_R_UNKNOWN_NID); + return NULL; } const char *OBJ_nid2ln(int n) @@ -282,20 +288,23 @@ const char *OBJ_nid2ln(int n) return NULL; } return nid_objs[n].ln; - } else if (added == NULL) - return NULL; - else { - ad.type = ADDED_NID; - ad.obj = &ob; - ob.nid = n; - adp = lh_ADDED_OBJ_retrieve(added, &ad); - if (adp != NULL) - return adp->obj->ln; - else { - OBJerr(OBJ_F_OBJ_NID2LN, OBJ_R_UNKNOWN_NID); - return NULL; - } } + + /* Make sure we've loaded config before checking for any "added" objects */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); + + if (added == NULL) + return NULL; + + ad.type = ADDED_NID; + ad.obj = &ob; + ob.nid = n; + adp = lh_ADDED_OBJ_retrieve(added, &ad); + if (adp != NULL) + return adp->obj->ln; + + OBJerr(OBJ_F_OBJ_NID2LN, OBJ_R_UNKNOWN_NID); + return NULL; } static int obj_cmp(const ASN1_OBJECT *const *ap, const unsigned int *bp) @@ -327,6 +336,9 @@ int OBJ_obj2nid(const ASN1_OBJECT *a) if (a->length == 0) return NID_undef; + /* Make sure we've loaded config before checking for any "added" objects */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); + if (added != NULL) { ad.type = ADDED_DATA; ad.obj = (ASN1_OBJECT *)a; /* XXX: ugly but harmless */ @@ -544,6 +556,9 @@ int OBJ_ln2nid(const char *s) ADDED_OBJ ad, *adp; const unsigned int *op; + /* Make sure we've loaded config before checking for any "added" objects */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); + o.ln = s; if (added != NULL) { ad.type = ADDED_LNAME; @@ -565,6 +580,9 @@ int OBJ_sn2nid(const char *s) ADDED_OBJ ad, *adp; const unsigned int *op; + /* Make sure we've loaded config before checking for any "added" objects */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); + o.sn = s; if (added != NULL) { ad.type = ADDED_SNAME; diff --git a/crypto/property/property.c b/crypto/property/property.c index cab2ab243e..c3fa8df9c6 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -279,6 +279,10 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store, int nid, int ret = 0; int j, best = -1, score, optional; +#ifndef FIPS_MODE + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); +#endif + if (nid <= 0 || method == NULL || store == NULL) return 0; diff --git a/crypto/provider.c b/crypto/provider.c index 0250955a70..25ded2df99 100644 --- a/crypto/provider.c +++ b/crypto/provider.c @@ -17,8 +17,8 @@ OSSL_PROVIDER *OSSL_PROVIDER_load(OPENSSL_CTX *libctx, const char *name) OSSL_PROVIDER *prov = NULL; /* Find it or create it */ - if ((prov = ossl_provider_find(libctx, name)) == NULL - && (prov = ossl_provider_new(libctx, name, NULL)) == NULL) + if ((prov = ossl_provider_find(libctx, name, 0)) == NULL + && (prov = ossl_provider_new(libctx, name, NULL, 0)) == NULL) return NULL; if (!ossl_provider_activate(prov)) { @@ -41,7 +41,7 @@ int OSSL_PROVIDER_available(OPENSSL_CTX *libctx, const char *name) int available = 0; /* Find it or create it */ - prov = ossl_provider_find(libctx, name); + prov = ossl_provider_find(libctx, name, 0); available = ossl_provider_available(prov); ossl_provider_free(prov); return available; @@ -69,7 +69,7 @@ int OSSL_PROVIDER_add_builtin(OPENSSL_CTX *libctx, const char *name, } /* Create it */ - if ((prov = ossl_provider_new(libctx, name, init_fn)) == NULL) + if ((prov = ossl_provider_new(libctx, name, init_fn, 0)) == NULL) return 0; /* diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c index 25881d6de8..9b7a1fff7c 100644 --- a/crypto/provider_conf.c +++ b/crypto/provider_conf.c @@ -113,9 +113,9 @@ static int provider_conf_load(OPENSSL_CTX *libctx, const char *name, activate = 1; } - prov = ossl_provider_find(libctx, name); + prov = ossl_provider_find(libctx, name, 1); if (prov == NULL) - prov = ossl_provider_new(libctx, name, NULL); + prov = ossl_provider_new(libctx, name, NULL, 1); if (prov == NULL) { if (soft) ERR_clear_error(); diff --git a/crypto/provider_core.c b/crypto/provider_core.c index 803406d7f7..76d526eaf0 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -159,7 +159,8 @@ static struct provider_store_st *get_provider_store(OPENSSL_CTX *libctx) return store; } -OSSL_PROVIDER *ossl_provider_find(OPENSSL_CTX *libctx, const char *name) +OSSL_PROVIDER *ossl_provider_find(OPENSSL_CTX *libctx, const char *name, + int noconfig) { struct provider_store_st *store = NULL; OSSL_PROVIDER *prov = NULL; @@ -168,6 +169,15 @@ OSSL_PROVIDER *ossl_provider_find(OPENSSL_CTX *libctx, const char *name) OSSL_PROVIDER tmpl = { 0, }; int i; +#ifndef FIPS_MODE + /* + * Make sure any providers are loaded from config before we try to find + * them. + */ + if (!noconfig) + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); +#endif + tmpl.name = (char *)name; CRYPTO_THREAD_write_lock(store->lock); if ((i = sk_OSSL_PROVIDER_find(store->providers, &tmpl)) == -1 @@ -215,7 +225,8 @@ int ossl_provider_up_ref(OSSL_PROVIDER *prov) } OSSL_PROVIDER *ossl_provider_new(OPENSSL_CTX *libctx, const char *name, - OSSL_provider_init_fn *init_function) + OSSL_provider_init_fn *init_function, + int noconfig) { struct provider_store_st *store = NULL; OSSL_PROVIDER *prov = NULL; @@ -223,7 +234,8 @@ OSSL_PROVIDER *ossl_provider_new(OPENSSL_CTX *libctx, const char *name, if ((store = get_provider_store(libctx)) == NULL) return NULL; - if ((prov = ossl_provider_find(libctx, name)) != NULL) { /* refcount +1 */ + if ((prov = ossl_provider_find(libctx, name, + noconfig)) != NULL) { /* refcount +1 */ ossl_provider_free(prov); /* refcount -1 */ ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_PROVIDER_ALREADY_EXISTS, NULL, "name=%s", name); @@ -552,7 +564,17 @@ static int provider_forall_loaded(struct provider_store_st *store, { int i; int ret = 1; - int num_provs = sk_OSSL_PROVIDER_num(store->providers); + int num_provs; + +#ifndef FIPS_MODE + /* + * Make sure any providers are loaded from config before we try to use + * them. + */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); +#endif + + num_provs = sk_OSSL_PROVIDER_num(store->providers); if (found_activated != NULL) *found_activated = 0; @@ -754,6 +776,11 @@ static int core_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]) int i; OSSL_PARAM *p; +#ifndef FIPS_MODE + /* Load config before we attempt to read any provider parameters */ + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); +#endif + if ((p = OSSL_PARAM_locate(params, "openssl-version")) != NULL) OSSL_PARAM_set_utf8_ptr(p, OPENSSL_VERSION_STR); if ((p = OSSL_PARAM_locate(params, "provider-name")) != NULL) diff --git a/doc/internal/man3/ossl_provider_new.pod b/doc/internal/man3/ossl_provider_new.pod index 255f194e03..c567290302 100644 --- a/doc/internal/man3/ossl_provider_new.pod +++ b/doc/internal/man3/ossl_provider_new.pod @@ -19,9 +19,11 @@ ossl_provider_get_params, ossl_provider_query_operation #include "internal/provider.h" - OSSL_PROVIDER *ossl_provider_find(OPENSSL_CTX *libctx, const char *name); + OSSL_PROVIDER *ossl_provider_find(OPENSSL_CTX *libctx, const char *name, + int noconfig); OSSL_PROVIDER *ossl_provider_new(OPENSSL_CTX *libctx, const char *name, - ossl_provider_init_fn *init_function); + ossl_provider_init_fn *init_function + int noconfig); int ossl_provider_up_ref(OSSL_PROVIDER *prov); void ossl_provider_free(OSSL_PROVIDER *prov); @@ -81,7 +83,11 @@ times as ossl_provider_activate() has. =head2 Functions ossl_provider_find() finds an existing provider object in the provider -object store by I. +object store by I. +The config file will be automatically loaded unless I is set. +Typically I should be 0. +We set I to 1 only when calling these functions while processing a +config file in order to avoid recursively attempting to load the file. The provider object it finds has its reference count incremented. ossl_provider_new() creates a new provider object named I and @@ -89,6 +95,10 @@ stores it in the provider object store, unless there already is one there with the same name. If there already is one with the same name, it's returned with its reference count incremented. +The config file will be automatically loaded unless I is set. +Typically I should be 0. +We set I to 1 only when calling these functions while processing a +config file in order to avoid recursively attempting to load the file. The reference count of a newly created provider object will always be 2; one for being added to the store, and one for the returned reference. diff --git a/doc/man3/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod index e20fc8c998..d1a3fd5d1d 100644 --- a/doc/man3/OPENSSL_init_crypto.pod +++ b/doc/man3/OPENSSL_init_crypto.pod @@ -101,10 +101,12 @@ B will be ignored. =item OPENSSL_INIT_LOAD_CONFIG With this option an OpenSSL configuration file will be automatically loaded and -used by calling OPENSSL_config(). This is not a default option for libcrypto. -As of OpenSSL 1.1.1 this is a default option for libssl (see -L for further details about libssl initialisation). See the -description of OPENSSL_INIT_new(), below. +used by calling OPENSSL_config(). This is a default option. +Note that in OpenSSL 1.1.1 this was the default for libssl but not for +libcrypto (see L for further details about libssl +initialisation). +In OpenSSL 1.1.0 this was a non-default option for both libssl and libcrypto. +See the description of OPENSSL_INIT_new(), below. =item OPENSSL_INIT_NO_LOAD_CONFIG @@ -229,7 +231,7 @@ B, B and B flags. The filename, application name, and flags can be customized by providing a non-null B object. -The object can be allocated via B. +The object can be allocated via B. The B function can be used to specify a non-default filename, which is copied and need not refer to persistent storage. Similarly, OPENSSL_INIT_set_config_appname() can be used to specify a diff --git a/include/internal/provider.h b/include/internal/provider.h index aa1876498d..8b21cebd2e 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -26,9 +26,11 @@ extern "C" { */ /* Provider Object finder, constructor and destructor */ -OSSL_PROVIDER *ossl_provider_find(OPENSSL_CTX *libctx, const char *name); +OSSL_PROVIDER *ossl_provider_find(OPENSSL_CTX *libctx, const char *name, + int noconfig); OSSL_PROVIDER *ossl_provider_new(OPENSSL_CTX *libctx, const char *name, - OSSL_provider_init_fn *init_function); + OSSL_provider_init_fn *init_function, + int noconfig); int ossl_provider_up_ref(OSSL_PROVIDER *prov); void ossl_provider_free(OSSL_PROVIDER *prov); diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c index aff858f323..478f28182d 100644 --- a/test/provider_internal_test.c +++ b/test/provider_internal_test.c @@ -55,7 +55,7 @@ static int test_builtin_provider(void) return TEST_ptr(prov = - ossl_provider_new(NULL, name, PROVIDER_INIT_FUNCTION_NAME)) + ossl_provider_new(NULL, name, PROVIDER_INIT_FUNCTION_NAME, 0)) && test_provider(prov, expected_greeting1(name)); } @@ -66,7 +66,7 @@ static int test_loaded_provider(void) OSSL_PROVIDER *prov = NULL; return - TEST_ptr(prov = ossl_provider_new(NULL, name, NULL)) + TEST_ptr(prov = ossl_provider_new(NULL, name, NULL, 0)) && test_provider(prov, expected_greeting1(name)); } @@ -79,8 +79,7 @@ static int test_configured_provider(void) "Hello OpenSSL, greetings from Test Provider"; return - OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL) - && TEST_ptr(prov = ossl_provider_find(NULL, name)) + TEST_ptr(prov = ossl_provider_find(NULL, name, 0)) && test_provider(prov, expected_greeting); } #endif -- 2.25.1