aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-10-25 15:29:17 +0100
committerMatt Caswell <matt@openssl.org>2016-11-04 12:09:46 +0000
commit2b7363ecf168f94e5d982cd49182aa923b92d3e4 (patch)
treef0134680a9ddfbe0286bd012df87ff79523c992a
parent3cdc2f8fb528a4d47436dd863f6b8d5c30619847 (diff)
downloadopenssl-2b7363ecf168f94e5d982cd49182aa923b92d3e4.zip
openssl-2b7363ecf168f94e5d982cd49182aa923b92d3e4.tar.gz
openssl-2b7363ecf168f94e5d982cd49182aa923b92d3e4.tar.bz2
Ensure SSL_DEBUG works following size_t changes
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--ssl/record/ssl3_record.c2
-rw-r--r--ssl/t1_enc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index c7f0d98..f160c06 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 16d3d3e..8d1e350 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');
}