From: Pauli <paul.dale@oracle.com>
Date: Tue, 20 Jun 2017 22:39:54 +0000 (+1000)
Subject: Remove OSSLzu macros and use %zu in the test framework (via BIO_printf).
X-Git-Tag: OpenSSL_1_1_1-pre1~1273
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bff951eeb1f86207ac02e0f73305c31ac0ab5f4f;p=oweals%2Fopenssl.git

Remove OSSLzu macros and use %zu in the test framework (via BIO_printf).

Convert the debug prints in dtls_mtu_test.c to use the framework.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3730)
---

diff --git a/test/dtls_mtu_test.c b/test/dtls_mtu_test.c
index 50f952b2ce..415f69e244 100644
--- a/test/dtls_mtu_test.c
+++ b/test/dtls_mtu_test.c
@@ -73,7 +73,7 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm)
         goto end;
 
     if (debug)
-        printf("Channel established\n");
+        TEST_info("Channel established");
 
     /* For record MTU values between 500 and 539, call DTLS_get_data_mtu()
      * to query the payload MTU which will fit. */
@@ -104,7 +104,7 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm)
             goto end;
         reclen = BIO_read(sc_bio, buf, sizeof(buf));
         if (debug)
-            printf("record %"OSSLzu" for payload %"OSSLzu"\n", reclen, s);
+            TEST_info("record %zu for payload %zu", reclen, s);
 
         for (i = 0; i < 30; i++) {
             /* DTLS_get_data_mtu() with record MTU 500+i returned mtus[i] ... */
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index 0d0108c234..fe81aa4279 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -385,7 +385,7 @@ static int test_tls13_encryption(void)
         seq = NULL;
     }
 
-    TEST_note("PASS: %"OSSLzu" records tested", ctr);
+    TEST_note("PASS: %zu records tested", ctr);
     ret = 1;
 
  err: