[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  7671420d9ebd18242f571866c6adca6f8bcb2f90 (commit)
      from  11b44359862632e283feabf15dab85bb550ebace (commit)


- Log -----------------------------------------------------------------
commit 7671420d9ebd18242f571866c6adca6f8bcb2f90
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Tue Dec 31 12:30:01 2019 +0100

    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 <levitte at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10732)

-----------------------------------------------------------------------

Summary of changes:
 test/testutil/testutil_init.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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));