Simplify HKDF interface.

signalapp · Oct 20, 2014 · fcaa3f0 · fcaa3f0
1 parent 64b40df
commit fcaa3f0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/libaxolotl/src/main/java/org/whispersystems/libaxolotl/kdf/HKDF.java b/libaxolotl/src/main/java/org/whispersystems/libaxolotl/kdf/HKDF.java
@@ -63,7 +63,7 @@ private byte[] expand(byte[] prk, byte[] info, int outputSize) {
       ByteArrayOutputStream results        = new ByteArrayOutputStream();
       int                   remainingBytes = outputSize;
 
-      for (int i= getIterationStartOffset();i<iterations + getIterationEndOffset();i++) {
+      for (int i= getIterationStartOffset();i<iterations + getIterationStartOffset();i++) {
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(new SecretKeySpec(prk, "HmacSHA256"));
 
@@ -89,6 +89,5 @@ private byte[] expand(byte[] prk, byte[] info, int outputSize) {
   }
 
   protected abstract int getIterationStartOffset();
-  protected abstract int getIterationEndOffset();
 
 }
diff --git a/libaxolotl/src/main/java/org/whispersystems/libaxolotl/kdf/HKDFv2.java b/libaxolotl/src/main/java/org/whispersystems/libaxolotl/kdf/HKDFv2.java
@@ -5,9 +5,4 @@ public class HKDFv2 extends HKDF {
   protected int getIterationStartOffset() {
     return 0;
   }
-
-  @Override
-  protected int getIterationEndOffset() {
-    return 0;
-  }
 }
diff --git a/libaxolotl/src/main/java/org/whispersystems/libaxolotl/kdf/HKDFv3.java b/libaxolotl/src/main/java/org/whispersystems/libaxolotl/kdf/HKDFv3.java
@@ -5,9 +5,4 @@ public class HKDFv3 extends HKDF {
   protected int getIterationStartOffset() {
     return 1;
   }
-
-  @Override
-  protected int getIterationEndOffset() {
-    return 1;
-  }
 }