Update copyright year

[openssl.git] / test / testutil / tap_bio.c

diff --git a/test/testutil/tap_bio.c b/test/testutil/tap_bio.c
index 43c95c04a8a5072cb5d49ac2b52c083ed5748f7b..f3ee2787d21ee65e95d9d73f02195806e88ede79 100644 (file)
--- a/test/testutil/tap_bio.c
+++ b/test/testutil/tap_bio.c
@@ -2,7 +2,7 @@
  * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2017, Oracle and/or its affiliates.  All rights reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -18,7 +18,7 @@ static int tap_gets(BIO *b, char *str, int size);
 static long tap_ctrl(BIO *b, int cmd, long arg1, void *arg2);
 static int tap_new(BIO *b);
 static int tap_free(BIO *b);
-static long tap_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
+static long tap_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
 
 const BIO_METHOD *BIO_f_tap(void)
 {
@@ -93,13 +93,14 @@ static int write_string(BIO *b, const char *buf, size_t n)
  */
 static int tap_write_ex(BIO *b, const char *buf, size_t size, size_t *in_size)
 {
+    static char empty[] = "";
     BIO *next = BIO_next(b);
     size_t i;
     int j;
 
     for (i = 0; i < size; i++) {
         if (BIO_get_data(b) == NULL) {
-            BIO_set_data(b, "");
+            BIO_set_data(b, empty);
             for (j = 0; j < subtest_level(); j++)
                 if (!write_string(next, " ", 1))
                     goto err;
@@ -122,7 +123,7 @@ err:
 static long tap_ctrl(BIO *b, int cmd, long num, void *ptr)
 {
     BIO *next = BIO_next(b);
- 
+
     switch (cmd) {
     case BIO_CTRL_RESET:
         BIO_set_data(b, NULL);
@@ -134,7 +135,7 @@ static long tap_ctrl(BIO *b, int cmd, long num, void *ptr)
     return BIO_ctrl(next, cmd, num, ptr);
 }
 
-static long tap_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
+static long tap_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {
     return BIO_callback_ctrl(BIO_next(b), cmd, fp);
 }