From: Matt Caswell <matt@openssl.org>
Date: Mon, 25 Jun 2018 16:52:01 +0000 (+0100)
Subject: Update SSL_SESSION_print for TLSv1.3
X-Git-Tag: OpenSSL_1_1_1-pre9~229
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=32f803d88ec3df7f95dfbf840c271f7438ce3357;ds=sidebyside

Update SSL_SESSION_print for TLSv1.3

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)
---

diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index fdaf21eec7..3856491eca 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -33,6 +33,7 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
 {
     size_t i;
     const char *s;
+    int istls13 = (x->ssl_version == TLS1_3_VERSION);
 
     if (x == NULL)
         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)
             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;
     for (i = 0; i < x->master_key_length; i++) {
         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)
         goto err;
 
+    if (istls13) {
+        if (BIO_printf(bp, "    Max Early Data: %u\n",
+                       x->ext.max_early_data) <= 0)
+            goto err;
+    }
+
     return 1;
  err:
     return 0;