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

genPublicEphemeralKey to return Uint8Array

Browse Source
This commit is contained in:
wussler 2019-01-22 16:24:55 +01:00 committed by GitHub
parent 6d9160dd87
commit 2975e49dd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,12 +61,12 @@ async function kdf(hash_algo, X, length, param) {
/** /**
* Generate ECDHE ephemeral key and secret from public key * Generate ECDHE ephemeral key and secret from public key
* *
* @param {module:type/oid} oid Elliptic curve object identifier * @param {module:type/oid} oid Elliptic curve object identifier
* @param {module:enums.symmetric} cipher_algo Symmetric cipher to use * @param {module:enums.symmetric} cipher_algo Symmetric cipher to use
* @param {module:enums.hash} hash_algo Hash algorithm to use * @param {module:enums.hash} hash_algo Hash algorithm to use
* @param {Uint8Array} Q Recipient public key * @param {Uint8Array} Q Recipient public key
* @param {String} fingerprint Recipient fingerprint * @param {String} fingerprint Recipient fingerprint
* @returns {Promise<{V: BN, Z: Uint8Array}>} Returns public part of ephemeral key and generated ephemeral secret * @returns {Promise<{V: Uint8Array, Z: Uint8Array}>} Returns public part of ephemeral key and generated ephemeral secret
* @async * @async
*/ */
async function genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint) { async function genPublicEphemeralKey(oid, cipher_algo, hash_algo, Q, fingerprint) {
@ -76,7 +76,7 @@ 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 V = new BN(v.getPublic()); const V = new Uint8Array(v.getPublic());
const Z = await kdf(hash_algo, S, cipher[cipher_algo].keySize, param); const Z = await kdf(hash_algo, S, cipher[cipher_algo].keySize, param);
return { V, Z }; return { V, Z };
} }
@ -95,8 +95,10 @@ 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(Z, m.toString()); return {
return { V, C }; V: BN(V),
C: aes_kw.wrap(Z, m.toString())
};
} }
/** /**