diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1NumericString.java b/core/src/main/java/org/bouncycastle/asn1/ASN1NumericString.java index 3609acaed1..b1e7db3330 100644 --- a/core/src/main/java/org/bouncycastle/asn1/ASN1NumericString.java +++ b/core/src/main/java/org/bouncycastle/asn1/ASN1NumericString.java @@ -179,9 +179,9 @@ public static boolean isNumericString(String str) static boolean isNumericString(byte[] contents) { - for (int i = 0; i < contents.length; ++i) + for (byte content : contents) { - switch (contents[i]) + switch (content) { case 0x20: case 0x30: diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java b/core/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java index 3f3dc4bcba..acedf5450d 100644 --- a/core/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java +++ b/core/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java @@ -121,9 +121,9 @@ final void write(byte[] bytes, int off, int len) throws IOException void writeElements(ASN1Encodable[] elements) throws IOException { - for (int i = 0, count = elements.length; i < count; ++i) + for (ASN1Encodable element : elements) { - elements[i].toASN1Primitive().encode(this, true); + element.toASN1Primitive().encode(this, true); } } @@ -226,9 +226,9 @@ void writePrimitive(ASN1Primitive primitive, boolean withID) throws IOException void writePrimitives(ASN1Primitive[] primitives) throws IOException { - for (int i = 0, count = primitives.length; i < count; ++i) + for (ASN1Primitive primitive : primitives) { - primitives[i].encode(this, true); + primitive.encode(this, true); } } diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1RelativeOID.java b/core/src/main/java/org/bouncycastle/asn1/ASN1RelativeOID.java index 00f980508c..1cc8547d94 100644 --- a/core/src/main/java/org/bouncycastle/asn1/ASN1RelativeOID.java +++ b/core/src/main/java/org/bouncycastle/asn1/ASN1RelativeOID.java @@ -257,14 +257,14 @@ static boolean isValidContents(byte[] contents) } boolean subIDStart = true; - for (int i = 0; i < contents.length; ++i) + for (byte content : contents) { - if (subIDStart && (contents[i] & 0xff) == 0x80) + if (subIDStart && (content & 0xff) == 0x80) { return false; } - subIDStart = (contents[i] & 0x80) == 0; + subIDStart = (content & 0x80) == 0; } return subIDStart; diff --git a/core/src/main/java/org/bouncycastle/asn1/BERBitString.java b/core/src/main/java/org/bouncycastle/asn1/BERBitString.java index 45ebaa4582..1accfb38fa 100644 --- a/core/src/main/java/org/bouncycastle/asn1/BERBitString.java +++ b/core/src/main/java/org/bouncycastle/asn1/BERBitString.java @@ -46,9 +46,9 @@ static byte[] flattenBitStrings(ASN1BitString[] bitStrings) contents[0] = padBits; int pos = 1; - for (int i = 0; i < count; ++i) + for (ASN1BitString bitString : bitStrings) { - byte[] elementContents = bitStrings[i].contents; + byte[] elementContents = bitString.contents; int length = elementContents.length - 1; System.arraycopy(elementContents, 1, contents, pos, length); pos += length; @@ -125,9 +125,9 @@ int encodedLength(boolean withTag) if (null != elements) { - for (int i = 0; i < elements.length; ++i) + for (ASN1BitString element : elements) { - totalLength += elements[i].encodedLength(true); + totalLength += element.encodedLength(true); } } else if (contents.length < 2) diff --git a/core/src/main/java/org/bouncycastle/asn1/BEROctetString.java b/core/src/main/java/org/bouncycastle/asn1/BEROctetString.java index dbc8e4b8b9..6d28114222 100644 --- a/core/src/main/java/org/bouncycastle/asn1/BEROctetString.java +++ b/core/src/main/java/org/bouncycastle/asn1/BEROctetString.java @@ -39,9 +39,9 @@ static byte[] flattenOctetStrings(ASN1OctetString[] octetStrings) default: { int totalOctets = 0; - for (int i = 0; i < count; ++i) + for (ASN1OctetString octetString : octetStrings) { - totalOctets += octetStrings[i].string.length; + totalOctets += octetString.string.length; } byte[] string = new byte[totalOctets]; @@ -119,9 +119,9 @@ int encodedLength(boolean withTag) if (null != elements) { - for (int i = 0; i < elements.length; ++i) + for (ASN1OctetString element : elements) { - totalLength += elements[i].encodedLength(true); + totalLength += element.encodedLength(true); } } else diff --git a/core/src/main/java/org/bouncycastle/asn1/BERSequence.java b/core/src/main/java/org/bouncycastle/asn1/BERSequence.java index 93d9783eb0..445f760998 100644 --- a/core/src/main/java/org/bouncycastle/asn1/BERSequence.java +++ b/core/src/main/java/org/bouncycastle/asn1/BERSequence.java @@ -59,9 +59,9 @@ int encodedLength(boolean withTag) throws IOException { int totalLength = withTag ? 4 : 3; - for (int i = 0, count = elements.length; i < count; ++i) + for (ASN1Encodable element : elements) { - ASN1Primitive p = elements[i].toASN1Primitive(); + ASN1Primitive p = element.toASN1Primitive(); totalLength += p.encodedLength(true); } diff --git a/core/src/main/java/org/bouncycastle/asn1/BERSet.java b/core/src/main/java/org/bouncycastle/asn1/BERSet.java index f900258db4..821c518712 100644 --- a/core/src/main/java/org/bouncycastle/asn1/BERSet.java +++ b/core/src/main/java/org/bouncycastle/asn1/BERSet.java @@ -63,9 +63,9 @@ int encodedLength(boolean withTag) throws IOException { int totalLength = withTag ? 4 : 3; - for (int i = 0, count = elements.length; i < count; ++i) + for (ASN1Encodable element : elements) { - ASN1Primitive p = elements[i].toASN1Primitive(); + ASN1Primitive p = element.toASN1Primitive(); totalLength += p.encodedLength(true); } diff --git a/core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java b/core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java index f27f221e8c..3b3c632dfb 100644 --- a/core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java +++ b/core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java @@ -356,7 +356,7 @@ public String toString(X500Name name) RDN[] rdns = name.getRDNs(); - for (int i = 0; i < rdns.length; i++) + for (RDN rdn : rdns) { if (first) { @@ -367,7 +367,7 @@ public String toString(X500Name name) buf.append(','); } - IETFUtils.appendRDN(buf, rdns[i], defaultSymbols); + IETFUtils.appendRDN(buf, rdn, defaultSymbols); } return buf.toString(); diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/Blake3Digest.java b/core/src/main/java/org/bouncycastle/crypto/digests/Blake3Digest.java index dd3dd234e1..7fc9fa0e23 100644 --- a/core/src/main/java/org/bouncycastle/crypto/digests/Blake3Digest.java +++ b/core/src/main/java/org/bouncycastle/crypto/digests/Blake3Digest.java @@ -560,9 +560,9 @@ public void reset(final Memoable pSource) /* Copy stack */ theStack.clear(); - for (Iterator it = mySource.theStack.iterator(); it.hasNext(); ) + for (Object o : mySource.theStack) { - theStack.push(Arrays.clone((int[])it.next())); + theStack.push(Arrays.clone((int[])o)); } /* Copy buffer */ diff --git a/core/src/main/java/org/bouncycastle/crypto/generators/Argon2BytesGenerator.java b/core/src/main/java/org/bouncycastle/crypto/generators/Argon2BytesGenerator.java index 2e113a7ab4..b3c9217016 100755 --- a/core/src/main/java/org/bouncycastle/crypto/generators/Argon2BytesGenerator.java +++ b/core/src/main/java/org/bouncycastle/crypto/generators/Argon2BytesGenerator.java @@ -136,9 +136,8 @@ private void reset() // Reset memory. if (null != memory) { - for (int i = 0; i < memory.length; i++) + for (Block b : memory) { - Block b = memory[i]; if (null != b) { b.clear(); diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/bike/BIKEUtils.java b/core/src/main/java/org/bouncycastle/pqc/crypto/bike/BIKEUtils.java index 039bd7638f..69c1157d56 100644 --- a/core/src/main/java/org/bouncycastle/pqc/crypto/bike/BIKEUtils.java +++ b/core/src/main/java/org/bouncycastle/pqc/crypto/bike/BIKEUtils.java @@ -8,9 +8,9 @@ class BIKEUtils static int getHammingWeight(byte[] bytes) { int hammingWeight = 0; - for (int i = 0; i < bytes.length; i++) + for (byte aByte : bytes) { - hammingWeight += bytes[i]; + hammingWeight += aByte; } return hammingWeight; } diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/xmss/BDS.java b/core/src/main/java/org/bouncycastle/pqc/crypto/xmss/BDS.java index bf27bcbd57..f153b2a2ee 100644 --- a/core/src/main/java/org/bouncycastle/pqc/crypto/xmss/BDS.java +++ b/core/src/main/java/org/bouncycastle/pqc/crypto/xmss/BDS.java @@ -122,17 +122,16 @@ private BDS(WOTSPlus wotsPlus, int treeHeight, int k, int maxIndex) this.authenticationPath = new ArrayList(); // note use of addAll to avoid serialization issues this.authenticationPath.addAll(last.authenticationPath); this.retain = new TreeMap>(); - for (Iterator it = last.retain.keySet().iterator(); it.hasNext();) + for (Integer key : last.retain.keySet()) { - Integer key = (Integer)it.next(); this.retain.put(key, (LinkedList)last.retain.get(key).clone()); } this.stack = new Stack(); // note use of addAll to avoid serialization issues this.stack.addAll(last.stack); this.treeHashInstances = new ArrayList(); - for (Iterator it = last.treeHashInstances.iterator(); it.hasNext();) + for (BDSTreeHash treeHashInstance : last.treeHashInstances) { - this.treeHashInstances.add(((BDSTreeHash)it.next()).clone()); + this.treeHashInstances.add(treeHashInstance.clone()); } this.keep = new TreeMap(last.keep); this.index = last.index; @@ -149,17 +148,16 @@ private BDS(BDS last, byte[] publicSeed, byte[] secretKeySeed, OTSHashAddress ot this.authenticationPath = new ArrayList(); // note use of addAll to avoid serialization issues this.authenticationPath.addAll(last.authenticationPath); this.retain = new TreeMap>(); - for (Iterator it = last.retain.keySet().iterator(); it.hasNext();) + for (Integer key : last.retain.keySet()) { - Integer key = (Integer)it.next(); this.retain.put(key, (LinkedList)last.retain.get(key).clone()); } this.stack = new Stack(); // note use of addAll to avoid serialization issues this.stack.addAll(last.stack); this.treeHashInstances = new ArrayList(); - for (Iterator it = last.treeHashInstances.iterator(); it.hasNext();) + for (BDSTreeHash treeHashInstance : last.treeHashInstances) { - this.treeHashInstances.add(((BDSTreeHash)it.next()).clone()); + this.treeHashInstances.add(treeHashInstance.clone()); } this.keep = new TreeMap(last.keep); this.index = last.index; @@ -178,17 +176,16 @@ private BDS(BDS last, ASN1ObjectIdentifier digest) this.authenticationPath = new ArrayList(); // note use of addAll to avoid serialization issues this.authenticationPath.addAll(last.authenticationPath); this.retain = new TreeMap>(); - for (Iterator it = last.retain.keySet().iterator(); it.hasNext();) + for (Integer key : last.retain.keySet()) { - Integer key = (Integer)it.next(); this.retain.put(key, (LinkedList)last.retain.get(key).clone()); } this.stack = new Stack(); // note use of addAll to avoid serialization issues this.stack.addAll(last.stack); this.treeHashInstances = new ArrayList(); - for (Iterator it = last.treeHashInstances.iterator(); it.hasNext();) + for (BDSTreeHash treeHashInstance : last.treeHashInstances) { - this.treeHashInstances.add(((BDSTreeHash)it.next()).clone()); + this.treeHashInstances.add(treeHashInstance.clone()); } this.keep = new TreeMap(last.keep); this.index = last.index; @@ -206,17 +203,16 @@ private BDS(BDS last, int maxIndex, ASN1ObjectIdentifier digest) this.authenticationPath = new ArrayList(); // note use of addAll to avoid serialization issues this.authenticationPath.addAll(last.authenticationPath); this.retain = new TreeMap>(); - for (Iterator it = last.retain.keySet().iterator(); it.hasNext();) + for (Integer key : last.retain.keySet()) { - Integer key = (Integer)it.next(); this.retain.put(key, (LinkedList)last.retain.get(key).clone()); } this.stack = new Stack(); // note use of addAll to avoid serialization issues this.stack.addAll(last.stack); this.treeHashInstances = new ArrayList(); - for (Iterator it = last.treeHashInstances.iterator(); it.hasNext();) + for (BDSTreeHash treeHashInstance : last.treeHashInstances) { - this.treeHashInstances.add(((BDSTreeHash)it.next()).clone()); + this.treeHashInstances.add(treeHashInstance.clone()); } this.keep = new TreeMap(last.keep); this.index = last.index; diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/xmss/BDSStateMap.java b/core/src/main/java/org/bouncycastle/pqc/crypto/xmss/BDSStateMap.java index 4e51114582..2d9a9c1458 100644 --- a/core/src/main/java/org/bouncycastle/pqc/crypto/xmss/BDSStateMap.java +++ b/core/src/main/java/org/bouncycastle/pqc/crypto/xmss/BDSStateMap.java @@ -27,10 +27,8 @@ public class BDSStateMap BDSStateMap(BDSStateMap stateMap, long maxIndex) { - for (Iterator it = stateMap.bdsState.keySet().iterator(); it.hasNext();) + for (Integer key : stateMap.bdsState.keySet()) { - Integer key = (Integer)it.next(); - bdsState.put(key, new BDS(stateMap.bdsState.get(key))); } this.maxIndex = maxIndex; @@ -123,10 +121,8 @@ public BDSStateMap withWOTSDigest(ASN1ObjectIdentifier digestName) { BDSStateMap newStateMap = new BDSStateMap(this.maxIndex); - for (Iterator keys = bdsState.keySet().iterator(); keys.hasNext();) + for (Integer key : bdsState.keySet()) { - Integer key = keys.next(); - newStateMap.bdsState.put(key, bdsState.get(key).withWOTSDigest(digestName)); } diff --git a/core/src/main/java/org/bouncycastle/pqc/legacy/math/linearalgebra/ByteUtils.java b/core/src/main/java/org/bouncycastle/pqc/legacy/math/linearalgebra/ByteUtils.java index 26eeaa69fd..e7a9a1d5b2 100644 --- a/core/src/main/java/org/bouncycastle/pqc/legacy/math/linearalgebra/ByteUtils.java +++ b/core/src/main/java/org/bouncycastle/pqc/legacy/math/linearalgebra/ByteUtils.java @@ -114,9 +114,9 @@ public static boolean equals(byte[][][] left, byte[][][] right) public static int deepHashCode(byte[] array) { int result = 1; - for (int i = 0; i < array.length; i++) + for (byte b : array) { - result = 31 * result + array[i]; + result = 31 * result + b; } return result; } @@ -131,9 +131,9 @@ public static int deepHashCode(byte[] array) public static int deepHashCode(byte[][] array) { int result = 1; - for (int i = 0; i < array.length; i++) + for (byte[] bytes : array) { - result = 31 * result + deepHashCode(array[i]); + result = 31 * result + deepHashCode(bytes); } return result; } @@ -148,9 +148,9 @@ public static int deepHashCode(byte[][] array) public static int deepHashCode(byte[][][] array) { int result = 1; - for (int i = 0; i < array.length; i++) + for (byte[][] bytes : array) { - result = 31 * result + deepHashCode(array[i]); + result = 31 * result + deepHashCode(bytes); } return result; } @@ -185,10 +185,10 @@ public static byte[] fromHexString(String s) char[] rawChars = Strings.toUpperCase(s).toCharArray(); int hexChars = 0; - for (int i = 0; i < rawChars.length; i++) + for (char rawChar : rawChars) { - if ((rawChars[i] >= '0' && rawChars[i] <= '9') - || (rawChars[i] >= 'A' && rawChars[i] <= 'F')) + if ((rawChar >= '0' && rawChar <= '9') + || (rawChar >= 'A' && rawChar <= 'F')) { hexChars++; } @@ -198,17 +198,17 @@ public static byte[] fromHexString(String s) int pos = hexChars & 1; - for (int i = 0; i < rawChars.length; i++) + for (char rawChar : rawChars) { - if (rawChars[i] >= '0' && rawChars[i] <= '9') + if (rawChar >= '0' && rawChar <= '9') { byteString[pos >> 1] <<= 4; - byteString[pos >> 1] |= rawChars[i] - '0'; + byteString[pos >> 1] |= rawChar - '0'; } - else if (rawChars[i] >= 'A' && rawChars[i] <= 'F') + else if (rawChar >= 'A' && rawChar <= 'F') { byteString[pos >> 1] <<= 4; - byteString[pos >> 1] |= rawChars[i] - 'A' + 10; + byteString[pos >> 1] |= rawChar - 'A' + 10; } else { @@ -229,10 +229,10 @@ else if (rawChars[i] >= 'A' && rawChars[i] <= 'F') public static String toHexString(byte[] input) { String result = ""; - for (int i = 0; i < input.length; i++) + for (byte b : input) { - result += HEX_CHARS[(input[i] >>> 4) & 0x0f]; - result += HEX_CHARS[(input[i]) & 0x0f]; + result += HEX_CHARS[(b >>> 4) & 0x0f]; + result += HEX_CHARS[(b) & 0x0f]; } return result; } @@ -336,9 +336,9 @@ public static byte[] concatenate(byte[][] array) int rowLength = array[0].length; byte[] result = new byte[array.length * rowLength]; int index = 0; - for (int i = 0; i < array.length; i++) + for (byte[] bytes : array) { - System.arraycopy(array[i], 0, result, index, rowLength); + System.arraycopy(bytes, 0, result, index, rowLength); index += rowLength; } return result; diff --git a/core/src/main/java/org/bouncycastle/pqc/legacy/math/ntru/polynomial/BigIntPolynomial.java b/core/src/main/java/org/bouncycastle/pqc/legacy/math/ntru/polynomial/BigIntPolynomial.java index 50f1517782..5f5ef9e6ce 100644 --- a/core/src/main/java/org/bouncycastle/pqc/legacy/math/ntru/polynomial/BigIntPolynomial.java +++ b/core/src/main/java/org/bouncycastle/pqc/legacy/math/ntru/polynomial/BigIntPolynomial.java @@ -342,9 +342,9 @@ public void mod(BigInteger modulus) BigInteger sumCoeffs() { BigInteger sum = Constants.BIGINT_ZERO; - for (int i = 0; i < coeffs.length; i++) + for (BigInteger coeff : coeffs) { - sum = sum.add(coeffs[i]); + sum = sum.add(coeff); } return sum; } diff --git a/core/src/main/java/org/bouncycastle/pqc/legacy/math/ntru/util/ArrayEncoder.java b/core/src/main/java/org/bouncycastle/pqc/legacy/math/ntru/util/ArrayEncoder.java index e0fc589be3..4ce8e6cf5c 100644 --- a/core/src/main/java/org/bouncycastle/pqc/legacy/math/ntru/util/ArrayEncoder.java +++ b/core/src/main/java/org/bouncycastle/pqc/legacy/math/ntru/util/ArrayEncoder.java @@ -73,11 +73,11 @@ public static byte[] encodeModQ(int[] a, int q) byte[] data = new byte[numBytes]; int bitIndex = 0; int byteIndex = 0; - for (int i = 0; i < a.length; i++) + for (int ai : a) { for (int j = 0; j < bitsPerCoeff; j++) { - int currentBit = (a[i] >> j) & 1; + int currentBit = (ai >> j) & 1; data[byteIndex] |= currentBit << bitIndex; if (bitIndex == 7) { diff --git a/core/src/main/java/org/bouncycastle/util/Arrays.java b/core/src/main/java/org/bouncycastle/util/Arrays.java index db6f127dcf..53b30ad9a7 100644 --- a/core/src/main/java/org/bouncycastle/util/Arrays.java +++ b/core/src/main/java/org/bouncycastle/util/Arrays.java @@ -230,9 +230,9 @@ public static int compareUnsigned(byte[] a, byte[] b) public static boolean contains(boolean[] a, boolean val) { - for (int i = 0; i < a.length; ++i) + for (boolean b : a) { - if (a[i] == val) + if (b == val) { return true; } @@ -242,9 +242,9 @@ public static boolean contains(boolean[] a, boolean val) public static boolean contains(byte[] a, byte val) { - for (int i = 0; i < a.length; ++i) + for (byte b : a) { - if (a[i] == val) + if (b == val) { return true; } @@ -254,9 +254,9 @@ public static boolean contains(byte[] a, byte val) public static boolean contains(char[] a, char val) { - for (int i = 0; i < a.length; ++i) + for (char c : a) { - if (a[i] == val) + if (c == val) { return true; } @@ -266,9 +266,9 @@ public static boolean contains(char[] a, char val) public static boolean contains(int[] a, int val) { - for (int i = 0; i < a.length; ++i) + for (int j : a) { - if (a[i] == val) + if (j == val) { return true; } @@ -278,9 +278,9 @@ public static boolean contains(int[] a, int val) public static boolean contains(long[] a, long val) { - for (int i = 0; i < a.length; ++i) + for (long l : a) { - if (a[i] == val) + if (l == val) { return true; } @@ -290,9 +290,9 @@ public static boolean contains(long[] a, long val) public static boolean contains(short[] a, short val) { - for (int i = 0; i < a.length; ++i) + for (short value : a) { - if (a[i] == val) + if (value == val) { return true; } @@ -1223,10 +1223,9 @@ public static boolean isNullOrContainsNull(Object[] array) { return true; } - int count = array.length; - for (int i = 0; i < count; ++i) + for (Object o : array) { - if (null == array[i]) + if (null == o) { return true; } diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AESVectorFileTest.java b/core/src/test/java/org/bouncycastle/crypto/test/AESVectorFileTest.java index d26f07eefe..80ce8ad099 100644 --- a/core/src/test/java/org/bouncycastle/crypto/test/AESVectorFileTest.java +++ b/core/src/test/java/org/bouncycastle/crypto/test/AESVectorFileTest.java @@ -200,9 +200,9 @@ private TestResult performTestsFromZipFile(File zfile) public TestResult perform() { countOfTests = 0; - for (int i = 0; i < zipFileNames.length; i++) + for (String zipFileName : zipFileNames) { - File inf = new File(zipFileNames[i]); + File inf = new File(zipFileName); TestResult res = performTestsFromZipFile(inf); if (!res.isSuccessful()) { diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ARIATest.java b/core/src/test/java/org/bouncycastle/crypto/test/ARIATest.java index 6d8f27d3f9..9604e80fab 100644 --- a/core/src/test/java/org/bouncycastle/crypto/test/ARIATest.java +++ b/core/src/test/java/org/bouncycastle/crypto/test/ARIATest.java @@ -117,9 +117,9 @@ private void checkTestVector_RFC5794(String[] tv) private void checkTestVectors_RFC5794() { - for (int i = 0; i < TEST_VECTORS_RFC5794.length; ++i) + for (String[] strings : TEST_VECTORS_RFC5794) { - checkTestVector_RFC5794(TEST_VECTORS_RFC5794[i]); + checkTestVector_RFC5794(strings); } } diff --git a/core/src/test/java/org/bouncycastle/crypto/test/BCryptTest.java b/core/src/test/java/org/bouncycastle/crypto/test/BCryptTest.java index 521cde8898..72137a3fe5 100644 --- a/core/src/test/java/org/bouncycastle/crypto/test/BCryptTest.java +++ b/core/src/test/java/org/bouncycastle/crypto/test/BCryptTest.java @@ -122,12 +122,12 @@ private void checkIllegal(String msg, byte[] pass, byte[] salt, int cost) public void testVectors() throws Exception { - for (int i = 0; i < testVectors.length; i++) + for (Object[] testVector : testVectors) { - byte[] password = Hex.decode((String)testVectors[i][0]); - byte[] salt = Hex.decode((String)testVectors[i][1]); - int cost = ((Integer)testVectors[i][2]).intValue(); - byte[] expected = Hex.decode((String)testVectors[i][3]); + byte[] password = Hex.decode((String)testVector[0]); + byte[] salt = Hex.decode((String)testVector[1]); + int cost = ((Integer)testVector[2]).intValue(); + byte[] expected = Hex.decode((String)testVector[3]); test(password, salt, cost, expected); } diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Blake2bDigestTest.java b/core/src/test/java/org/bouncycastle/crypto/test/Blake2bDigestTest.java index 1e2cc74960..8228bb600a 100644 --- a/core/src/test/java/org/bouncycastle/crypto/test/Blake2bDigestTest.java +++ b/core/src/test/java/org/bouncycastle/crypto/test/Blake2bDigestTest.java @@ -97,20 +97,20 @@ public void performTest() // test keyed test vectors: Blake2bDigest blake2bkeyed = new Blake2bDigest(Hex.decode(keyedTestVectors[0][1])); - for (int tv = 0; tv < keyedTestVectors.length; tv++) + for (String[] keyedTestVector : keyedTestVectors) { - byte[] input = Hex.decode(keyedTestVectors[tv][0]); + byte[] input = Hex.decode(keyedTestVector[0]); blake2bkeyed.reset(); blake2bkeyed.update(input, 0, input.length); byte[] keyedHash = new byte[64]; blake2bkeyed.doFinal(keyedHash, 0); - if (!Arrays.areEqual(Hex.decode(keyedTestVectors[tv][2]), keyedHash)) + if (!Arrays.areEqual(Hex.decode(keyedTestVector[2]), keyedHash)) { fail("BLAKE2b mismatch on test vector ", - keyedTestVectors[tv][2], + keyedTestVector[2], new String(Hex.encode(keyedHash))); } @@ -119,27 +119,27 @@ public void performTest() Blake2bDigest blake2bunkeyed = new Blake2bDigest(); // test unkeyed test vectors: - for (int i = 0; i < unkeyedTestVectors.length; i++) + for (String[] unkeyedTestVector : unkeyedTestVectors) { // blake2bunkeyed.update( // unkeyedTestVectors[i][1].getBytes("UTF-8")); // test update(byte b) - byte[] unkeyedInput = Strings.toUTF8ByteArray(unkeyedTestVectors[i][1]); - for (int j = 0; j < unkeyedInput.length; j++) + byte[] unkeyedInput = Strings.toUTF8ByteArray(unkeyedTestVector[1]); + for (byte b : unkeyedInput) { - blake2bunkeyed.update(unkeyedInput[j]); + blake2bunkeyed.update(b); } byte[] unkeyedHash = new byte[64]; blake2bunkeyed.doFinal(unkeyedHash, 0); blake2bunkeyed.reset(); - if (!Arrays.areEqual(Hex.decode(unkeyedTestVectors[i][0]), + if (!Arrays.areEqual(Hex.decode(unkeyedTestVector[0]), unkeyedHash)) { fail("BLAKE2b mismatch on test vector ", - unkeyedTestVectors[i][0], + unkeyedTestVector[0], new String(Hex.encode(unkeyedHash))); } } diff --git a/core/src/test/java/org/bouncycastle/util/encoders/test/AbstractCoderTest.java b/core/src/test/java/org/bouncycastle/util/encoders/test/AbstractCoderTest.java index 0da54d9b78..182298cb55 100644 --- a/core/src/test/java/org/bouncycastle/util/encoders/test/AbstractCoderTest.java +++ b/core/src/test/java/org/bouncycastle/util/encoders/test/AbstractCoderTest.java @@ -65,9 +65,9 @@ private void checkArrayOfSize(int size) public void testEncode() throws IOException { - for (int i = 0; i < SIZES_TO_CHECK.length; i++) + for (int j : SIZES_TO_CHECK) { - checkArrayOfSize(SIZES_TO_CHECK[i]); + checkArrayOfSize(j); } } diff --git a/pkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java b/pkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java index e0176a147e..b0134cfde4 100644 --- a/pkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java +++ b/pkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java @@ -274,9 +274,9 @@ public CertificateRequestMessage build() { ASN1EncodableVector controlV = new ASN1EncodableVector(); - for (Iterator it = controls.iterator(); it.hasNext();) + for (Object o : controls) { - Control control = (Control)it.next(); + Control control = (Control)o; controlV.add(new AttributeTypeAndValue(control.getType(), control.getValue())); } diff --git a/pkix/src/main/java/org/bouncycastle/openssl/CertificateTrustBlock.java b/pkix/src/main/java/org/bouncycastle/openssl/CertificateTrustBlock.java index 7c6b65c8e3..1541682c4e 100644 --- a/pkix/src/main/java/org/bouncycastle/openssl/CertificateTrustBlock.java +++ b/pkix/src/main/java/org/bouncycastle/openssl/CertificateTrustBlock.java @@ -103,9 +103,9 @@ private ASN1Sequence toSequence(Set oids) ASN1EncodableVector v = new ASN1EncodableVector(); - for (Iterator it = oids.iterator(); it.hasNext();) + for (ASN1ObjectIdentifier oid : oids) { - v.add((ASN1Encodable)it.next()); + v.add((ASN1Encodable)oid); } return new DERSequence(v); diff --git a/pkix/src/main/java/org/bouncycastle/pkix/ASN1PKIXNameConstraintValidator.java b/pkix/src/main/java/org/bouncycastle/pkix/ASN1PKIXNameConstraintValidator.java index d77afc712a..a8d9c08203 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/ASN1PKIXNameConstraintValidator.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/ASN1PKIXNameConstraintValidator.java @@ -162,9 +162,9 @@ public void intersectPermittedSubtree(GeneralSubtree[] permitted) ((Set)subtreesMap.get(tagNo)).add(subtree); } - for (Iterator it = subtreesMap.entrySet().iterator(); it.hasNext();) + for (Object o : subtreesMap.entrySet()) { - Map.Entry entry = (Map.Entry)it.next(); + Map.Entry entry = (Map.Entry)o; // go through all subtree groups int nameType = ((Integer)entry.getKey()).intValue(); @@ -441,10 +441,9 @@ private void checkExcludedDN(Set excluded, ASN1Sequence dns) private Set intersectDN(Set permitted, Set dns) { Set intersect = new HashSet(); - for (Iterator it = dns.iterator(); it.hasNext();) + for (Object object : dns) { - ASN1Sequence dn = ASN1Sequence.getInstance(((GeneralSubtree)it - .next()).getBase().getName().toASN1Primitive()); + ASN1Sequence dn = ASN1Sequence.getInstance(((GeneralSubtree)object).getBase().getName().toASN1Primitive()); if (permitted == null) { if (dn != null) @@ -535,9 +534,9 @@ private Set unionOtherName(Set permitted, OtherName otherName) private Set intersectEmail(Set permitted, Set emails) { Set intersect = new HashSet(); - for (Iterator it = emails.iterator(); it.hasNext();) + for (Object object : emails) { - String email = extractNameAsString(((GeneralSubtree)it.next()) + String email = extractNameAsString(((GeneralSubtree)object) .getBase()); if (permitted == null) @@ -601,10 +600,9 @@ private Set unionEmail(Set excluded, String email) private Set intersectIP(Set permitted, Set ips) { Set intersect = new HashSet(); - for (Iterator it = ips.iterator(); it.hasNext();) + for (Object object : ips) { - byte[] ip = ASN1OctetString.getInstance( - ((GeneralSubtree)it.next()).getBase().getName()).getOctets(); + byte[] ip = ASN1OctetString.getInstance(((GeneralSubtree)object).getBase().getName()).getOctets(); if (permitted == null) { if (ip != null) @@ -1415,9 +1413,9 @@ else if (email2.startsWith(".")) private Set intersectDNS(Set permitted, Set dnss) { Set intersect = new HashSet(); - for (Iterator it = dnss.iterator(); it.hasNext();) + for (Object object : dnss) { - String dns = extractNameAsString(((GeneralSubtree)it.next()) + String dns = extractNameAsString(((GeneralSubtree)object) .getBase()); if (permitted == null) { @@ -1614,9 +1612,9 @@ private void checkExcludedURI(Set excluded, String uri) private Set intersectURI(Set permitted, Set uris) { Set intersect = new HashSet(); - for (Iterator it = uris.iterator(); it.hasNext();) + for (Object object : uris) { - String uri = extractNameAsString(((GeneralSubtree)it.next()) + String uri = extractNameAsString(((GeneralSubtree)object) .getBase()); if (permitted == null) { @@ -2037,13 +2035,13 @@ private String stringifyIPCollection(Set ips) { StringBuilder temp = new StringBuilder(); temp.append("["); - for (Iterator it = ips.iterator(); it.hasNext();) + for (Object ip : ips) { if (temp.length() > 1) { temp.append(","); } - temp.append(stringifyIP((byte[])it.next())); + temp.append(stringifyIP((byte[])ip)); } temp.append("]"); return temp.toString(); @@ -2053,13 +2051,13 @@ private String stringifyOtherNameCollection(Set otherNames) { StringBuilder temp = new StringBuilder(); temp.append("["); - for (Iterator it = otherNames.iterator(); it.hasNext();) + for (Object otherName : otherNames) { if (temp.length() > 1) { temp.append(","); } - OtherName name = OtherName.getInstance(it.next()); + OtherName name = OtherName.getInstance(otherName); temp.append(name.getTypeID().getId()); temp.append(":"); try diff --git a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CertPathValidatorUtilities.java b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CertPathValidatorUtilities.java index 5e430683f9..509884b84d 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CertPathValidatorUtilities.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CertPathValidatorUtilities.java @@ -300,9 +300,9 @@ protected static boolean processCertD1i( { List policyNodeVec = policyNodes[index - 1]; - for (int j = 0; j < policyNodeVec.size(); j++) + for (Object o : policyNodeVec) { - PKIXPolicyNode node = (PKIXPolicyNode)policyNodeVec.get(j); + PKIXPolicyNode node = (PKIXPolicyNode)o; Set expectedPolicies = node.getExpectedPolicies(); if (expectedPolicies.contains(pOid.getId())) @@ -335,9 +335,9 @@ protected static void processCertD1ii( { List policyNodeVec = policyNodes[index - 1]; - for (int j = 0; j < policyNodeVec.size(); j++) + for (Object o : policyNodeVec) { - PKIXPolicyNode _node = (PKIXPolicyNode)policyNodeVec.get(j); + PKIXPolicyNode _node = (PKIXPolicyNode)o; if (ANY_POLICY.equals(_node.getValidPolicy())) { @@ -465,9 +465,9 @@ protected static PKIXPolicyNode prepareNextCertB2( for (int k = (i - 1); k >= 0; k--) { List nodes = policyNodes[k]; - for (int l = 0; l < nodes.size(); l++) + for (Object o : nodes) { - PKIXPolicyNode node2 = (PKIXPolicyNode)nodes.get(l); + PKIXPolicyNode node2 = (PKIXPolicyNode)o; if (!node2.hasChildren()) { validPolicyTree = removePolicyNode(validPolicyTree, policyNodes, node2); diff --git a/pkix/src/main/java/org/bouncycastle/tsp/ers/BinaryTreeRootCalculator.java b/pkix/src/main/java/org/bouncycastle/tsp/ers/BinaryTreeRootCalculator.java index fd2634d4f7..fb91dd0eb1 100644 --- a/pkix/src/main/java/org/bouncycastle/tsp/ers/BinaryTreeRootCalculator.java +++ b/pkix/src/main/java/org/bouncycastle/tsp/ers/BinaryTreeRootCalculator.java @@ -19,9 +19,9 @@ public class BinaryTreeRootCalculator public byte[] computeRootHash(DigestCalculator digCalc, PartialHashtree[] nodes) { SortedHashList hashes = new SortedHashList(); - for (int i = 0; i < nodes.length; i++) + for (PartialHashtree node : nodes) { - byte[] left = ERSUtil.computeNodeHash(digCalc, nodes[i]); + byte[] left = ERSUtil.computeNodeHash(digCalc, node); hashes.add(left); } diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java index b2aeea711c..44deefba13 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java @@ -1849,10 +1849,8 @@ public void testForMultipleCounterSignatures() { CMSSignedData sd = new CMSSignedData(xtraCounterSig); - for (Iterator sI = sd.getSignerInfos().getSigners().iterator(); sI.hasNext();) + for (SignerInformation sigI : sd.getSignerInfos().getSigners()) { - SignerInformation sigI = (SignerInformation)sI.next(); - SignerInformationStore counter = sigI.getCounterSignatures(); List sigs = new ArrayList(counter.getSigners()); diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bcfks/BcFKSKeyStoreSpi.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bcfks/BcFKSKeyStoreSpi.java index 3a30a5549b..3561c713e8 100644 --- a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bcfks/BcFKSKeyStoreSpi.java +++ b/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bcfks/BcFKSKeyStoreSpi.java @@ -696,9 +696,8 @@ public String engineGetCertificateAlias(Certificate certificate) return null; } - for (Iterator it = entries.keySet().iterator(); it.hasNext(); ) + for (String alias : entries.keySet()) { - String alias = (String)it.next(); ObjectData ent = (ObjectData)entries.get(alias); if (ent.getType().equals(CERTIFICATE)) diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java index 15d26740d6..e41d5de340 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java @@ -547,9 +547,8 @@ public void addAttributes(String key, Map attributeMap) { put(key + " ImplementedIn", "Software"); - for (Iterator it = attributeMap.keySet().iterator(); it.hasNext();) + for (String attributeName : attributeMap.keySet()) { - String attributeName = (String)it.next(); String attributeKey = key + " " + attributeName; if (containsKey(attributeKey)) { diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java b/prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java index 951e12be40..f4930ee572 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java @@ -458,9 +458,9 @@ static PKIXPolicyNode removePolicyNode(PKIXPolicyNode validPolicyTree, List[] po PKIXPolicyNode parent = (PKIXPolicyNode)node.getParent(); if (parent == null) { - for (int j = 0; j < policyNodes.length; j++) + for (List policyNode : policyNodes) { - policyNodes[j].clear(); + policyNode.clear(); } return null; @@ -498,9 +498,9 @@ protected static boolean processCertD1i( { List policyNodeVec = policyNodes[index - 1]; - for (int j = 0; j < policyNodeVec.size(); j++) + for (Object o : policyNodeVec) { - PKIXPolicyNode node = (PKIXPolicyNode)policyNodeVec.get(j); + PKIXPolicyNode node = (PKIXPolicyNode)o; Set expectedPolicies = node.getExpectedPolicies(); if (expectedPolicies.contains(pOid.getId())) @@ -617,17 +617,17 @@ static List getAdditionalStoresFromCRLDistributionPoint( List stores = new ArrayList(); - for (int i = 0; i < dps.length; i++) + for (DistributionPoint dp : dps) { - DistributionPointName dpn = dps[i].getDistributionPoint(); + DistributionPointName dpn = dp.getDistributionPoint(); // look for URIs in fullName if (dpn != null && dpn.getType() == DistributionPointName.FULL_NAME) { GeneralName[] genNames = GeneralNames.getInstance(dpn.getName()).getNames(); - for (int j = 0; j < genNames.length; j++) + for (GeneralName genName : genNames) { - PKIXCRLStore store = namedCRLStoreMap.get(genNames[j]); + PKIXCRLStore store = namedCRLStoreMap.get(genName); if (store != null) { stores.add(store); @@ -649,17 +649,16 @@ static List getAdditionalStoresFromCRLDistributionPoint( throw new AnnotatedException("cannot create certificate factory: " + e.getMessage(), e); } - for (int i = 0; i < dps.length; i++) + for (DistributionPoint dp : dps) { - DistributionPointName dpn = dps[i].getDistributionPoint(); + DistributionPointName dpn = dp.getDistributionPoint(); // look for URIs in fullName if (dpn != null && dpn.getType() == DistributionPointName.FULL_NAME) { GeneralName[] genNames = GeneralNames.getInstance(dpn.getName()).getNames(); - for (int j = 0; j < genNames.length; j++) + for (GeneralName name : genNames) { - GeneralName name = genNames[j]; if (name.getTagNo() == GeneralName.uniformResourceIdentifier) { try @@ -713,13 +712,13 @@ protected static void getCRLIssuersFromDistributionPoint( { GeneralName genNames[] = dp.getCRLIssuer().getNames(); // look for a DN - for (int j = 0; j < genNames.length; j++) + for (GeneralName genName : genNames) { - if (genNames[j].getTagNo() == GeneralName.directoryName) + if (genName.getTagNo() == GeneralName.directoryName) { try { - issuers.add(X500Name.getInstance(genNames[j].getName().toASN1Primitive().getEncoded())); + issuers.add(X500Name.getInstance(genName.getName().toASN1Primitive().getEncoded())); } catch (IOException e) { @@ -741,9 +740,9 @@ protected static void getCRLIssuersFromDistributionPoint( "CRL issuer is omitted from distribution point but no distributionPoint field present."); } // add and check issuer principals - for (Iterator it = issuerPrincipals.iterator(); it.hasNext(); ) + for (Object issuerPrincipal : issuerPrincipals) { - issuers.add(it.next()); + issuers.add(issuerPrincipal); } } // TODO: is not found although this should correctly add the rel name. selector of Sun is buggy here or PKI test case is invalid @@ -989,17 +988,16 @@ protected static Set getDeltaCRLs(Date validityDate, CRLDistPoint id = CRLDistPoint.getInstance(idp); DistributionPoint[] dps = id.getDistributionPoints(); - for (int i = 0; i < dps.length; i++) + for (DistributionPoint dp : dps) { - DistributionPointName dpn = dps[i].getDistributionPoint(); + DistributionPointName dpn = dp.getDistributionPoint(); // look for URIs in fullName if (dpn != null && dpn.getType() == DistributionPointName.FULL_NAME) { GeneralName[] genNames = GeneralNames.getInstance(dpn.getName()).getNames(); - for (int j = 0; j < genNames.length; j++) + for (GeneralName name : genNames) { - GeneralName name = genNames[j]; if (name.getTagNo() == GeneralName.uniformResourceIdentifier) { try @@ -1031,9 +1029,9 @@ private static Set getDeltaCRLs(Set crls) { Set result = new HashSet(); - for (Iterator it = crls.iterator(); it.hasNext(); ) + for (Object o : crls) { - X509CRL crl = (X509CRL)it.next(); + X509CRL crl = (X509CRL)o; if (isDeltaCRL(crl)) { diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java b/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java index 17fe0229d5..8967620468 100644 --- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java +++ b/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java @@ -151,9 +151,8 @@ public AsymmetricKeyInfoConverter getKeyInfoConverter(ASN1ObjectIdentifier oid) public void addAttributes(String key, Map attributeMap) { - for (Iterator it = attributeMap.keySet().iterator(); it.hasNext(); ) + for (String attributeName : attributeMap.keySet()) { - String attributeName = (String)it.next(); String attributeKey = key + " " + attributeName; if (containsKey(attributeKey)) { diff --git a/tls/src/main/java/org/bouncycastle/tls/AbstractTlsClient.java b/tls/src/main/java/org/bouncycastle/tls/AbstractTlsClient.java index 446eec9898..fd1e4558e9 100644 --- a/tls/src/main/java/org/bouncycastle/tls/AbstractTlsClient.java +++ b/tls/src/main/java/org/bouncycastle/tls/AbstractTlsClient.java @@ -259,9 +259,8 @@ public Hashtable getClientExtensions() boolean offeringDTLSv12 = false; { ProtocolVersion[] supportedVersions = getProtocolVersions(); - for (int i = 0; i < supportedVersions.length; ++i) + for (ProtocolVersion supportedVersion : supportedVersions) { - ProtocolVersion supportedVersion = supportedVersions[i]; if (TlsUtils.isTLSv13(supportedVersion)) { offeringTLSv13Plus = true; diff --git a/tls/src/main/java/org/bouncycastle/tls/AbstractTlsServer.java b/tls/src/main/java/org/bouncycastle/tls/AbstractTlsServer.java index e04ffa5179..e0eb0bbb46 100644 --- a/tls/src/main/java/org/bouncycastle/tls/AbstractTlsServer.java +++ b/tls/src/main/java/org/bouncycastle/tls/AbstractTlsServer.java @@ -94,9 +94,9 @@ protected int getMaximumNegotiableCurveBits() int[] clientSupportedGroups = context.getSecurityParametersHandshake().getClientSupportedGroups(); if (clientSupportedGroups != null) { - for (int i = 0; i < clientSupportedGroups.length; ++i) + for (int clientSupportedGroup : clientSupportedGroups) { - maxBits = Math.max(maxBits, NamedGroup.getCurveBits(clientSupportedGroups[i])); + maxBits = Math.max(maxBits, NamedGroup.getCurveBits(clientSupportedGroup)); } } else @@ -118,10 +118,10 @@ protected int getMaximumNegotiableFiniteFieldBits() int[] clientSupportedGroups = context.getSecurityParametersHandshake().getClientSupportedGroups(); if (clientSupportedGroups != null) { - for (int i = 0; i < clientSupportedGroups.length; ++i) + for (int clientSupportedGroup : clientSupportedGroups) { - anyPeerFF |= NamedGroup.isFiniteField(clientSupportedGroups[i]); - maxBits = Math.max(maxBits, NamedGroup.getFiniteFieldBits(clientSupportedGroups[i])); + anyPeerFF |= NamedGroup.isFiniteField(clientSupportedGroup); + maxBits = Math.max(maxBits, NamedGroup.getFiniteFieldBits(clientSupportedGroup)); } } if (!anyPeerFF) @@ -173,9 +173,8 @@ protected int selectDH(int minimumFiniteFieldBits) if (clientSupportedGroups != null) { // Try to find a supported named group of the required size from the client's list. - for (int i = 0; i < clientSupportedGroups.length; ++i) + for (int namedGroup : clientSupportedGroups) { - int namedGroup = clientSupportedGroups[i]; anyPeerFF |= NamedGroup.isFiniteField(namedGroup); if (NamedGroup.getFiniteFieldBits(namedGroup) >= minimumFiniteFieldBits) @@ -221,9 +220,8 @@ protected int selectECDH(int minimumCurveBits) } // Try to find a supported named group of the required size from the client's list. - for (int i = 0; i < clientSupportedGroups.length; ++i) + for (int namedGroup : clientSupportedGroups) { - int namedGroup = clientSupportedGroups[i]; if (NamedGroup.getCurveBits(namedGroup) >= minimumCurveBits) { // This default server implementation supports all NamedGroup curves @@ -443,9 +441,8 @@ public ProtocolVersion getServerVersion() ProtocolVersion[] serverVersions = getProtocolVersions(); ProtocolVersion[] clientVersions = context.getClientSupportedVersions(); - for (int i = 0; i < clientVersions.length; ++i) + for (ProtocolVersion clientVersion : clientVersions) { - ProtocolVersion clientVersion = clientVersions[i]; if (ProtocolVersion.contains(serverVersions, clientVersion)) { return clientVersion; @@ -501,9 +498,8 @@ public int getSelectedCipherSuite() int[] cipherSuites = TlsUtils.getCommonCipherSuites(offeredCipherSuites, getCipherSuites(), preferLocalCipherSuites()); - for (int i = 0; i < cipherSuites.length; ++i) + for (int cipherSuite : cipherSuites) { - int cipherSuite = cipherSuites[i]; if (isSelectableCipherSuite(cipherSuite, availCurveBits, availFiniteFieldBits, sigAlgs) && selectCipherSuite(cipherSuite)) { @@ -644,9 +640,8 @@ else if (null != this.certificateStatusRequest && allowCertificateStatus()) } short selectedType = -1; - for (int i = 0; i < preferredTypes.length; i++) + for (short preferredType : preferredTypes) { - short preferredType = preferredTypes[i]; if (CertificateType.OpenPGP == preferredType && isTLSv13) { continue; diff --git a/tls/src/test/java/org/bouncycastle/jsse/provider/test/BasicClientAuthTlsTest.java b/tls/src/test/java/org/bouncycastle/jsse/provider/test/BasicClientAuthTlsTest.java index 017138757f..5bdfee441e 100644 --- a/tls/src/test/java/org/bouncycastle/jsse/provider/test/BasicClientAuthTlsTest.java +++ b/tls/src/test/java/org/bouncycastle/jsse/provider/test/BasicClientAuthTlsTest.java @@ -181,9 +181,9 @@ public X509Certificate[] getCertificateChain(String alias) } if (chain instanceof X509Certificate[]) { - for (int i = 0; i < chain.length; ++i) + for (java.security.cert.Certificate certificate : chain) { - if (null == chain[i]) + if (null == certificate) { return null; }