diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-11-27 16:13:12 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-12-18 19:42:44 +0100 |
| commit | e79ae962fbed99cf80feb32b326f701778ca7434 (patch) | |
| tree | b7b117e30ec2cb5c44c71d67ba88455047757c2b /apps/openssl.c | |
| parent | 319cee9e2fc6fcf6ad865564eccdac4c55e92c0a (diff) | |
APPS & TEST: Adapt to use the new BIO_f_prefix()
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10531)
Diffstat (limited to 'apps/openssl.c')
| -rw-r--r-- | apps/openssl.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index d60267d742..00ad9ca0bd 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -116,8 +116,7 @@ static size_t internal_trace_cb(const char *buf, size_t cnt, hex == NULL ? "<null>" : 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: if (!ossl_assert(trace_data->ingroup)) @@ -130,7 +129,7 @@ static size_t internal_trace_cb(const char *buf, size_t cnt, return 0; trace_data->ingroup = 0; - BIO_ctrl(trace_data->bio, PREFIX_CTRL_SET_PREFIX, 0, NULL); + BIO_set_prefix(trace_data->bio, NULL); break; } @@ -162,8 +161,7 @@ static void setup_trace_category(int category) if (OSSL_trace_enabled(category)) return; - channel = BIO_push(BIO_new(apps_bf_prefix()), - dup_bio_err(FORMAT_TEXT)); + channel = BIO_push(BIO_new(BIO_f_prefix()), dup_bio_err(FORMAT_TEXT)); trace_data = OPENSSL_zalloc(sizeof(*trace_data)); if (trace_data == NULL @@ -247,13 +245,6 @@ int main(int argc, char *argv[]) win32_utf8argv(&argc, &argv); #endif - /* - * We use the prefix method to get the trace output we want. Since some - * trace outputs happen with OPENSSL_cleanup(), which is run automatically - * after exit(), we need to destroy the prefix method as late as possible. - */ - atexit(destroy_prefix_method); - #ifndef OPENSSL_NO_TRACE setup_trace(getenv("OPENSSL_TRACE")); #endif |