Fix EC deriveKey

- wrong aes key length
PeculiarVentures · Dec 18, 2016 · 30b2784 · 30b2784
1 parent bb576fc
commit 30b2784
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/crypto/ec.ts b/lib/crypto/ec.ts
@@ -226,7 +226,7 @@ export class EcCrypto extends BaseCrypto {
             }
 
             // derive key
-            (baseKey.native as native.Key).EcdhDeriveKey((_algorithm.public as any).native, _derivedKeyType.length, (err, raw) => {
+            (baseKey.native as native.Key).EcdhDeriveKey((_algorithm.public as any).native, _derivedKeyType.length / 8, (err, raw) => {
                 if (err) reject(err);
                 else {
                     AesClass.importKey("raw", raw, _derivedKeyType, extractable, keyUsages)

diff --git a/src/ec/ec_dh.cpp b/src/ec/ec_dh.cpp
@@ -3,6 +3,8 @@
 Handle<std::string> ECDH_derive_key(Handle<ScopedEVP_PKEY> pkey, Handle<ScopedEVP_PKEY> pubkey, size_t &secret_len) {
 	LOG_FUNC();
 
+	size_t aes_key_length = secret_len;
+
 	ScopedEVP_PKEY_CTX ctx;
 	Handle<std::string>hSecret(new std::string());
 
@@ -34,7 +36,7 @@ Handle<std::string> ECDH_derive_key(Handle<ScopedEVP_PKEY> pkey, Handle<ScopedEV
 	if (1 != (EVP_PKEY_derive(ctx.Get(), secret, &secret_len))) {
 		THROW_OPENSSL("EVP_PKEY_derive_init");
 	}
-	hSecret->resize(secret_len);
+	hSecret->resize(aes_key_length);
 
 	return hSecret;
 }

diff --git a/src/node/async_ec.cpp b/src/node/async_ec.cpp
@@ -27,7 +27,7 @@ void AsyncEcGenerateKey::HandleOKCallback() {
 
 void AsyncEcdhDeriveKey::Execute() {
 	try {
-		dkey = ECDH_derive_key(pkey,pubkey, secret_len);
+		dkey = ECDH_derive_key(pkey, pubkey, secret_len);
 	}
 	catch (std::exception& e) {
 		this->SetErrorMessage(e.what());