When tracing is disabled, don't generate errors, especially during
init. Instead, just pretend the everything is fine.
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8475)
{
#ifndef OPENSSL_NO_TRACE
trace_lock = CRYPTO_THREAD_lock_new();
{
#ifndef OPENSSL_NO_TRACE
trace_lock = CRYPTO_THREAD_lock_new();
- if (trace_lock != NULL)
- return 1;
+ if (trace_lock == NULL)
+ return 0;
}
void ossl_trace_cleanup(void)
}
void ossl_trace_cleanup(void)
if (category < 0 || category >= OSSL_TRACE_CATEGORY_NUM
|| !set_trace_data(category, &channel, NULL, NULL,
trace_attach_cb, trace_detach_cb))
if (category < 0 || category >= OSSL_TRACE_CATEGORY_NUM
|| !set_trace_data(category, &channel, NULL, NULL,
trace_attach_cb, trace_detach_cb))
trace_channels[category].type = t_channel;
trace_channels[category].type = t_channel;
}
#ifndef OPENSSL_NO_TRACE
}
#ifndef OPENSSL_NO_TRACE
goto err;
trace_channels[category].type = t_callback;
goto err;
trace_channels[category].type = t_callback;
err:
BIO_free(channel);
OPENSSL_free(trace_data);
err:
BIO_free(channel);
OPENSSL_free(trace_data);
+ done:
+#endif
+ return 1;
}
int OSSL_trace_set_prefix(int category, const char *prefix)
{
}
int OSSL_trace_set_prefix(int category, const char *prefix)
{
#ifndef OPENSSL_NO_TRACE
if (category >= 0 || category < OSSL_TRACE_CATEGORY_NUM)
return set_trace_data(category, NULL, &prefix, NULL,
trace_attach_cb, trace_detach_cb);
#ifndef OPENSSL_NO_TRACE
if (category >= 0 || category < OSSL_TRACE_CATEGORY_NUM)
return set_trace_data(category, NULL, &prefix, NULL,
trace_attach_cb, trace_detach_cb);
}
int OSSL_trace_set_suffix(int category, const char *suffix)
{
}
int OSSL_trace_set_suffix(int category, const char *suffix)
{
#ifndef OPENSSL_NO_TRACE
if (category >= 0 || category < OSSL_TRACE_CATEGORY_NUM)
return set_trace_data(category, NULL, NULL, &suffix,
trace_attach_cb, trace_detach_cb);
#ifndef OPENSSL_NO_TRACE
if (category >= 0 || category < OSSL_TRACE_CATEGORY_NUM)
return set_trace_data(category, NULL, NULL, &suffix,
trace_attach_cb, trace_detach_cb);
}
#ifndef OPENSSL_NO_TRACE
}
#ifndef OPENSSL_NO_TRACE