diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-01 18:52:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-01 18:52:42 +0000 |
| commit | 9218edabd1ef9852bc2f13115dcadc81b442dd6c (patch) | |
| tree | 8229ff72c8cbb06f49dce3a8382930919fa6fc2b /bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java | |
| parent | 9b30eb05e5be69d51881a0d1b31e503e97acd784 (diff) | |
| parent | 397d32894b89b506dc318e0f83446187c9b76ebe (diff) | |
| download | android_external_bouncycastle-9218edabd1ef9852bc2f13115dcadc81b442dd6c.tar.gz android_external_bouncycastle-9218edabd1ef9852bc2f13115dcadc81b442dd6c.tar.bz2 android_external_bouncycastle-9218edabd1ef9852bc2f13115dcadc81b442dd6c.zip | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge-152-from-upstream"
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java index 600a317..d4345d9 100644 --- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java +++ b/bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java @@ -36,18 +36,14 @@ public class HMac { blockLengths = new Hashtable(); - // BEGIN android-removed - // blockLengths.put("GOST3411", Integers.valueOf(32)); - // - // blockLengths.put("MD2", Integers.valueOf(16)); - // blockLengths.put("MD4", Integers.valueOf(64)); - // END android-removed + blockLengths.put("GOST3411", Integers.valueOf(32)); + + blockLengths.put("MD2", Integers.valueOf(16)); + blockLengths.put("MD4", Integers.valueOf(64)); blockLengths.put("MD5", Integers.valueOf(64)); - // BEGIN android-removed - // blockLengths.put("RIPEMD128", Integers.valueOf(64)); - // blockLengths.put("RIPEMD160", Integers.valueOf(64)); - // END android-removed + blockLengths.put("RIPEMD128", Integers.valueOf(64)); + blockLengths.put("RIPEMD160", Integers.valueOf(64)); blockLengths.put("SHA-1", Integers.valueOf(64)); blockLengths.put("SHA-224", Integers.valueOf(64)); @@ -55,10 +51,8 @@ public class HMac blockLengths.put("SHA-384", Integers.valueOf(128)); blockLengths.put("SHA-512", Integers.valueOf(128)); - // BEGIN android-removed - // blockLengths.put("Tiger", Integers.valueOf(64)); - // blockLengths.put("Whirlpool", Integers.valueOf(64)); - // END android-removed + blockLengths.put("Tiger", Integers.valueOf(64)); + blockLengths.put("Whirlpool", Integers.valueOf(64)); } private static int getByteLength( |