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

iOS does not support GCM-en/decrypting empty messages

Browse Source
This commit is contained in:
Daniel Huigens 2018-04-30 18:40:52 +02:00
parent 2627755b49
commit a16d1a6a1d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/crypto/gcm.js
View File

@ -48,16 +48,26 @@ async function GCM(cipher, key) {
} }
if (util.getWebCrypto() && key.length !== 24) { // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto#TOC-AES-support if (util.getWebCrypto() && key.length !== 24) { // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto#TOC-AES-support
key = await webCrypto.importKey('raw', key, { name: ALGO }, false, ['encrypt', 'decrypt']); const _key = await webCrypto.importKey('raw', key, { name: ALGO }, false, ['encrypt', 'decrypt']);
return { return {
encrypt: async function(pt, iv, adata=new Uint8Array()) { encrypt: async function(pt, iv, adata=new Uint8Array()) {
const ct = await webCrypto.encrypt({ name: ALGO, iv, additionalData: adata }, key, pt); if (!pt.length) {
// iOS does not support GCM-en/decrypting empty messages
// Also, synchronous en/decryption might be faster in this case.
return AES_GCM.encrypt(pt, key, iv, adata);
}
const ct = await webCrypto.encrypt({ name: ALGO, iv, additionalData: adata }, _key, pt);
return new Uint8Array(ct); return new Uint8Array(ct);
}, },
decrypt: async function(ct, iv, adata=new Uint8Array()) { decrypt: async function(ct, iv, adata=new Uint8Array()) {
const pt = await webCrypto.decrypt({ name: ALGO, iv, additionalData: adata }, key, ct); if (ct.length === tagLength) {
// iOS does not support GCM-en/decrypting empty messages
// Also, synchronous en/decryption might be faster in this case.
return AES_GCM.decrypt(ct, key, iv, adata);
}
const pt = await webCrypto.decrypt({ name: ALGO, iv, additionalData: adata }, _key, ct);
return new Uint8Array(pt); return new Uint8Array(pt);
} }
}; };