wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update SSL_SESSION_print for TLSv1.3

Browse source 
Make SSL_SESSION_print() show a bit more information for TLSv1.3

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6590)
This commit is contained in:
Matt Caswell 2018-06-25 17:52:01 +01:00
parent 20c0bce506
commit 32f803d88e
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ssl/ssl_txt.c
View file

@ -33,6 +33,7 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
{ {
size_t i; size_t i;
const char *s; const char *s;
int istls13 = (x->ssl_version == TLS1_3_VERSION);
if (x == NULL) if (x == NULL)
goto err; goto err;
@ -70,7 +71,10 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
if (BIO_printf(bp, "%02X", x->sid_ctx[i]) <= 0) if (BIO_printf(bp, "%02X", x->sid_ctx[i]) <= 0)
goto err; goto err;
} }
if (BIO_puts(bp, "\n Master-Key: ") <= 0) if (istls13) {
if (BIO_puts(bp, "\n Resumption PSK: ") <= 0)
goto err;
} else if (BIO_puts(bp, "\n Master-Key: ") <= 0)
goto err; goto err;
for (i = 0; i < x->master_key_length; i++) { for (i = 0; i < x->master_key_length; i++) {
if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0) if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0)
@ -145,6 +149,12 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
x->flags & SSL_SESS_FLAG_EXTMS ? "yes" : "no") <= 0) x->flags & SSL_SESS_FLAG_EXTMS ? "yes" : "no") <= 0)
goto err; goto err;
if (istls13) {
if (BIO_printf(bp, " Max Early Data: %u\n",
x->ext.max_early_data) <= 0)
goto err;
}
return 1; return 1;
err: err:
return 0; return 0;