From: Matt Caswell <matt@openssl.org>
Date: Tue, 25 Oct 2016 14:29:17 +0000 (+0100)
Subject: Ensure SSL_DEBUG works following size_t changes
X-Git-Tag: OpenSSL_1_1_1-pre1~3196
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2b7363ecf168f94e5d982cd49182aa923b92d3e4;p=oweals%2Fopenssl.git

Ensure SSL_DEBUG works following size_t changes

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index c7f0d987c3..f160c06746 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -389,7 +389,7 @@ int ssl3_get_record(SSL *s)
         goto f_err;
     }
 #ifdef SSL_DEBUG
-    printf("dec %ld\n", rr->length);
+    printf("dec %"OSSLzu"\n", rr->length);
     {
         size_t z;
         for (z = 0; z < rr->length; z++)
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 16d3d3e816..8d1e350a61 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -264,7 +264,7 @@ int tls1_change_cipher_state(SSL *s, int which)
 #ifdef SSL_DEBUG
     printf("which = %04X\nmac key=", which);
     {
-        int z;
+        size_t z;
         for (z = 0; z < i; z++)
             printf("%02X%c", ms[z], ((z + 1) % 16) ? ' ' : '\n');
     }
@@ -334,7 +334,7 @@ int tls1_change_cipher_state(SSL *s, int which)
     }
     printf("\niv=");
     {
-        int z;
+        size_t z;
         for (z = 0; z < k; z++)
             printf("%02X%c", iv[z], ((z + 1) % 16) ? ' ' : '\n');
     }