[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  818b625d6c906ef40bfaf4403c278db8ba7bfa09 (commit)
      from  436ad81f056cd88de374ea4a27da39b4cafb4b27 (commit)


- Log -----------------------------------------------------------------
commit 818b625d6c906ef40bfaf4403c278db8ba7bfa09
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jan 2 15:51:23 2018 +0000

    Fix trace of TLSv1.3 Certificate Request message
    
    A TLSv1.3 Certificate Request message was issuing a "Message length parse
    error" using the -trace option to s_server/s_client.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/5008)

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_trce.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 59d0efc..173268c 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -1244,6 +1244,10 @@ static int ssl_print_cert_request(BIO *bio, int indent, const SSL *ssl,
     if (SSL_IS_TLS13(ssl)) {
         if (!ssl_print_hexbuf(bio, indent, "request_context", 1, &msg, &msglen))
             return 0;
+        if (!ssl_print_extensions(bio, indent, 1,
+                                  SSL3_MT_CERTIFICATE_REQUEST, &msg, &msglen))
+            return 0;
+        return 1;
     } else {
         if (msglen < 1)
             return 0;