projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update state machine to be closer to TLS1.3
[openssl.git]
/
ssl
/
ssl_txt.c
diff --git
a/ssl/ssl_txt.c
b/ssl/ssl_txt.c
index dbbf9d9e8d8beb7926d8b5feb462b94aee998e78..06ea6463ab409b7153a7b07a0ec5531f00d8328c 100644
(file)
--- a/
ssl/ssl_txt.c
+++ b/
ssl/ssl_txt.c
@@
-57,7
+57,7
@@
int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
{
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
{
-
unsigned in
t i;
+
size_
t i;
const char *s;
if (x == NULL)
const char *s;
if (x == NULL)
@@
-98,7
+98,7
@@
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
}
if (BIO_puts(bp, "\n Master-Key: ") <= 0)
goto err;
}
if (BIO_puts(bp, "\n Master-Key: ") <= 0)
goto err;
- for (i = 0; i <
(unsigned int)
x->master_key_length; i++) {
+ for (i = 0; i < x->master_key_length; i++) {
if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0)
goto err;
}
if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0)
goto err;
}
@@
-128,8
+128,9
@@
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
if (x->tlsext_tick) {
if (BIO_puts(bp, "\n TLS session ticket:\n") <= 0)
goto err;
if (x->tlsext_tick) {
if (BIO_puts(bp, "\n TLS session ticket:\n") <= 0)
goto err;
+ /* TODO(size_t): Convert this call */
if (BIO_dump_indent
if (BIO_dump_indent
- (bp, (const char *)x->tlsext_tick, x->tlsext_ticklen, 4)
+ (bp, (const char *)x->tlsext_tick,
(int)
x->tlsext_ticklen, 4)
<= 0)
goto err;
}
<= 0)
goto err;
}
@@
-181,7
+182,7
@@
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
*/
int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x)
{
*/
int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x)
{
-
unsigned in
t i;
+
size_
t i;
if (x == NULL)
goto err;
if (x == NULL)
goto err;
@@
-204,7
+205,7
@@
int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x)
}
if (BIO_puts(bp, " Master-Key:") <= 0)
goto err;
}
if (BIO_puts(bp, " Master-Key:") <= 0)
goto err;
- for (i = 0; i <
(unsigned int)
x->master_key_length; i++) {
+ for (i = 0; i < x->master_key_length; i++) {
if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0)
goto err;
}
if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0)
goto err;
}