Other configuration modules may have use for tracing, and having one
tracing category for each of them is a bit much. Instead, we make one
category for them all.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8680)
STACK_OF(CONF_VALUE) *sect;
int ok = 1;
STACK_OF(CONF_VALUE) *sect;
int ok = 1;
- OSSL_TRACE2(PROVIDER_CONF, "PROVIDER conf: %s = %s\n", name, value);
-
sect = NCONF_get_section(cnf, value);
if (sect != NULL) {
int i;
char buffer[512];
size_t buffer_len = 0;
sect = NCONF_get_section(cnf, value);
if (sect != NULL) {
int i;
char buffer[512];
size_t buffer_len = 0;
+ OSSL_TRACE1(CONF, "Provider params: start section %s\n", value);
+
if (name != NULL) {
OPENSSL_strlcpy(buffer, name, sizeof(buffer));
OPENSSL_strlcat(buffer, ".", sizeof(buffer));
if (name != NULL) {
OPENSSL_strlcpy(buffer, name, sizeof(buffer));
OPENSSL_strlcat(buffer, ".", sizeof(buffer));
if (!provider_conf_params(prov, buffer, sectconf->value, cnf))
return 0;
}
if (!provider_conf_params(prov, buffer, sectconf->value, cnf))
return 0;
}
+
+ OSSL_TRACE1(CONF, "Provider params: finish section %s\n", value);
+ OSSL_TRACE2(CONF, "Provider params: %s = %s\n", name, value);
ok = ossl_provider_add_parameter(prov, name, value);
}
ok = ossl_provider_add_parameter(prov, name, value);
}
int ok = 0;
name = skip_dot(name);
int ok = 0;
name = skip_dot(name);
- OSSL_TRACE1(PROVIDER_CONF, "Configuring provider %s\n", name);
+ OSSL_TRACE1(CONF, "Configuring provider %s\n", name);
/* Value is a section containing PROVIDER commands */
ecmds = NCONF_get_section(cnf, value);
/* Value is a section containing PROVIDER commands */
ecmds = NCONF_get_section(cnf, value);
const char *confname = skip_dot(ecmd->name);
const char *confvalue = ecmd->value;
const char *confname = skip_dot(ecmd->name);
const char *confvalue = ecmd->value;
- OSSL_TRACE2(PROVIDER_CONF, "PROVIDER conf: %s = %s\n",
+ OSSL_TRACE2(CONF, "Provider command: %s = %s\n",
confname, confvalue);
/* First handle some special pseudo confs */
confname, confvalue);
/* First handle some special pseudo confs */
- OSSL_TRACE2(PROVIDER_CONF, "Loading provider module: name %s, value %s\n",
- CONF_imodule_get_name(md), CONF_imodule_get_value(md));
+ OSSL_TRACE1(CONF, "Loading providers module: section %s\n",
+ CONF_imodule_get_value(md));
+
/* Value is a section containing PROVIDERs to configure */
elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));
/* Value is a section containing PROVIDERs to configure */
elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));
{
sk_OSSL_PROVIDER_pop_free(activated_providers, ossl_provider_free);
activated_providers = NULL;
{
sk_OSSL_PROVIDER_pop_free(activated_providers, ossl_provider_free);
activated_providers = NULL;
- OSSL_TRACE(PROVIDER_CONF, "Cleaned up providers\n");
+ OSSL_TRACE(CONF, "Cleaned up providers\n");
}
void ossl_provider_add_conf_module(void)
{
}
void ossl_provider_add_conf_module(void)
{
+ OSSL_TRACE(CONF, "Adding config module 'providers'\n");
CONF_module_add("providers", provider_conf_init, provider_conf_deinit);
}
CONF_module_add("providers", provider_conf_init, provider_conf_deinit);
}
TRACE_CATEGORY_(PKCS12_DECRYPT),
TRACE_CATEGORY_(X509V3_POLICY),
TRACE_CATEGORY_(BN_CTX),
TRACE_CATEGORY_(PKCS12_DECRYPT),
TRACE_CATEGORY_(X509V3_POLICY),
TRACE_CATEGORY_(BN_CTX),
- TRACE_CATEGORY_(PROVIDER_CONF),
};
const char *OSSL_trace_get_category_name(int num)
};
const char *OSSL_trace_get_category_name(int num)
# define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT 10
# define OSSL_TRACE_CATEGORY_X509V3_POLICY 11
# define OSSL_TRACE_CATEGORY_BN_CTX 12
# define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT 10
# define OSSL_TRACE_CATEGORY_X509V3_POLICY 11
# define OSSL_TRACE_CATEGORY_BN_CTX 12
-# define OSSL_TRACE_CATEGORY_PROVIDER_CONF 13
+# define OSSL_TRACE_CATEGORY_CONF 13
# define OSSL_TRACE_CATEGORY_NUM 14
/* Returns the trace category number for the given |name| */
# define OSSL_TRACE_CATEGORY_NUM 14
/* Returns the trace category number for the given |name| */