diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2013-10-03 07:35:25 +0400 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2013-10-03 07:35:25 +0400 |
commit | f6af50c06bc1d80bc183be783d7f77bb0793bce9 (patch) | |
tree | 30b9b0f869c98d8dd0b3426b7057714803b4ca22 /core/src/main/java | |
parent | e336912cf9f1cc7a7d5f1285ae853c9155270981 (diff) |
Pass explicit count to shifting methods
Diffstat (limited to 'core/src/main/java')
-rw-r--r-- | core/src/main/java/org/bouncycastle/math/ec/IntArray.java | 16 | ||||
-rw-r--r-- | core/src/main/java/org/bouncycastle/math/ec/LongArray.java | 22 |
2 files changed, 19 insertions, 19 deletions
diff --git a/core/src/main/java/org/bouncycastle/math/ec/IntArray.java b/core/src/main/java/org/bouncycastle/math/ec/IntArray.java index bf95bda1..eda9743a 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/IntArray.java +++ b/core/src/main/java/org/bouncycastle/math/ec/IntArray.java @@ -251,10 +251,10 @@ class IntArray return new BigInteger(1, barr); } - private static int shiftLeftQuick(int[] x) + private static int shiftLeftQuick(int[] x, int count) { int prev = 0; - for (int i = 0; i < x.length; ++i) + for (int i = 0; i < count; ++i) { int next = x[i]; x[i] = (next << 1) | prev; @@ -338,9 +338,9 @@ class IntArray } } - private static void addShiftedByWordsQuick(int[] x, int xOff, int[] y) + private static void addShiftedByWordsQuick(int[] x, int xOff, int[] y, int count) { - for (int i = 0; i < y.length; ++i) + for (int i = 0; i < count; ++i) { x[xOff + i] ^= y[i]; } @@ -515,15 +515,15 @@ class IntArray if ((aVal & bit10) == bit10) { - addShiftedByWordsQuick(c10, aPos, b); + addShiftedByWordsQuick(c10, aPos, b, bLen); } else if ((aVal & bit1) != 0) { - addShiftedByWordsQuick(c1, aPos, b); + addShiftedByWordsQuick(c1, aPos, b, bLen); } else if ((aVal & bit0) != 0) { - addShiftedByWordsQuick(c0, aPos, b); + addShiftedByWordsQuick(c0, aPos, b, bLen); } } @@ -532,7 +532,7 @@ class IntArray break; } - shiftLeftQuick(b); + shiftLeftQuick(b, bLen); } addQuick(c1, c10, cLen); diff --git a/core/src/main/java/org/bouncycastle/math/ec/LongArray.java b/core/src/main/java/org/bouncycastle/math/ec/LongArray.java index 4b972fc6..b4c758c2 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/LongArray.java +++ b/core/src/main/java/org/bouncycastle/math/ec/LongArray.java @@ -268,10 +268,10 @@ class LongArray return new BigInteger(1, barr); } - private static long shiftLeftQuick(long[] x) + private static long shiftLeftQuick(long[] x, int count) { long prev = 0; - for (int i = 0; i < x.length; ++i) + for (int i = 0; i < count; ++i) { long next = x[i]; x[i] = (next << 1) | prev; @@ -357,9 +357,9 @@ class LongArray } } - private static void addShiftedByWordsQuick(long[] x, int xOff, long[] y) + private static void addShiftedByWordsQuick(long[] x, int xOff, long[] y, int count) { - for (int i = 0; i < y.length; ++i) + for (int i = 0; i < count; ++i) { x[xOff + i] ^= y[i]; } @@ -537,32 +537,32 @@ class LongArray if ((aVal & bit32) == bit32) { - addShiftedByWordsQuick(c32, aPos, b); + addShiftedByWordsQuick(c32, aPos, b, bLen); } else if ((aVal & bit3) != 0) { - addShiftedByWordsQuick(c3, aPos, b); + addShiftedByWordsQuick(c3, aPos, b, bLen); } else if ((aVal & bit2) != 0) { - addShiftedByWordsQuick(c2, aPos, b); + addShiftedByWordsQuick(c2, aPos, b, bLen); } if ((aVal & bit10) == bit10) { - addShiftedByWordsQuick(c10, aPos, b); + addShiftedByWordsQuick(c10, aPos, b, bLen); } else if ((aVal & bit1) != 0) { - addShiftedByWordsQuick(c1, aPos, b); + addShiftedByWordsQuick(c1, aPos, b, bLen); } else if ((aVal & bit0) != 0) { - addShiftedByWordsQuick(c0, aPos, b); + addShiftedByWordsQuick(c0, aPos, b, bLen); } } @@ -571,7 +571,7 @@ class LongArray break; } - shiftLeftQuick(b); + shiftLeftQuick(b, bLen); } addQuick(c3, c32, cLen); |