GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — src: refactor ECDHBitsJob signature · nodejs/node@d26dedf

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib/internal/crypto
- diffiehellman.js
src/crypto

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/internal/crypto/diffiehellman.js‎`

Copy file name to clipboardExpand all lines: lib/internal/crypto/diffiehellman.js

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,6 @@ async function ecdhDeriveBits(algorithm, baseKey, length) {`
`332`	`332`
`333`	`333`	`const bits = await jobPromise(() => new ECDHBitsJob(`
`334`	`334`	`kCryptoJobAsync,`
`335`		`- key.algorithm.name === 'ECDH' ? baseKey.algorithm.namedCurve : baseKey.algorithm.name,`
`336`	`335`	`key[kKeyObject][kHandle],`
`337`	`336`	`baseKey[kKeyObject][kHandle]));`
`338`	`337`

Collapse file

`‎src/crypto/crypto_ec.cc‎`

Copy file name to clipboardExpand all lines: src/crypto/crypto_ec.cc

+5-25Lines changed: 5 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,22 +45,6 @@ int GetCurveFromName(const char* name) {`
`45`	`45`	`return nid;`
`46`	`46`	`}`
`47`	`47`
`48`		`-int GetOKPCurveFromName(const char* name) {`
`49`		`- int nid;`
`50`		`- if (strcmp(name, "Ed25519") == 0) {`
`51`		`- nid = EVP_PKEY_ED25519;`
`52`		`- } else if (strcmp(name, "Ed448") == 0) {`
`53`		`- nid = EVP_PKEY_ED448;`
`54`		`- } else if (strcmp(name, "X25519") == 0) {`
`55`		`- nid = EVP_PKEY_X25519;`
`56`		`- } else if (strcmp(name, "X448") == 0) {`
`57`		`- nid = EVP_PKEY_X448;`
`58`		`- } else {`
`59`		`- nid = NID_undef;`
`60`		`- }`
`61`		`- return nid;`
`62`		`-}`
`63`		`-`
`64`	`48`	`void ECDH::Initialize(Environment* env, Local<Object> target) {`
`65`	`49`	`Isolate* isolate = env->isolate();`
`66`	`50`	`Local<Context> context = env->context();`
`@@ -450,25 +434,21 @@ Maybe<void> ECDHBitsTraits::AdditionalConfig(`
`450`	`434`	`ECDHBitsConfig* params) {`
`451`	`435`	`Environment* env = Environment::GetCurrent(args);`
`452`	`436`
`453`		`- CHECK(args[offset]->IsString()); // curve name`
`454`		`- CHECK(args[offset + 1]->IsObject()); // public key`
`455`		`- CHECK(args[offset + 2]->IsObject()); // private key`
	`437`	`+ CHECK(args[offset]->IsObject()); // public key`
	`438`	`+ CHECK(args[offset + 1]->IsObject()); // private key`
`456`	`439`
`457`	`440`	`KeyObjectHandle* private_key;`
`458`	`441`	`KeyObjectHandle* public_key;`
`459`	`442`
`460`		`- Utf8Value name(env->isolate(), args[offset]);`
`461`		`-`
`462`		`- ASSIGN_OR_RETURN_UNWRAP(&public_key, args[offset + 1], Nothing<void>());`
`463`		`- ASSIGN_OR_RETURN_UNWRAP(&private_key, args[offset + 2], Nothing<void>());`
	`443`	`+ ASSIGN_OR_RETURN_UNWRAP(&public_key, args[offset], Nothing<void>());`
	`444`	`+ ASSIGN_OR_RETURN_UNWRAP(&private_key, args[offset + 1], Nothing<void>());`
`464`	`445`
`465`	`446`	`if (private_key->Data().GetKeyType() != kKeyTypePrivate \|\|`
`466`	`447`	`public_key->Data().GetKeyType() != kKeyTypePublic) {`
`467`	`448`	`THROW_ERR_CRYPTO_INVALID_KEYTYPE(env);`
`468`	`449`	`return Nothing<void>();`
`469`	`450`	`}`
`470`	`451`
`471`		`- params->id_ = GetOKPCurveFromName(*name);`
`472`	`452`	`params->private_ = private_key->Data().addRef();`
`473`	`453`	`params->public_ = public_key->Data().addRef();`
`474`	`454`
`@@ -482,7 +462,7 @@ bool ECDHBitsTraits::DeriveBits(Environment* env,`
`482`	`462`	`const auto& m_privkey = params.private_.GetAsymmetricKey();`
`483`	`463`	`const auto& m_pubkey = params.public_.GetAsymmetricKey();`
`484`	`464`
`485`		`- switch (params.id_) {`
	`465`	`+ switch (m_privkey.id()) {`
`486`	`466`	`case EVP_PKEY_X25519:`
`487`	`467`	`// Fall through`
`488`	`468`	`case EVP_PKEY_X448: {`

Collapse file

`‎src/crypto/crypto_ec.h‎`

Copy file name to clipboardExpand all lines: src/crypto/crypto_ec.h

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`namespace node {`
`17`	`17`	`namespace crypto {`
`18`	`18`	`int GetCurveFromName(const char* name);`
`19`		`-int GetOKPCurveFromName(const char* name);`
`20`	`19`
`21`	`20`	`class ECDH final : public BaseObject {`
`22`	`21`	`public:`

Collapse file

`‎src/crypto/crypto_keys.cc‎`

Copy file name to clipboardExpand all lines: src/crypto/crypto_keys.cc

+16Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -909,6 +909,22 @@ void KeyObjectHandle::InitECRaw(const FunctionCallbackInfo<Value>& args) {`
`909`	`909`	`args.GetReturnValue().Set(true);`
`910`	`910`	`}`
`911`	`911`
	`912`	`+int GetOKPCurveFromName(const char* name) {`
	`913`	`+ int nid;`
	`914`	`+ if (strcmp(name, "Ed25519") == 0) {`
	`915`	`+ nid = EVP_PKEY_ED25519;`
	`916`	`+ } else if (strcmp(name, "Ed448") == 0) {`
	`917`	`+ nid = EVP_PKEY_ED448;`
	`918`	`+ } else if (strcmp(name, "X25519") == 0) {`
	`919`	`+ nid = EVP_PKEY_X25519;`
	`920`	`+ } else if (strcmp(name, "X448") == 0) {`
	`921`	`+ nid = EVP_PKEY_X448;`
	`922`	`+ } else {`
	`923`	`+ nid = NID_undef;`
	`924`	`+ }`
	`925`	`+ return nid;`
	`926`	`+}`
	`927`	`+`
`912`	`928`	`void KeyObjectHandle::InitEDRaw(const FunctionCallbackInfo<Value>& args) {`
`913`	`929`	`Environment* env = Environment::GetCurrent(args);`
`914`	`930`	`KeyObjectHandle* key;`

Collapse file

`‎src/crypto/crypto_keys.h‎`

Copy file name to clipboardExpand all lines: src/crypto/crypto_keys.h

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,8 @@ WebCryptoKeyExportStatus PKEY_SPKI_Export(const KeyObjectData& key_data,`
`408`	`408`	`WebCryptoKeyExportStatus PKEY_PKCS8_Export(const KeyObjectData& key_data,`
`409`	`409`	`ByteSource* out);`
`410`	`410`
	`411`	`+int GetOKPCurveFromName(const char* name);`
	`412`	`+`
`411`	`413`	`namespace Keys {`
`412`	`414`	`void Initialize(Environment* env, v8::Local<v8::Object> target);`
`413`	`415`	`void RegisterExternalReferences(ExternalReferenceRegistry* registry);`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.