fix(electron): only call (de)cipher.setAAD() when aad is not empty

panva · Mar 2, 2021 · a5a6c4d · a5a6c4d
1 parent f7dd3e5
commit a5a6c4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/runtime/node/decrypt.ts b/src/runtime/node/decrypt.ts
@@ -75,7 +75,9 @@ async function gcmDecrypt(
   try {
     const cipher = createDecipheriv(algorithm, cek, iv, { authTagLength: 16 })
     cipher.setAuthTag(tag)
-    cipher.setAAD(aad)
+    if (aad.byteLength) {
+      cipher.setAAD(aad)
+    }
 
     return concat(cipher.update(ciphertext), cipher.final())
   } catch (err) {

diff --git a/src/runtime/node/encrypt.ts b/src/runtime/node/encrypt.ts
@@ -46,7 +46,9 @@ async function gcmEncrypt(
 
   const algorithm = <CipherGCMTypes>`aes-${keySize}-gcm`
   const cipher = createCipheriv(algorithm, cek, iv, { authTagLength: 16 })
-  cipher.setAAD(aad)
+  if (aad.byteLength) {
+    cipher.setAAD(aad)
+  }
 
   const ciphertext = concat(cipher.update(plaintext), cipher.final())
   const tag = cipher.getAuthTag()