From 400f2eff2c1786703dd1f192328c7a3d69ddcc8e Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Fri, 7 Feb 2014 12:33:50 +0700 Subject: Refactoring --- .../crypto/signers/HMacDSAKCalculator.java | 35 ++++++++-------------- 1 file changed, 13 insertions(+), 22 deletions(-) (limited to 'core/src/main/java/org/bouncycastle/crypto/signers') diff --git a/core/src/main/java/org/bouncycastle/crypto/signers/HMacDSAKCalculator.java b/core/src/main/java/org/bouncycastle/crypto/signers/HMacDSAKCalculator.java index b96e3f37..db78d4a3 100644 --- a/core/src/main/java/org/bouncycastle/crypto/signers/HMacDSAKCalculator.java +++ b/core/src/main/java/org/bouncycastle/crypto/signers/HMacDSAKCalculator.java @@ -113,37 +113,28 @@ public class HMacDSAKCalculator hMac.doFinal(V, 0); - if (t.length - tOff < V.length) - { - System.arraycopy(V, 0, t, tOff, t.length - tOff); - tOff += t.length - tOff; - } - else - { - System.arraycopy(V, 0, t, tOff, V.length); - tOff += V.length; - } + int len = Math.min(t.length - tOff, V.length); + System.arraycopy(V, 0, t, tOff, len); + tOff += len; } BigInteger k = bitsToInt(t); - if (k.equals(ZERO) || k.compareTo(n) >= 0) + if (k.compareTo(ZERO) > 0 && k.compareTo(n) < 0) { - hMac.update(V, 0, V.length); - hMac.update((byte)0x00); + return k; + } - hMac.doFinal(K, 0); + hMac.update(V, 0, V.length); + hMac.update((byte)0x00); - hMac.init(new KeyParameter(K)); + hMac.doFinal(K, 0); - hMac.update(V, 0, V.length); + hMac.init(new KeyParameter(K)); - hMac.doFinal(V, 0); - } - else - { - return k; - } + hMac.update(V, 0, V.length); + + hMac.doFinal(V, 0); } } -- cgit v1.2.3