Always update associated data via byte array

jchambers · Mar 3, 2024 · c9ae0ea · c9ae0ea
1 parent 68995f0
commit c9ae0ea
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/com/eatthepath/noise/component/AbstractNoiseCipher.java b/src/main/java/com/eatthepath/noise/component/AbstractNoiseCipher.java
@@ -33,7 +33,10 @@ public int encrypt(final Key key,
     initCipher(cipher, Cipher.ENCRYPT_MODE, key, nonce);
 
     if (associatedData != null) {
-      cipher.updateAAD(associatedData);
+      final byte[] adBytes = new byte[associatedData.remaining()];
+      associatedData.get(adBytes);
+
+      cipher.updateAAD(adBytes);
     }
 
     return finishEncryption(() -> cipher.doFinal(plaintext, ciphertext));
@@ -75,7 +78,10 @@ public int decrypt(final Key key,
     initCipher(cipher, Cipher.DECRYPT_MODE, key, nonce);
 
     if (associatedData != null) {
-      cipher.updateAAD(associatedData);
+      final byte[] adBytes = new byte[associatedData.remaining()];
+      associatedData.get(adBytes);
+
+      cipher.updateAAD(adBytes);
     }
 
     return finishDecryption(() -> cipher.doFinal(ciphertext, plaintext));