summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-09-02 10:42:36 +0100
committerMatt Caswell <matt@openssl.org>2016-09-08 12:36:46 +0100
commitbaee63371d568a2439cd1dddf584bcdf19b7cbbc (patch)
treed116c294e9fccab5acb6b5cf19cb0db31f63efca /ssl
parenta0c5ccc7c1ec1614b77c76ee0f057e681e7a12e9 (diff)
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@openssl.org> (cherry picked from commit 2d11f5b2ca863d4bd9e20b224932b247ed85842b)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/t1_trce.c1
1 files changed, 1 insertions, 0 deletions
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"}
};