From 6ac692a3db6554af113db6bad2c9c8de27368d43 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Fri, 29 Mar 2019 11:54:15 -0400 Subject: [PATCH 1/2] crypto: use EVP_PKEY_X25519 in GetEphemeralKeyInfo PR-URL: https://github.com/nodejs/node/pull/26988 Reviewed-By: Ben Noordhuis Reviewed-By: Daniel Bevenius --- src/node_crypto.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 069633238550df..fdc227f4e2d9a9 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -2452,9 +2452,8 @@ void SSLWrap::GetEphemeralKeyInfo( .FromJust(); break; case EVP_PKEY_EC: - // TODO(shigeki) Change this to EVP_PKEY_X25519 and add EVP_PKEY_X448 - // after upgrading to 1.1.1. - case NID_X25519: + // TODO(shigeki) Add EVP_PKEY_X448. + case EVP_PKEY_X25519: { const char* curve_name; if (kid == EVP_PKEY_EC) { From 05bd6071a63077187c86fe163c2fc50825514a80 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Fri, 29 Mar 2019 11:55:24 -0400 Subject: [PATCH 2/2] crypto: use EVP_PKEY_X448 in GetEphemeralKeyInfo PR-URL: https://github.com/nodejs/node/pull/26988 Reviewed-By: Ben Noordhuis Reviewed-By: Daniel Bevenius --- src/node_crypto.cc | 2 +- test/parallel/test-tls-client-getephemeralkeyinfo.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index fdc227f4e2d9a9..7a1e5527c56764 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -2452,8 +2452,8 @@ void SSLWrap::GetEphemeralKeyInfo( .FromJust(); break; case EVP_PKEY_EC: - // TODO(shigeki) Add EVP_PKEY_X448. case EVP_PKEY_X25519: + case EVP_PKEY_X448: { const char* curve_name; if (kid == EVP_PKEY_EC) { diff --git a/test/parallel/test-tls-client-getephemeralkeyinfo.js b/test/parallel/test-tls-client-getephemeralkeyinfo.js index 113b452db60583..599306993e1252 100644 --- a/test/parallel/test-tls-client-getephemeralkeyinfo.js +++ b/test/parallel/test-tls-client-getephemeralkeyinfo.js @@ -60,3 +60,4 @@ test(2048, 'DH', undefined, 'DHE-RSA-AES128-GCM-SHA256'); test(256, 'ECDH', 'prime256v1', 'ECDHE-RSA-AES128-GCM-SHA256'); test(521, 'ECDH', 'secp521r1', 'ECDHE-RSA-AES128-GCM-SHA256'); test(253, 'ECDH', 'X25519', 'ECDHE-RSA-AES128-GCM-SHA256'); +test(448, 'ECDH', 'X448', 'ECDHE-RSA-AES128-GCM-SHA256');