[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f282e954ecd00b8bd107a83bb50952647f29535a (commit)
      from  b41f6b64f809e5992b9f1b601b3dff1a2129da2d (commit)


- Log -----------------------------------------------------------------
commit f282e954ecd00b8bd107a83bb50952647f29535a
Author: Todd Short <tshort at akamai.com>
Date:   Fri Mar 10 11:51:17 2017 -0500

    Add HelloRetryRequest text to s_client/s_server
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2900)

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

Summary of changes:
 apps/s_cb.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/s_cb.c b/apps/s_cb.c
index b645de3..30709cb 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -527,6 +527,7 @@ static STRINT_PAIR handshakes[] = {
     {", ServerHello", 2},
     {", HelloVerifyRequest", 3},
     {", NewSessionTicket", 4},
+    {", HelloRetryRequest", 6},
     {", EncryptedExtensions", 8},
     {", Certificate", 11},
     {", ServerKeyExchange", 12},