diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-02-07 09:33:50 +0400 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-02-07 09:33:50 +0400 |
commit | 400f2eff2c1786703dd1f192328c7a3d69ddcc8e (patch) | |
tree | 705e17756201232ef879d0015dee228857a3d448 /core/src/main/java/org/bouncycastle | |
parent | 788ad351bcecfc4f89699590d0534e3eb4e8cc52 (diff) |
Refactoring
Diffstat (limited to 'core/src/main/java/org/bouncycastle')
-rw-r--r-- | core/src/main/java/org/bouncycastle/crypto/signers/HMacDSAKCalculator.java | 35 |
1 files changed, 13 insertions, 22 deletions
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); } } |