suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to returns

Browse Source
This commit is contained in:
Aron Wussler 2019-01-21 14:57:02 +01:00
parent 31f72fb64d
commit 4c809a4846
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/crypto/public_key/elliptic/ecdh.js
View File

@ -76,10 +76,9 @@ async function genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint
const v = await curve.genKeyPair(); const v = await curve.genKeyPair();
Q = curve.keyFromPublic(Q); Q = curve.keyFromPublic(Q);
const S = v.derive(Q); const S = v.derive(Q);
const Z = await kdf(hash_algo, S, cipher[cipher_algo].keySize, param);
return { return {
V: new BN(v.getPublic()), V: new BN(v.getPublic()),
Z: Z Z: await kdf(hash_algo, S, cipher[cipher_algo].keySize, param)
}; };
} }
@ -97,11 +96,8 @@ async function genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint
*/ */
async function encrypt(oid, cipher_algo, hash_algo, m, Q, fingerprint) { async function encrypt(oid, cipher_algo, hash_algo, m, Q, fingerprint) {
const { V, Z } = await genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint); const { V, Z } = await genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint);
const C = aes_kw.wrap(key.Z, m.toString()); const C = aes_kw.wrap(Z, m.toString());
return { V, C }; return { V, C };
V: key.V,
C: C
};
} }
/** /**