From: Dr. Matthias St. Pierre Date: Tue, 31 Dec 2019 11:30:01 +0000 (+0100) Subject: testutil_init.c: fix compilation error with enable-trace X-Git-Tag: openssl-3.0.0-alpha1~712 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7671420d9ebd18242f571866c6adca6f8bcb2f90;p=oweals%2Fopenssl.git testutil_init.c: fix compilation error with enable-trace In commit e79ae962fbed the tests were adapted to use the new BIO_f_prefix() API which was introduced in 319cee9e2fc6. This location was missed, because it is compiled only when tracing is enabled. Fixes #10731 Reviewed-by: Richard Levitte Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/10732) --- diff --git a/test/testutil/testutil_init.c b/test/testutil/testutil_init.c index 7c6041aee5..4932856010 100644 --- a/test/testutil/testutil_init.c +++ b/test/testutil/testutil_init.c @@ -36,8 +36,7 @@ static size_t internal_trace_cb(const char *buf, size_t cnt, BIO_snprintf(buffer, sizeof(buffer), "TRACE[%s]:%s: ", hex, OSSL_trace_get_category_name(category)); OPENSSL_free(hex); - BIO_ctrl(trace_data->bio, PREFIX_CTRL_SET_PREFIX, - strlen(buffer), buffer); + BIO_set_prefix(trace_data->bio, buffer); break; case OSSL_TRACE_CTRL_WRITE: ret = BIO_write(trace_data->bio, buf, cnt); @@ -45,7 +44,7 @@ static size_t internal_trace_cb(const char *buf, size_t cnt, case OSSL_TRACE_CTRL_END: trace_data->ingroup = 0; - BIO_ctrl(trace_data->bio, PREFIX_CTRL_SET_PREFIX, 0, NULL); + BIO_set_prefix(trace_data->bio, NULL); break; } @@ -76,7 +75,7 @@ static void setup_trace_category(int category) if (OSSL_trace_enabled(category)) return; - channel = BIO_push(BIO_new(apps_bf_prefix()), + channel = BIO_push(BIO_new(BIO_f_prefix()), BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT)); trace_data = OPENSSL_zalloc(sizeof(*trace_data));