This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new bac5269c Magic numbers => constants
bac5269c is described below
commit bac5269c4be5e9a08201aa147c8713ee94272616
Author: Sebb <[email protected]>
AuthorDate: Thu Nov 9 11:06:34 2023 +0000
Magic numbers => constants
---
src/main/java/org/apache/commons/crypto/random/JavaCryptoRandom.java | 2 +-
.../java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/commons/crypto/random/JavaCryptoRandom.java
b/src/main/java/org/apache/commons/crypto/random/JavaCryptoRandom.java
index ab7852cb..97afe673 100644
--- a/src/main/java/org/apache/commons/crypto/random/JavaCryptoRandom.java
+++ b/src/main/java/org/apache/commons/crypto/random/JavaCryptoRandom.java
@@ -65,7 +65,7 @@ final class JavaCryptoRandom implements CryptoRandom {
* @return int an {@code int} containing the user-specified number of
random bits (right justified, with leading zeros).
*/
protected int next(final int numBits) {
- Utils.checkArgument(numBits >= 0 && numBits <= 32);
+ Utils.checkArgument(numBits >= 0 && numBits <= Integer.SIZE);
// Can't simply invoke instance.next(bits) here, because that is
package protected.
// But, this should do.
return instance.nextInt() >>> (Integer.SIZE - numBits);
diff --git
a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
index 27f11288..ca407a0c 100644
--- a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
+++ b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
@@ -84,9 +84,9 @@ public class CtrCryptoInputStream extends CryptoInputStream {
while (i-- > 0) {
// (sum >>> Byte.SIZE) is the carry for addition
sum = (initIV[i] & 0xff) + (sum >>> Byte.SIZE); // NOPMD
- if (j++ < 8) { // Big-endian, and long is 8 bytes length
+ if (j++ < Long.BYTES) { // Big-endian, and long is 8 bytes length
sum += (byte) counter & 0xff;
- counter >>>= 8;
+ counter >>>= Long.BYTES;
}
IV[i] = (byte) sum;
}