Fix incrementNonce() to work when multiple bytes need to increment.

purejava · Jan 15, 2023 · 4f6fe4a · 4f6fe4a
1 parent 750da2e
commit 4f6fe4a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/org/keepassxc/Connection.java b/src/main/java/org/keepassxc/Connection.java
@@ -683,8 +683,13 @@ private byte[] ramdomGenerateNonce() {
     private byte[] incrementNonce(byte[] nonce) {
         var c = 1;
         byte[] incrementedNonce = nonce.clone();
-        c += incrementedNonce[0];
-        incrementedNonce[0] = (byte) c;
+
+        for (int i = 0; i < nonce.length; i++) {
+            c += (incrementedNonce[i] & 0xFF /*treat as unsigned*/);
+            incrementedNonce[i] = (byte) c;
+            c >>= 8;
+        }
+
         return incrementedNonce;
     }