diff options
| author | Filip Skokan <panva.ip@gmail.com> | 2019-03-19 12:09:01 +0100 |
|---|---|---|
| committer | Tobias Nießen <tniessen@tnie.de> | 2019-03-25 01:40:54 +0100 |
| commit | 85fda7e8481003ec0d6b5217c90440ad79dc2204 (patch) | |
| tree | e604e67cc7ad619f2e6d3f92d996e26288daadc3 /lib/internal/crypto | |
| parent | 4a07a62d04b219ca72271f7cda0880a2a4300d05 (diff) | |
| download | android-node-v8-85fda7e8481003ec0d6b5217c90440ad79dc2204.tar.gz android-node-v8-85fda7e8481003ec0d6b5217c90440ad79dc2204.tar.bz2 android-node-v8-85fda7e8481003ec0d6b5217c90440ad79dc2204.zip | |
crypto: add support for x25119 and x448 KeyObjects
PR-URL: https://github.com/nodejs/node/pull/26774
Refs: https://github.com/nodejs/node/issues/26626
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib/internal/crypto')
| -rw-r--r-- | lib/internal/crypto/keygen.js | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js index efa6c6c31b..80efa01b1b 100644 --- a/lib/internal/crypto/keygen.js +++ b/lib/internal/crypto/keygen.js @@ -8,6 +8,8 @@ const { generateKeyPairEdDSA, EVP_PKEY_ED25519, EVP_PKEY_ED448, + EVP_PKEY_X25519, + EVP_PKEY_X448, OPENSSL_EC_NAMED_CURVE, OPENSSL_EC_EXPLICIT_CURVE } = internalBinding('crypto'); @@ -197,8 +199,24 @@ function check(type, options, callback) { break; case 'ed25519': case 'ed448': + case 'x25519': + case 'x448': { - const id = type === 'ed25519' ? EVP_PKEY_ED25519 : EVP_PKEY_ED448; + let id; + switch (type) { + case 'ed25519': + id = EVP_PKEY_ED25519; + break; + case 'ed448': + id = EVP_PKEY_ED448; + break; + case 'x25519': + id = EVP_PKEY_X25519; + break; + case 'x448': + id = EVP_PKEY_X448; + break; + } impl = (wrap) => generateKeyPairEdDSA(id, publicFormat, publicType, privateFormat, privateType, @@ -208,7 +226,7 @@ function check(type, options, callback) { default: throw new ERR_INVALID_ARG_VALUE('type', type, "must be one of 'rsa', 'dsa', 'ec', " + - "'ed25519', 'ed448'"); + "'ed25519', 'ed448', 'x25519', 'x448'"); } if (options) { |