From: Matt Caswell Date: Fri, 2 Sep 2016 09:42:36 +0000 (+0100) Subject: Ensure trace recognises X25519 X-Git-Tag: OpenSSL_1_1_0a~72 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=baee63371d568a2439cd1dddf584bcdf19b7cbbc;p=oweals%2Fopenssl.git 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 (cherry picked from commit 2d11f5b2ca863d4bd9e20b224932b247ed85842b) --- diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index 00632e5820..4577f038a3 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"} };