Streamlined ChachaPolyCipher.update() method

hierynomus · Oct 16, 2023 · 32b4e12 · 32b4e12
1 parent 243f64c
commit 32b4e12
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/main/java/com/hierynomus/sshj/transport/cipher/ChachaPolyCipher.java b/src/main/java/com/hierynomus/sshj/transport/cipher/ChachaPolyCipher.java
@@ -147,19 +147,15 @@ public void update(byte[] input, int inputOffset, int inputLen) {
             if (!MessageDigest.isEqual(actualPolyTag, expectedPolyTag)) {
                 throw new SSHRuntimeException("MAC Error");
             }
+        }
 
-            try {
-                cipher.update(input, inputOffset, inputLen, input, inputOffset);
-            } catch (GeneralSecurityException e) {
-                throw new SSHRuntimeException("ChaCha20 decryption failed", e);
-            }
-        } else {
-            try {
-                cipher.update(input, inputOffset, inputLen, input, inputOffset);
-            } catch (GeneralSecurityException e) {
-                throw new SSHRuntimeException("ChaCha20 encryption failed", e);
-            }
+        try {
+            cipher.update(input, inputOffset, inputLen, input, inputOffset);
+        } catch (GeneralSecurityException e) {
+            throw new SSHRuntimeException("ChaCha20 cipher processing failed", e);
+        }
 
+        if (mode == Mode.Encrypt) {
             byte[] macInput = Arrays.copyOf(input, macInputLength);
             byte[] polyTag = mac.doFinal(macInput);
             System.arraycopy(polyTag, 0, input, macInputLength, POLY_TAG_LENGTH);