[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  baee63371d568a2439cd1dddf584bcdf19b7cbbc (commit)
      from  a0c5ccc7c1ec1614b77c76ee0f057e681e7a12e9 (commit)


- Log -----------------------------------------------------------------
commit baee63371d568a2439cd1dddf584bcdf19b7cbbc
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Sep 2 10:42:36 2016 +0100

    Ensure trace recognises X25519
    
    Using the -trace option to s_server or s_client was incorrectly printing
    UNKNOWN for the X25519 curve.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 2d11f5b2ca863d4bd9e20b224932b247ed85842b)

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

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

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 00632e5..4577f03 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -490,6 +490,7 @@ static ssl_trace_tbl ssl_curve_tbl[] = {
     {26, "brainpoolP256r1"},
     {27, "brainpoolP384r1"},
     {28, "brainpoolP512r1"},
+    {29, "ecdh_x25519"},
     {0xFF01, "arbitrary_explicit_prime_curves"},
     {0xFF02, "arbitrary_explicit_char2_curves"}
 };