projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a0c5ccc
)
Ensure trace recognises X25519
author
Matt Caswell
<matt@openssl.org>
Fri, 2 Sep 2016 09:42:36 +0000
(10:42 +0100)
committer
Matt Caswell
<matt@openssl.org>
Thu, 8 Sep 2016 11:36:46 +0000
(12:36 +0100)
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
)
ssl/t1_trce.c
patch
|
blob
|
history
diff --git
a/ssl/t1_trce.c
b/ssl/t1_trce.c
index 00632e582011b13a8a32a66a93c39e5b421f6751..4577f038a36fd41bc83217a49d7118e1250a3a29 100644
(file)
--- 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"}
};