tls: fix getEphemeralKeyInfo to support X25519 #20273
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`EVP_PKEY_EC` only covers ANSI X9.62 curves not IETF ones(curve25519 and curve448). This fixes to add support of X25519 in `tlsSocket.getEphemeralKeyInfo()`. X448 should be added in the future upgrade to OpenSSL-1.1.1.
nodejs-github-bot
added
c++
|
@nodejs/crypto |
|
Only on AIX, something wrong in test-https-agent-additional-options. |
danbev
approved these changes
Apr 25, 2018
bnoordhuis
approved these changes
Apr 25, 2018
src/node_crypto.cc
Outdated
| EC_KEY* ec = EVP_PKEY_get1_EC_KEY(key); | ||
| int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec)); | ||
| EC_KEY_free(ec); | ||
| const char *curve_name; |
| info->Set(context, env->type_string(), | ||
| FIXED_ONE_BYTE_STRING(env->isolate(), "ECDH")).FromJust(); | ||
| info->Set(context, env->name_string(), | ||
| OneByteString(args.GetIsolate(), | ||
| OBJ_nid2sn(nid))).FromJust(); | ||
| curve_name)).FromJust(); |
There was a problem hiding this comment.
Since you're here, can you insert a break; statement on line 2151? That's a subtle footgun waiting to go off.
tniessen
approved these changes
Apr 25, 2018
|
CI runs again in https://ci.nodejs.org/job/node-test-pull-request/14493/. |
Trott
added
the
author ready
|
node-test-commit-aix re-run: https://ci.nodejs.org/job/node-test-commit-aix/14495/ |
BridgeAR
pushed a commit
to BridgeAR/node
that referenced
this pull request
Apr 28, 2018
`EVP_PKEY_EC` only covers ANSI X9.62 curves not IETF ones(curve25519 and curve448). This fixes to add support of X25519 in `tlsSocket.getEphemeralKeyInfo()`. X448 should be added in the future upgrade to OpenSSL-1.1.1. PR-URL: nodejs#20273 Fixes: nodejs#20262 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
|
Landed in c51b7b2 🎉 |
MylesBorins
pushed a commit
that referenced
this pull request
May 4, 2018
`EVP_PKEY_EC` only covers ANSI X9.62 curves not IETF ones(curve25519 and curve448). This fixes to add support of X25519 in `tlsSocket.getEphemeralKeyInfo()`. X448 should be added in the future upgrade to OpenSSL-1.1.1. PR-URL: #20273 Fixes: #20262 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
EVP_PKEY_EConly covers ANSI X9.62 curves not IETF ones(curve25519 and curve448).This fixes to add support of X25519 in
tlsSocket.getEphemeralKeyInfo().X448 should be added in the future upgrade to OpenSSL-1.1.1.
Fixes: #20262
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesCC @bnoordhuis