Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypto: update GetEphemeralKeyInfo() for OpenSSL 1.1.1 #26988

Merged
merged 2 commits into from
Apr 1, 2019
Merged

crypto: update GetEphemeralKeyInfo() for OpenSSL 1.1.1 #26988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ac692a
crypto: use EVP_PKEY_X25519 in GetEphemeralKeyInfo
cjihrig Mar 29, 2019
05bd607
crypto: use EVP_PKEY_X448 in GetEphemeralKeyInfo
cjihrig Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2452,9 +2452,8 @@ void SSLWrap<Base>::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:
case EVP_PKEY_X25519:
case EVP_PKEY_X448:
BridgeAR marked this conversation as resolved.
Show resolved Hide resolved
{
const char* curve_name;
if (kid == EVP_PKEY_EC) {
Expand Down
1 change: 1 addition & 0 deletions test/parallel/test-tls-client-getephemeralkeyinfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');