From c30f2bb6ba016f1a0c3657dd3175ed053f1410a8 Mon Sep 17 00:00:00 2001 From: Winfried Gerlach Date: Mon, 16 Jun 2025 23:31:49 +0200 Subject: [PATCH] Use enhanced for instead of while loops --- .../x509/PKIXNameConstraintValidator.java | 138 +++++++----------- .../math/ec/tools/DiscoverEndomorphisms.java | 5 +- .../math/ec/tools/F2mSqrtOptimizer.java | 5 +- .../math/ec/tools/TraceOptimizer.java | 5 +- .../bouncycastle/util/CollectionStore.java | 5 +- .../math/ec/test/ECAlgorithmsTest.java | 15 +- .../math/ec/test/ECPointPerformanceTest.java | 5 +- .../math/ec/test/ECPointTest.java | 6 +- .../bouncycastle/math/ec/test/F2mProofer.java | 5 +- .../math/ec/test/FixedPointTest.java | 5 +- .../mail/smime/SMIMESignedGenerator.java | 5 +- .../bouncycastle/mail/smime/SMIMEToolkit.java | 5 +- .../smime/examples/ReadLargeSignedMail.java | 5 +- .../mail/smime/examples/ReadSignedMail.java | 5 +- .../smime/examples/ValidateSignedMail.java | 44 ++---- .../smime/validator/SignedMailValidator.java | 15 +- .../mail/smime/test/MailGeneralTest.java | 5 +- .../mail/smime/test/NewSMIMESignedTest.java | 12 +- .../mail/smime/test/SMIMECompressedTest.java | 5 +- .../mail/smime/test/SMIMEMiscTest.java | 7 +- .../org/bouncycastle/cms/CMSSignedData.java | 9 +- .../bouncycastle/cms/CMSSignedDataParser.java | 7 +- .../cms/CMSSignedDataStreamGenerator.java | 5 +- .../bouncycastle/cms/CMSSignedGenerator.java | 5 +- .../java/org/bouncycastle/cms/CMSUtils.java | 15 +- .../cms/RecipientInformationStore.java | 5 +- .../cms/SignerInformationStore.java | 7 +- .../pkix/ASN1PKIXNameConstraintValidator.java | 133 ++++++----------- .../jcajce/CertPathValidatorUtilities.java | 15 +- .../bouncycastle/pkix/jcajce/CrlCache.java | 5 +- .../bouncycastle/pkix/jcajce/PKIXCRLUtil.java | 4 +- .../pkix/jcajce/PKIXCertPathReviewer.java | 31 ++-- .../pkix/jcajce/RFC3280CertPathUtilities.java | 5 +- .../pkix/jcajce/RevocationUtilities.java | 5 +- .../pkix/jcajce/X509RevocationChecker.java | 5 +- .../bouncycastle/cert/test/BcCertTest.java | 10 +- .../org/bouncycastle/cert/test/CertTest.java | 10 +- .../cms/test/AnnotatedKeyTest.java | 6 +- .../cms/test/BcEnvelopedDataTest.java | 18 +-- .../cms/test/BcSignedDataTest.java | 37 ++--- ...SAuthEnvelopedDataStreamGeneratorTest.java | 18 +-- .../cms/test/MiscDataStreamTest.java | 5 +- .../test/NewAuthEnvelopedDataStreamTest.java | 31 +--- .../test/NewAuthenticatedDataStreamTest.java | 18 +-- .../cms/test/NewAuthenticatedDataTest.java | 36 ++--- .../cms/test/NewEnvelopedDataStreamTest.java | 31 ++-- .../cms/test/NewEnvelopedDataTest.java | 136 ++++++----------- .../cms/test/NewSignedDataStreamTest.java | 17 +-- .../cms/test/NewSignedDataTest.java | 68 ++++----- .../cms/test/NullProviderTest.java | 16 +- .../cms/test/PQCSignedDataTest.java | 15 +- .../bouncycastle/cms/test/Rfc4134Test.java | 10 +- .../cms/test/SunProviderTest.java | 16 +- .../mime/test/MultipartParserTest.java | 20 +-- .../provider/asymmetric/x509/X509CRLImpl.java | 5 +- .../provider/symmetric/util/BaseMac.java | 4 +- .../jcajce/spec/SkeinParameterSpec.java | 5 +- .../provider/CertPathValidatorUtilities.java | 4 +- .../bouncycastle/jce/provider/CrlCache.java | 5 +- .../provider/PKIXAttrCertPathBuilderSpi.java | 4 +- .../jce/provider/PKIXCRLUtil.java | 4 +- .../provider/PKIXCertPathValidatorSpi_8.java | 5 +- .../provider/RFC3280CertPathUtilities.java | 20 +-- .../jce/provider/X509CRLObject.java | 5 +- .../jce/provider/X509StoreLDAPCerts.java | 5 +- .../x509/CertPathValidatorUtilities.java | 20 +-- .../x509/ExtendedPKIXParameters.java | 5 +- .../org/bouncycastle/x509/PKIXCRLUtil.java | 4 +- .../x509/PKIXCertPathReviewer.java | 31 ++-- .../bouncycastle/x509/X509V2CRLGenerator.java | 5 +- .../x509/util/LDAPStoreHelper.java | 10 +- .../jce/provider/test/CRL5Test.java | 10 +- 72 files changed, 438 insertions(+), 789 deletions(-) diff --git a/core/src/main/java/org/bouncycastle/asn1/x509/PKIXNameConstraintValidator.java b/core/src/main/java/org/bouncycastle/asn1/x509/PKIXNameConstraintValidator.java index b918f9800e..ef6e8ad197 100644 --- a/core/src/main/java/org/bouncycastle/asn1/x509/PKIXNameConstraintValidator.java +++ b/core/src/main/java/org/bouncycastle/asn1/x509/PKIXNameConstraintValidator.java @@ -386,11 +386,10 @@ private void checkPermittedDN(Set permitted, ASN1Sequence dns) { return; } - Iterator it = permitted.iterator(); - while (it.hasNext()) + for (Object o : permitted) { - ASN1Sequence subtree = (ASN1Sequence)it.next(); + ASN1Sequence subtree = (ASN1Sequence)o; if (withinDNSubtree(dns, subtree)) { @@ -410,11 +409,9 @@ private void checkExcludedDN(Set excluded, ASN1Sequence dns) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - ASN1Sequence subtree = (ASN1Sequence)it.next(); + ASN1Sequence subtree = (ASN1Sequence)o; if (withinDNSubtree(dns, subtree)) { @@ -440,10 +437,9 @@ private Set intersectDN(Set permitted, Set dns) } else { - Iterator _iter = permitted.iterator(); - while (_iter.hasNext()) + for (Object o : permitted) { - ASN1Sequence subtree = (ASN1Sequence)_iter.next(); + ASN1Sequence subtree = (ASN1Sequence)o; if (withinDNSubtree(dn, subtree)) { @@ -475,10 +471,9 @@ private Set unionDN(Set excluded, ASN1Sequence dn) { Set intersect = new HashSet(); - Iterator it = excluded.iterator(); - while (it.hasNext()) + for (Object o : excluded) { - ASN1Sequence subtree = ASN1Sequence.getInstance(it.next()); + ASN1Sequence subtree = ASN1Sequence.getInstance(o); if (withinDNSubtree(dn, subtree)) { @@ -515,10 +510,9 @@ private Set intersectOtherName(Set permitted, Set otherNames) } else { - Iterator it2 = permitted.iterator(); - while (it2.hasNext()) + for (Object o : permitted) { - OtherName otName2 = OtherName.getInstance(it2.next()); + OtherName otName2 = OtherName.getInstance(o); intersectOtherName(otName1, otName2, intersect); } @@ -561,10 +555,9 @@ private Set intersectEmail(Set permitted, Set emails) } else { - Iterator it2 = permitted.iterator(); - while (it2.hasNext()) + for (Object o : permitted) { - String _permitted = (String)it2.next(); + String _permitted = (String)o; intersectEmail(email, _permitted, intersect); } @@ -588,10 +581,9 @@ private Set unionEmail(Set excluded, String email) { Set union = new HashSet(); - Iterator it = excluded.iterator(); - while (it.hasNext()) + for (Object o : excluded) { - String _excluded = (String)it.next(); + String _excluded = (String)o; unionEmail(_excluded, email, union); } @@ -626,10 +618,9 @@ private Set intersectIP(Set permitted, Set ips) } else { - Iterator it2 = permitted.iterator(); - while (it2.hasNext()) + for (Object o : permitted) { - byte[] _permitted = (byte[])it2.next(); + byte[] _permitted = (byte[])o; intersect.addAll(intersectIPRange(_permitted, ip)); } } @@ -663,10 +654,9 @@ private Set unionIP(Set excluded, byte[] ip) { Set union = new HashSet(); - Iterator it = excluded.iterator(); - while (it.hasNext()) + for (Object o : excluded) { - byte[] _excluded = (byte[])it.next(); + byte[] _excluded = (byte[])o; union.addAll(unionIPRange(_excluded, ip)); } @@ -823,11 +813,9 @@ private void checkPermittedEmail(Set permitted, String email) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - String str = ((String)it.next()); + String str = (String)o; if (emailIsConstrained(email, str)) { @@ -852,11 +840,9 @@ private void checkPermittedOtherName(Set permitted, OtherName name) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - OtherName str = OtherName.getInstance(it.next()); + OtherName str = OtherName.getInstance(o); if (otherNameIsConstrained(name, str)) { @@ -876,11 +862,9 @@ private void checkExcludedOtherName(Set excluded, OtherName name) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - OtherName str = OtherName.getInstance(it.next()); + OtherName str = OtherName.getInstance(o); if (otherNameIsConstrained(name, str)) { @@ -898,11 +882,9 @@ private void checkExcludedEmail(Set excluded, String email) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - String str = (String)it.next(); + String str = (String)o; if (emailIsConstrained(email, str)) { @@ -929,11 +911,9 @@ private void checkPermittedIP(Set permitted, byte[] ip) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - byte[] ipWithSubnet = (byte[])it.next(); + byte[] ipWithSubnet = (byte[])o; if (isIPConstrained(ip, ipWithSubnet)) { @@ -965,11 +945,9 @@ private void checkExcludedIP(Set excluded, byte[] ip) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - byte[] ipWithSubnet = (byte[])it.next(); + byte[] ipWithSubnet = (byte[])o; if (isIPConstrained(ip, ipWithSubnet)) { @@ -1096,11 +1074,9 @@ private void checkPermittedDNS(Set permitted, String dns) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - String str = ((String)it.next()); + String str = (String)o; // is sub domain if (withinDomain(dns, str) || dns.equalsIgnoreCase(str)) @@ -1124,11 +1100,9 @@ private void checkExcludedDNS(Set excluded, String dns) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - String str = ((String)it.next()); + String str = (String)o; // is sub domain or the same if (withinDomain(dns, str) || dns.equalsIgnoreCase(str)) @@ -1440,10 +1414,9 @@ private Set intersectDNS(Set permitted, Set dnss) } else { - Iterator _iter = permitted.iterator(); - while (_iter.hasNext()) + for (Object o : permitted) { - String _permitted = (String)_iter.next(); + String _permitted = (String)o; if (withinDomain(_permitted, dns)) { @@ -1476,10 +1449,9 @@ private Set unionDNS(Set excluded, String dns) { Set union = new HashSet(); - Iterator _iter = excluded.iterator(); - while (_iter.hasNext()) + for (Object o : excluded) { - String _permitted = (String)_iter.next(); + String _permitted = (String)o; if (withinDomain(_permitted, dns)) { @@ -1609,11 +1581,9 @@ private void checkExcludedURI(Set excluded, String uri) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - String str = ((String)it.next()); + String str = (String)o; if (isUriConstrained(uri, str)) { @@ -1639,10 +1609,9 @@ private Set intersectURI(Set permitted, Set uris) } else { - Iterator _iter = permitted.iterator(); - while (_iter.hasNext()) + for (Object o : permitted) { - String _permitted = (String)_iter.next(); + String _permitted = (String)o; intersectURI(_permitted, uri, intersect); } } @@ -1666,10 +1635,9 @@ private Set unionURI(Set excluded, String uri) { Set union = new HashSet(); - Iterator _iter = excluded.iterator(); - while (_iter.hasNext()) + for (Object o : excluded) { - String _excluded = (String)_iter.next(); + String _excluded = (String)o; unionURI(_excluded, uri, union); } @@ -1779,11 +1747,9 @@ private void checkPermittedURI(Set permitted, String uri) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - String str = ((String)it.next()); + String str = (String)o; if (isUriConstrained(uri, str)) { @@ -1935,10 +1901,8 @@ private int hashCollection(Collection coll) return 0; } int hash = 0; - Iterator it1 = coll.iterator(); - while (it1.hasNext()) + for (Object o : coll) { - Object o = it1.next(); if (o instanceof byte[]) { hash += Arrays.hashCode((byte[])o); @@ -1965,16 +1929,12 @@ private boolean collectionsAreEqual(Collection coll1, Collection coll2) { return false; } - Iterator it1 = coll1.iterator(); - while (it1.hasNext()) + for (Object a : coll1) { - Object a = it1.next(); - Iterator it2 = coll2.iterator(); boolean found = false; - while (it2.hasNext()) + for (Object b : coll2) { - Object b = it2.next(); if (equals(a, b)) { found = true; diff --git a/core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java b/core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java index f77a1a37b1..29cf8c2253 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java +++ b/core/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java @@ -37,10 +37,9 @@ public static void main(String[] args) SortedSet curveNames = new TreeSet(enumToList(ECNamedCurveTable.getNames())); curveNames.addAll(enumToList(CustomNamedCurves.getNames())); - Iterator it = curveNames.iterator(); - while (it.hasNext()) + for (Object curveName : curveNames) { - discoverEndomorphisms((String)it.next()); + discoverEndomorphisms((String)curveName); } } } diff --git a/core/src/main/java/org/bouncycastle/math/ec/tools/F2mSqrtOptimizer.java b/core/src/main/java/org/bouncycastle/math/ec/tools/F2mSqrtOptimizer.java index a76081b50d..35479b5d0a 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/tools/F2mSqrtOptimizer.java +++ b/core/src/main/java/org/bouncycastle/math/ec/tools/F2mSqrtOptimizer.java @@ -23,10 +23,9 @@ public static void main(String[] args) SortedSet names = new TreeSet(enumToList(ECNamedCurveTable.getNames())); names.addAll(enumToList(CustomNamedCurves.getNames())); - Iterator it = names.iterator(); - while (it.hasNext()) + for (Object o : names) { - String name = (String)it.next(); + String name = (String)o; X9ECParametersHolder x9 = CustomNamedCurves.getByNameLazy(name); if (x9 == null) { diff --git a/core/src/main/java/org/bouncycastle/math/ec/tools/TraceOptimizer.java b/core/src/main/java/org/bouncycastle/math/ec/tools/TraceOptimizer.java index 88faf36aee..25ddc5fcfc 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/tools/TraceOptimizer.java +++ b/core/src/main/java/org/bouncycastle/math/ec/tools/TraceOptimizer.java @@ -28,10 +28,9 @@ public static void main(String[] args) SortedSet names = new TreeSet(enumToList(ECNamedCurveTable.getNames())); names.addAll(enumToList(CustomNamedCurves.getNames())); - Iterator it = names.iterator(); - while (it.hasNext()) + for (Object o : names) { - String name = (String)it.next(); + String name = (String)o; X9ECParametersHolder x9 = CustomNamedCurves.getByNameLazy(name); if (x9 == null) { diff --git a/core/src/main/java/org/bouncycastle/util/CollectionStore.java b/core/src/main/java/org/bouncycastle/util/CollectionStore.java index 1cc9641af7..c03081bcd4 100644 --- a/core/src/main/java/org/bouncycastle/util/CollectionStore.java +++ b/core/src/main/java/org/bouncycastle/util/CollectionStore.java @@ -39,12 +39,9 @@ public Collection getMatches(Selector selector) else { List col = new ArrayList(); - Iterator iter = _local.iterator(); - while (iter.hasNext()) + for (T obj : _local) { - T obj = iter.next(); - if (selector.match(obj)) { col.add(obj); diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java b/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java index 3cd053206a..a2052e1932 100644 --- a/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java +++ b/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java @@ -35,10 +35,9 @@ public void testSumOfMultiplies() public void testSumOfMultipliesComplete() { List x9s = getTestCurves(); - Iterator it = x9s.iterator(); - while (it.hasNext()) + for (Object o : x9s) { - X9ECParameters x9 = (X9ECParameters)it.next(); + X9ECParameters x9 = (X9ECParameters)o; doTestSumOfMultiplies(x9); } } @@ -54,10 +53,9 @@ public void testSumOfTwoMultiplies() public void testSumOfTwoMultipliesComplete() { List x9s = getTestCurves(); - Iterator it = x9s.iterator(); - while (it.hasNext()) + for (Object o : x9s) { - X9ECParameters x9 = (X9ECParameters)it.next(); + X9ECParameters x9 = (X9ECParameters)o; doTestSumOfTwoMultiplies(x9); } } @@ -146,10 +144,9 @@ private List getTestCurves() Set names = new HashSet(AllTests.enumToList(ECNamedCurveTable.getNames())); names.addAll(AllTests.enumToList(CustomNamedCurves.getNames())); - Iterator it = names.iterator(); - while (it.hasNext()) + for (Object o : names) { - String name = (String)it.next(); + String name = (String)o; X9ECParameters x9 = ECNamedCurveTable.getByName(name); if (x9 != null) diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java b/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java index 9be8d3ea7b..2ce7296e6d 100644 --- a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java +++ b/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java @@ -178,10 +178,9 @@ public void testMultiply() throws Exception Set oids = new HashSet(); - Iterator it = names.iterator(); - while (it.hasNext()) + for (Object o : names) { - String name = (String)it.next(); + String name = (String)o; ASN1ObjectIdentifier oid = ECNamedCurveTable.getOID(name); if (oid == null) { diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointTest.java b/core/src/test/java/org/bouncycastle/math/ec/test/ECPointTest.java index 68fd639784..791f223004 100644 --- a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointTest.java +++ b/core/src/test/java/org/bouncycastle/math/ec/test/ECPointTest.java @@ -575,10 +575,8 @@ public void testAddSubtractMultiplyTwiceEncoding() Set names = new HashSet(enumToList(ECNamedCurveTable.getNames())); names.addAll(enumToList(CustomNamedCurves.getNames())); - Iterator it = names.iterator(); - while (it.hasNext()) - { - String name = (String)it.next(); + for (Object o : names) { + String name = (String)o; X9ECParameters x9A = ECNamedCurveTable.getByName(name); X9ECParameters x9B = CustomNamedCurves.getByName(name); diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/F2mProofer.java b/core/src/test/java/org/bouncycastle/math/ec/test/F2mProofer.java index b687520337..6aea59bb82 100644 --- a/core/src/test/java/org/bouncycastle/math/ec/test/F2mProofer.java +++ b/core/src/test/java/org/bouncycastle/math/ec/test/F2mProofer.java @@ -118,10 +118,9 @@ private void compareResult(X9ECParameters x9ECParameters, Properties res2 = loadResults(classPrefix2, m); Set keys = res1.keySet(); - Iterator iter = keys.iterator(); - while (iter.hasNext()) + for (Object o : keys) { - String key = (String) iter.next(); + String key = (String)o; String result1 = res1.getProperty(key); String result2 = res2.getProperty(key); if (!(result1.equals(result2))) diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/FixedPointTest.java b/core/src/test/java/org/bouncycastle/math/ec/test/FixedPointTest.java index 08d4c087ac..790310eedb 100644 --- a/core/src/test/java/org/bouncycastle/math/ec/test/FixedPointTest.java +++ b/core/src/test/java/org/bouncycastle/math/ec/test/FixedPointTest.java @@ -34,10 +34,9 @@ public void testFixedPointMultiplier() Set names = new HashSet(enumToList(ECNamedCurveTable.getNames())); names.addAll(enumToList(CustomNamedCurves.getNames())); - Iterator it = names.iterator(); - while (it.hasNext()) + for (Object o : names) { - String name = (String)it.next(); + String name = (String)o; X9ECParameters x9A = ECNamedCurveTable.getByName(name); X9ECParameters x9B = CustomNamedCurves.getByName(name); diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedGenerator.java b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedGenerator.java index 3d359848eb..2b0026bbf7 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedGenerator.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMESignedGenerator.java @@ -218,11 +218,10 @@ public SMIMESignedGenerator( public void addSigners( SignerInformationStore signerStore) { - Iterator it = signerStore.getSigners().iterator(); - while (it.hasNext()) + for (SignerInformation signerInformation : signerStore.getSigners()) { - _oldSigners.add(it.next()); + _oldSigners.add(signerInformation); } } diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEToolkit.java b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEToolkit.java index 49016b6d33..de3565c13a 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEToolkit.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/SMIMEToolkit.java @@ -139,11 +139,10 @@ private boolean isAtLeastOneValidSigner(SMIMESignedParser s, SignerInformationVe } Collection c = s.getSignerInfos().getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; if (signer.verify(verifier)) { diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/examples/ReadLargeSignedMail.java b/mail/src/main/java/org/bouncycastle/mail/smime/examples/ReadLargeSignedMail.java index 9107433704..7ff0f3df10 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/examples/ReadLargeSignedMail.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/examples/ReadLargeSignedMail.java @@ -50,14 +50,13 @@ private static void verify( SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); // // check each signer // - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/examples/ReadSignedMail.java b/mail/src/main/java/org/bouncycastle/mail/smime/examples/ReadSignedMail.java index 370106d960..ce56e5b388 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/examples/ReadSignedMail.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/examples/ReadSignedMail.java @@ -51,14 +51,13 @@ private static void verify( SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); // // check each signer // - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/examples/ValidateSignedMail.java b/mail/src/main/java/org/bouncycastle/mail/smime/examples/ValidateSignedMail.java index 79b4b80f2c..9ca41262e5 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/examples/ValidateSignedMail.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/examples/ValidateSignedMail.java @@ -137,11 +137,8 @@ public static void verifySignedMail(MimeMessage msg, PKIXParameters param) SignedMailValidator validator = new SignedMailValidator(msg, param); // iterate over all signatures and print results - Iterator it = validator.getSignerInformationStore().getSigners() - .iterator(); - while (it.hasNext()) + for (SignerInformation signer : validator.getSignerInformationStore().getSigners()) { - SignerInformation signer = (SignerInformation) it.next(); SignedMailValidator.ValidationResult result = validator .getValidationResult(signer); if (result.isValidSignature()) @@ -159,10 +156,8 @@ public static void verifySignedMail(MimeMessage msg, PKIXParameters param) System.out.println(errMsg.getText(loc)); // print errors System.out.println("Errors:"); - Iterator errorsIt = result.getErrors().iterator(); - while (errorsIt.hasNext()) - { - ErrorBundle errorMsg = (ErrorBundle) errorsIt.next(); + for (Object o : result.getErrors()) { + ErrorBundle errorMsg = (ErrorBundle)o; if (dbgLvl == DETAIL) { System.out.println("\t\t" + errorMsg.getDetail(loc)); @@ -176,10 +171,9 @@ public static void verifySignedMail(MimeMessage msg, PKIXParameters param) if (!result.getNotifications().isEmpty()) { System.out.println("Notifications:"); - Iterator notIt = result.getNotifications().iterator(); - while (notIt.hasNext()) + for (Object o : result.getNotifications()) { - ErrorBundle notMsg = (ErrorBundle) notIt.next(); + ErrorBundle notMsg = (ErrorBundle)o; if (dbgLvl == DETAIL) { System.out.println("\t\t" + notMsg.getDetail(loc)); @@ -205,10 +199,9 @@ public static void verifySignedMail(MimeMessage msg, PKIXParameters param) System.out.println("\nCertificate path validation results:"); // global errors System.out.println("Errors:"); - Iterator errorsIt = review.getErrors(-1).iterator(); - while (errorsIt.hasNext()) + for (Object object : review.getErrors(-1)) { - ErrorBundle errorMsg = (ErrorBundle) errorsIt.next(); + ErrorBundle errorMsg = (ErrorBundle)object; if (dbgLvl == DETAIL) { System.out.println("\t\t" + errorMsg.getDetail(loc)); @@ -220,21 +213,17 @@ public static void verifySignedMail(MimeMessage msg, PKIXParameters param) } System.out.println("Notifications:"); - Iterator notificationsIt = review.getNotifications(-1) - .iterator(); - while (notificationsIt.hasNext()) + for (Object o : review.getNotifications(-1)) { - ErrorBundle noteMsg = (ErrorBundle) notificationsIt.next(); + ErrorBundle noteMsg = (ErrorBundle)o; System.out.println("\t" + noteMsg.getText(loc)); } // per certificate errors and notifications - Iterator certIt = review.getCertPath().getCertificates() - .iterator(); int i = 0; - while (certIt.hasNext()) + for (java.security.cert.Certificate certificate : review.getCertPath().getCertificates()) { - X509Certificate cert = (X509Certificate) certIt.next(); + X509Certificate cert = (X509Certificate)certificate; System.out.println("\nCertificate " + i + "\n========"); System.out.println("Issuer: " + cert.getIssuerDN().getName()); @@ -243,10 +232,9 @@ public static void verifySignedMail(MimeMessage msg, PKIXParameters param) // errors System.out.println("\tErrors:"); - errorsIt = review.getErrors(i).iterator(); - while (errorsIt.hasNext()) + for (Object object : review.getErrors(i)) { - ErrorBundle errorMsg = (ErrorBundle) errorsIt.next(); + ErrorBundle errorMsg = (ErrorBundle)object; if (dbgLvl == DETAIL) { System.out @@ -260,11 +248,9 @@ public static void verifySignedMail(MimeMessage msg, PKIXParameters param) // notifications System.out.println("\tNotifications:"); - notificationsIt = review.getNotifications(i).iterator(); - while (notificationsIt.hasNext()) + for (Object o : review.getNotifications(i)) { - ErrorBundle noteMsg = (ErrorBundle) notificationsIt - .next(); + ErrorBundle noteMsg = (ErrorBundle)o; if (dbgLvl == DETAIL) { System.out.println("\t\t" + noteMsg.getDetail(loc)); diff --git a/mail/src/main/java/org/bouncycastle/mail/smime/validator/SignedMailValidator.java b/mail/src/main/java/org/bouncycastle/mail/smime/validator/SignedMailValidator.java index a6c99488de..0bac064426 100644 --- a/mail/src/main/java/org/bouncycastle/mail/smime/validator/SignedMailValidator.java +++ b/mail/src/main/java/org/bouncycastle/mail/smime/validator/SignedMailValidator.java @@ -233,15 +233,14 @@ protected void validateSignatures(PKIXParameters pkixParam) usedParameters.addCertStore(certs); Collection c = signers.getSigners(); - Iterator it = c.iterator(); // check each signer - while (it.hasNext()) + for (Object o : c) { List errors = new ArrayList(); List notifications = new ArrayList(); - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; // signer certificate X509Certificate cert = null; @@ -621,10 +620,9 @@ private static List findCerts(List certStores, X509CertSelector selector) throws CertStoreException { List result = new ArrayList(); - Iterator it = certStores.iterator(); - while (it.hasNext()) + for (Object certStore : certStores) { - CertStore store = (CertStore)it.next(); + CertStore store = (CertStore)certStore; Collection coll = store.getCertificates(selector); // sometimes the subjectKeyIdentifier in a TA certificate, even when the authorityKeyIdentifier is set. // where this happens we role back to a simpler match to make sure we've got all the possibilities. @@ -706,10 +704,9 @@ public static Object[] createCertPath(X509Certificate signerCert, while (cert != null && !trustAnchorFound) { // check if cert Issuer is Trustanchor - Iterator trustIt = trustanchors.iterator(); - while (trustIt.hasNext()) + for (Object trustanchor : trustanchors) { - TrustAnchor anchor = (TrustAnchor)trustIt.next(); + TrustAnchor anchor = (TrustAnchor)trustanchor; X509Certificate anchorCert = anchor.getTrustedCert(); if (anchorCert != null) { diff --git a/mail/src/test/java/org/bouncycastle/mail/smime/test/MailGeneralTest.java b/mail/src/test/java/org/bouncycastle/mail/smime/test/MailGeneralTest.java index 82f853576a..59dc8989cc 100644 --- a/mail/src/test/java/org/bouncycastle/mail/smime/test/MailGeneralTest.java +++ b/mail/src/test/java/org/bouncycastle/mail/smime/test/MailGeneralTest.java @@ -936,11 +936,10 @@ private void verifySigners(Store certs, SignerInformationStore signers) throws Exception { Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java b/mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java index b663f45d16..affaaee85e 100644 --- a/mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java +++ b/mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java @@ -1230,11 +1230,10 @@ public void testDoubleNlCanonical() SMIMESigned s = new SMIMESigned((MimeMultipart)message.getContent()); Collection c = s.getSignerInfos().getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = s.getCertificates().getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -1324,11 +1323,10 @@ private void verifySigners(Store certs, SignerInformationStore signers) throws Exception { Collection c = signers.getSigners(); - Iterator it = c.iterator(); - - while (it.hasNext()) + + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMECompressedTest.java b/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMECompressedTest.java index a8ab88f4b5..21e27f1dbd 100644 --- a/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMECompressedTest.java +++ b/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMECompressedTest.java @@ -215,11 +215,10 @@ public void testCompressedSHA1WithRSA() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMEMiscTest.java b/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMEMiscTest.java index 155b6d3db6..2402f5dcea 100644 --- a/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMEMiscTest.java +++ b/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMEMiscTest.java @@ -290,11 +290,10 @@ private void verifySigners(Store certs, SignerInformationStore signers) throws Exception { Collection c = signers.getSigners(); - Iterator it = c.iterator(); - - while (it.hasNext()) + + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedData.java b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedData.java index 0cc10bada1..b786c44447 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedData.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedData.java @@ -529,10 +529,9 @@ public static CMSSignedData addDigestAlgorithm(CMSSignedData signedData, Algorit // Set digestAlgs = new HashSet(); - Iterator it = digestAlgorithms.iterator(); - while (it.hasNext()) + for (AlgorithmIdentifier algorithm : digestAlgorithms) { - digestAlgs.add(HELPER.fixDigestAlgID((AlgorithmIdentifier)it.next(), digestAlgIdFinder)); + digestAlgs.add(HELPER.fixDigestAlgID(algorithm, digestAlgIdFinder)); } digestAlgs.add(digestAlg); @@ -610,10 +609,8 @@ public static CMSSignedData replaceSigners(CMSSignedData signedData, SignerInfor Collection signers = signerInformationStore.getSigners(); ASN1EncodableVector vec = new ASN1EncodableVector(signers.size()); - Iterator it = signers.iterator(); - while (it.hasNext()) + for (SignerInformation signer : signers) { - SignerInformation signer = (SignerInformation)it.next(); CMSUtils.addDigestAlgs(digestAlgs, signer, digestAlgIdFinder); vec.add(signer.toASN1Structure()); } diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java index 56acf89016..323a9b1cc3 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java @@ -268,12 +268,9 @@ public SignerInformationStore getSignerInfos() List signerInfos = new ArrayList(); Map hashes = new HashMap(); - - Iterator it = digests.keySet().iterator(); - while (it.hasNext()) - { - Object digestKey = it.next(); + for (Object digestKey : digests.keySet()) + { hashes.put(digestKey, ((DigestCalculator)digests.get(digestKey)).getDigest()); } diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java index 519b11941c..891043004b 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java @@ -497,10 +497,9 @@ public void close() // add the precalculated SignerInfo objects // { - Iterator it = _signers.iterator(); - while (it.hasNext()) + for (Object o : _signers) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; // TODO Verify the content type and calculated digest match the precalculated SignerInfo // if (!signer.getContentType().equals(_contentOID)) diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedGenerator.java b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedGenerator.java index 36b4c4529f..877dfc26a2 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSSignedGenerator.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSSignedGenerator.java @@ -223,11 +223,10 @@ public void addOtherRevocationInfo( public void addSigners( SignerInformationStore signerStore) { - Iterator it = signerStore.getSigners().iterator(); - while (it.hasNext()) + for (SignerInformation signerInformation : signerStore.getSigners()) { - _signers.add(it.next()); + _signers.add(signerInformation); } } diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSUtils.java b/pkix/src/main/java/org/bouncycastle/cms/CMSUtils.java index 80cdb1fa3b..ad21ff888c 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSUtils.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSUtils.java @@ -388,10 +388,9 @@ public static byte[] streamToByteArray( static InputStream attachDigestsToInputStream(Collection digests, InputStream s) { InputStream result = s; - Iterator it = digests.iterator(); - while (it.hasNext()) + for (Object o : digests) { - DigestCalculator digest = (DigestCalculator)it.next(); + DigestCalculator digest = (DigestCalculator)o; result = new TeeInputStream(result, digest.getOutputStream()); } return result; @@ -400,10 +399,9 @@ static InputStream attachDigestsToInputStream(Collection digests, InputStream s) static OutputStream attachSignersToOutputStream(Collection signers, OutputStream s) { OutputStream result = s; - Iterator it = signers.iterator(); - while (it.hasNext()) + for (Object signer : signers) { - SignerInfoGenerator signerGen = (SignerInfoGenerator)it.next(); + SignerInfoGenerator signerGen = (SignerInfoGenerator)signer; result = getSafeTeeOutputStream(result, signerGen.getCalculatingOutputStream()); } return result; @@ -444,11 +442,10 @@ static ASN1EncodableVector getRecipentInfos(GenericKey encKey, List recipientInf throws CMSException { ASN1EncodableVector recipientInfos = new ASN1EncodableVector(); - Iterator it = recipientInfoGenerators.iterator(); - while (it.hasNext()) + for (Object recipientInfoGenerator : recipientInfoGenerators) { - RecipientInfoGenerator recipient = (RecipientInfoGenerator)it.next(); + RecipientInfoGenerator recipient = (RecipientInfoGenerator)recipientInfoGenerator; recipientInfos.add(recipient.generate(encKey)); } diff --git a/pkix/src/main/java/org/bouncycastle/cms/RecipientInformationStore.java b/pkix/src/main/java/org/bouncycastle/cms/RecipientInformationStore.java index 3870e260d8..2a2033112f 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/RecipientInformationStore.java +++ b/pkix/src/main/java/org/bouncycastle/cms/RecipientInformationStore.java @@ -35,11 +35,8 @@ public RecipientInformationStore( public RecipientInformationStore( Collection recipientInfos) { - Iterator it = recipientInfos.iterator(); - - while (it.hasNext()) + for (RecipientInformation recipientInformation : recipientInfos) { - RecipientInformation recipientInformation = (RecipientInformation)it.next(); RecipientId rid = recipientInformation.getRID(); List list = (ArrayList)table.get(rid); diff --git a/pkix/src/main/java/org/bouncycastle/cms/SignerInformationStore.java b/pkix/src/main/java/org/bouncycastle/cms/SignerInformationStore.java index 79ec0a04ea..32399ed3bb 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/SignerInformationStore.java +++ b/pkix/src/main/java/org/bouncycastle/cms/SignerInformationStore.java @@ -39,12 +39,9 @@ public SignerInformationStore( public SignerInformationStore( Collection signerInfos) { - Iterator it = signerInfos.iterator(); - - while (it.hasNext()) + for (SignerInformation signer : signerInfos) { - SignerInformation signer = (SignerInformation)it.next(); - SignerId sid = signer.getSID(); + SignerId sid = signer.getSID(); List list = (ArrayList)table.get(sid); if (list == null) diff --git a/pkix/src/main/java/org/bouncycastle/pkix/ASN1PKIXNameConstraintValidator.java b/pkix/src/main/java/org/bouncycastle/pkix/ASN1PKIXNameConstraintValidator.java index d77afc712a..c67c11d5ba 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/ASN1PKIXNameConstraintValidator.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/ASN1PKIXNameConstraintValidator.java @@ -400,11 +400,10 @@ private void checkPermittedDN(Set permitted, ASN1Sequence dns) { return; } - Iterator it = permitted.iterator(); - while (it.hasNext()) + for (Object o : permitted) { - ASN1Sequence subtree = (ASN1Sequence)it.next(); + ASN1Sequence subtree = (ASN1Sequence)o; if (withinDNSubtree(dns, subtree)) { @@ -424,11 +423,9 @@ private void checkExcludedDN(Set excluded, ASN1Sequence dns) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - ASN1Sequence subtree = (ASN1Sequence)it.next(); + ASN1Sequence subtree = (ASN1Sequence)o; if (withinDNSubtree(dns, subtree)) { @@ -454,10 +451,9 @@ private Set intersectDN(Set permitted, Set dns) } else { - Iterator _iter = permitted.iterator(); - while (_iter.hasNext()) + for (Object o : permitted) { - ASN1Sequence subtree = (ASN1Sequence)_iter.next(); + ASN1Sequence subtree = (ASN1Sequence)o; if (withinDNSubtree(dn, subtree)) { @@ -489,10 +485,9 @@ private Set unionDN(Set excluded, ASN1Sequence dn) { Set intersect = new HashSet(); - Iterator it = excluded.iterator(); - while (it.hasNext()) + for (Object o : excluded) { - ASN1Sequence subtree = (ASN1Sequence)it.next(); + ASN1Sequence subtree = (ASN1Sequence)o; if (withinDNSubtree(dn, subtree)) { @@ -549,10 +544,9 @@ private Set intersectEmail(Set permitted, Set emails) } else { - Iterator it2 = permitted.iterator(); - while (it2.hasNext()) + for (Object o : permitted) { - String _permitted = (String)it2.next(); + String _permitted = (String)o; intersectEmail(email, _permitted, intersect); } @@ -576,10 +570,9 @@ private Set unionEmail(Set excluded, String email) { Set union = new HashSet(); - Iterator it = excluded.iterator(); - while (it.hasNext()) + for (Object o : excluded) { - String _excluded = (String)it.next(); + String _excluded = (String)o; unionEmail(_excluded, email, union); } @@ -614,10 +607,9 @@ private Set intersectIP(Set permitted, Set ips) } else { - Iterator it2 = permitted.iterator(); - while (it2.hasNext()) + for (Object o : permitted) { - byte[] _permitted = (byte[])it2.next(); + byte[] _permitted = (byte[])o; intersect.addAll(intersectIPRange(_permitted, ip)); } } @@ -651,10 +643,9 @@ private Set unionIP(Set excluded, byte[] ip) { Set union = new HashSet(); - Iterator it = excluded.iterator(); - while (it.hasNext()) + for (Object o : excluded) { - byte[] _excluded = (byte[])it.next(); + byte[] _excluded = (byte[])o; union.addAll(unionIPRange(_excluded, ip)); } @@ -811,11 +802,9 @@ private void checkPermittedEmail(Set permitted, String email) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - String str = ((String)it.next()); + String str = (String)o; if (emailIsConstrained(email, str)) { @@ -840,11 +829,9 @@ private void checkPermittedOtherName(Set permitted, OtherName name) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - OtherName str = ((OtherName)it.next()); + OtherName str = (OtherName)o; if (otherNameIsConstrained(name, str)) { @@ -864,11 +851,9 @@ private void checkExcludedOtherName(Set excluded, OtherName name) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - OtherName str = OtherName.getInstance(it.next()); + OtherName str = OtherName.getInstance(o); if (otherNameIsConstrained(name, str)) { @@ -886,11 +871,9 @@ private void checkExcludedEmail(Set excluded, String email) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - String str = (String)it.next(); + String str = (String)o; if (emailIsConstrained(email, str)) { @@ -917,11 +900,9 @@ private void checkPermittedIP(Set permitted, byte[] ip) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - byte[] ipWithSubnet = (byte[])it.next(); + byte[] ipWithSubnet = (byte[])o; if (isIPConstrained(ip, ipWithSubnet)) { @@ -953,11 +934,9 @@ private void checkExcludedIP(Set excluded, byte[] ip) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - byte[] ipWithSubnet = (byte[])it.next(); + byte[] ipWithSubnet = (byte[])o; if (isIPConstrained(ip, ipWithSubnet)) { @@ -1084,11 +1063,9 @@ private void checkPermittedDNS(Set permitted, String dns) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - String str = ((String)it.next()); + String str = (String)o; // is sub domain if (withinDomain(dns, str) || dns.equalsIgnoreCase(str)) @@ -1112,11 +1089,9 @@ private void checkExcludedDNS(Set excluded, String dns) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - String str = ((String)it.next()); + String str = (String)o; // is sub domain or the same if (withinDomain(dns, str) || dns.equalsIgnoreCase(str)) @@ -1428,10 +1403,9 @@ private Set intersectDNS(Set permitted, Set dnss) } else { - Iterator _iter = permitted.iterator(); - while (_iter.hasNext()) + for (Object o : permitted) { - String _permitted = (String)_iter.next(); + String _permitted = (String)o; if (withinDomain(_permitted, dns)) { @@ -1464,10 +1438,9 @@ private Set unionDNS(Set excluded, String dns) { Set union = new HashSet(); - Iterator _iter = excluded.iterator(); - while (_iter.hasNext()) + for (Object o : excluded) { - String _permitted = (String)_iter.next(); + String _permitted = (String)o; if (withinDomain(_permitted, dns)) { @@ -1597,11 +1570,9 @@ private void checkExcludedURI(Set excluded, String uri) return; } - Iterator it = excluded.iterator(); - - while (it.hasNext()) + for (Object o : excluded) { - String str = ((String)it.next()); + String str = (String)o; if (isUriConstrained(uri, str)) { @@ -1627,10 +1598,9 @@ private Set intersectURI(Set permitted, Set uris) } else { - Iterator _iter = permitted.iterator(); - while (_iter.hasNext()) + for (Object o : permitted) { - String _permitted = (String)_iter.next(); + String _permitted = (String)o; intersectURI(_permitted, uri, intersect); } } @@ -1654,10 +1624,9 @@ private Set unionURI(Set excluded, String uri) { Set union = new HashSet(); - Iterator _iter = excluded.iterator(); - while (_iter.hasNext()) + for (Object o : excluded) { - String _excluded = (String)_iter.next(); + String _excluded = (String)o; unionURI(_excluded, uri, union); } @@ -1767,11 +1736,9 @@ private void checkPermittedURI(Set permitted, String uri) return; } - Iterator it = permitted.iterator(); - - while (it.hasNext()) + for (Object o : permitted) { - String str = ((String)it.next()); + String str = (String)o; if (isUriConstrained(uri, str)) { @@ -1923,10 +1890,8 @@ private int hashCollection(Collection coll) return 0; } int hash = 0; - Iterator it1 = coll.iterator(); - while (it1.hasNext()) + for (Object o : coll) { - Object o = it1.next(); if (o instanceof byte[]) { hash += Arrays.hashCode((byte[])o); @@ -1953,16 +1918,12 @@ private boolean collectionsAreEqual(Collection coll1, Collection coll2) { return false; } - Iterator it1 = coll1.iterator(); - while (it1.hasNext()) + for (Object a : coll1) { - Object a = it1.next(); - Iterator it2 = coll2.iterator(); boolean found = false; - while (it2.hasNext()) + for (Object b : coll2) { - Object b = it2.next(); if (equals(a, b)) { found = true; 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..846d77ac39 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CertPathValidatorUtilities.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CertPathValidatorUtilities.java @@ -368,10 +368,9 @@ protected static void prepareNextCertB1( throws AnnotatedException, CertPathValidatorException { boolean idp_found = false; - Iterator nodes_i = policyNodes[i].iterator(); - while (nodes_i.hasNext()) + for (Object o : policyNodes[i]) { - PKIXPolicyNode node = (PKIXPolicyNode)nodes_i.next(); + PKIXPolicyNode node = (PKIXPolicyNode)o; if (node.getValidPolicy().equals(id_p)) { idp_found = true; @@ -382,10 +381,9 @@ protected static void prepareNextCertB1( if (!idp_found) { - nodes_i = policyNodes[i].iterator(); - while (nodes_i.hasNext()) + for (Object o : policyNodes[i]) { - PKIXPolicyNode node = (PKIXPolicyNode)nodes_i.next(); + PKIXPolicyNode node = (PKIXPolicyNode)o; if (ANY_POLICY.equals(node.getValidPolicy())) { Set pq = null; @@ -584,12 +582,9 @@ protected static Collection findCertificates(PKIXCertStoreSelector certSelect, throws AnnotatedException { Set certs = new HashSet(); - Iterator iter = certStores.iterator(); - while (iter.hasNext()) + for (Object obj : certStores) { - Object obj = iter.next(); - if (obj instanceof Store) { Store certStore = (Store)obj; diff --git a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CrlCache.java b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CrlCache.java index eb910a70ad..c64f489f12 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CrlCache.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/CrlCache.java @@ -169,12 +169,9 @@ public Collection getMatches(Selector selector) else { List col = new ArrayList(); - Iterator iter = _local.iterator(); - while (iter.hasNext()) + for (CRL obj : _local) { - CRL obj = iter.next(); - if (selector.match(obj)) { col.add(obj); diff --git a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/PKIXCRLUtil.java b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/PKIXCRLUtil.java index 6e55b79cbd..29c342dc25 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/PKIXCRLUtil.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/PKIXCRLUtil.java @@ -95,10 +95,8 @@ private static void findCRLs(HashSet crls, PKIXCRLStoreSelector crlSelect, List AnnotatedException lastException = null; boolean foundValidStore = false; - Iterator iter = crlStores.iterator(); - while (iter.hasNext()) + for (Object obj : crlStores) { - Object obj = iter.next(); if (obj instanceof Store) { Store store = (Store)obj; diff --git a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/PKIXCertPathReviewer.java b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/PKIXCertPathReviewer.java index 2234ca031e..a73ccd2434 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/PKIXCertPathReviewer.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/PKIXCertPathReviewer.java @@ -1247,11 +1247,8 @@ private void checkPolicy() { PKIXPolicyNode _node = (PKIXPolicyNode) _nodes.get(k); - Iterator _policySetIter = _node.getExpectedPolicies().iterator(); - while (_policySetIter.hasNext()) + for (Object _tmp : _node.getExpectedPolicies()) { - Object _tmp = _policySetIter.next(); - String _policy; if (_tmp instanceof String) { @@ -1424,12 +1421,11 @@ else if (_tmp instanceof ASN1ObjectIdentifier) tmp.add(sd_p); } } - - Iterator it_idp = s_idp.iterator(); - while (it_idp.hasNext()) + + for (Object o : s_idp) { - String id_p = (String)it_idp.next(); - + String id_p = (String)o; + // // (1) // @@ -1656,11 +1652,10 @@ else if (isAnyPolicy(userInitialPolicySet)) // (g) (ii) } } } - - Iterator _vpnsIter = _validPolicyNodeSet.iterator(); - while (_vpnsIter.hasNext()) + + for (Object o : _validPolicyNodeSet) { - PKIXPolicyNode _node = (PKIXPolicyNode)_vpnsIter.next(); + PKIXPolicyNode _node = (PKIXPolicyNode)o; String _validPolicy = _node.getValidPolicy(); if (!acceptablePolicies.contains(_validPolicy)) @@ -1729,10 +1724,9 @@ else if (isAnyPolicy(userInitialPolicySet)) // (g) (ii) // // (g) (iii) 2 // - Iterator _vpnsIter = _validPolicyNodeSet.iterator(); - while (_vpnsIter.hasNext()) + for (Object o : _validPolicyNodeSet) { - PKIXPolicyNode _node = (PKIXPolicyNode)_vpnsIter.next(); + PKIXPolicyNode _node = (PKIXPolicyNode)o; String _validPolicy = _node.getValidPolicy(); if (!userInitialPolicySet.contains(_validPolicy)) @@ -1862,11 +1856,10 @@ private void checkCriticalExtensions() if (!criticalExtensions.isEmpty()) { ErrorBundle msg; - Iterator it = criticalExtensions.iterator(); - while (it.hasNext()) + for (Object criticalExtension : criticalExtensions) { msg = createErrorBundle("CertPathReviewer.unknownCriticalExt", - new Object[] {new ASN1ObjectIdentifier((String) it.next())}); + new Object[] {new ASN1ObjectIdentifier((String) criticalExtension)}); addError(msg, index); } } diff --git a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/RFC3280CertPathUtilities.java b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/RFC3280CertPathUtilities.java index 7977ecad26..7187a3d0ed 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/RFC3280CertPathUtilities.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/RFC3280CertPathUtilities.java @@ -437,10 +437,9 @@ protected static Set processCRLF( List validCerts = new ArrayList(); List validKeys = new ArrayList(); - Iterator cert_it = coll.iterator(); - while (cert_it.hasNext()) + for (Object o : coll) { - X509Certificate signingCert = (X509Certificate)cert_it.next(); + X509Certificate signingCert = (X509Certificate)o; /* * CA of the certificate, for which this CRL is checked, has also diff --git a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/RevocationUtilities.java b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/RevocationUtilities.java index 13548619bd..2e690814b4 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/RevocationUtilities.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/RevocationUtilities.java @@ -111,11 +111,8 @@ private static ASN1Primitive getObject(ASN1ObjectIdentifier oid, byte[] ext) thr protected static void findCertificates(LinkedHashSet certs, PKIXCertStoreSelector certSelect, List certStores) throws AnnotatedException { - Iterator iter = certStores.iterator(); - while (iter.hasNext()) + for (Object obj : certStores) { - Object obj = iter.next(); - if (obj instanceof Store) { Store certStore = (Store)obj; diff --git a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/X509RevocationChecker.java b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/X509RevocationChecker.java index e0e579b200..43d3204c6b 100644 --- a/pkix/src/main/java/org/bouncycastle/pkix/jcajce/X509RevocationChecker.java +++ b/pkix/src/main/java/org/bouncycastle/pkix/jcajce/X509RevocationChecker.java @@ -884,12 +884,9 @@ public Collection getMatches(Selector selector) } List col = new ArrayList(); - Iterator iter = _local.iterator(); - while (iter.hasNext()) + for (CRL obj : _local) { - CRL obj = iter.next(); - if (selector.match(obj)) { col.add(obj); diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/BcCertTest.java b/pkix/src/test/java/org/bouncycastle/cert/test/BcCertTest.java index 249b56f190..a0339af6c1 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/BcCertTest.java +++ b/pkix/src/test/java/org/bouncycastle/cert/test/BcCertTest.java @@ -633,10 +633,9 @@ public void checkCreation1() } Collection c = cert.getSubjectAlternativeNames(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - List gn = (List)it.next(); + List gn = (List)o; if (!gn.get(1).equals("test@test.test")) { fail("failed subject alternative names test"); @@ -1158,10 +1157,9 @@ public void checkCRLCreation3() boolean oneFound = false; boolean twoFound = false; - Iterator it = crlHolder.getRevokedCertificates().iterator(); - while (it.hasNext()) + for (Object o : crlHolder.getRevokedCertificates()) { - X509CRLEntryHolder crlEnt = (X509CRLEntryHolder)it.next(); + X509CRLEntryHolder crlEnt = (X509CRLEntryHolder)o; if (crlEnt.getSerialNumber().intValue() == 1) { diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java b/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java index cf4ebacefc..9e48ac430a 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java +++ b/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java @@ -1691,10 +1691,9 @@ public void checkCreation1() } Collection c = cert.getSubjectAlternativeNames(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - List gn = (List)it.next(); + List gn = (List)o; if (!gn.get(1).equals("test@test.test") && !gn.get(1).equals("dom.test.test")) { fail("failed subject alternative names test"); @@ -2631,10 +2630,9 @@ public void checkCRLCreation3() boolean oneFound = false; boolean twoFound = false; - Iterator it = crlHolder.getRevokedCertificates().iterator(); - while (it.hasNext()) + for (Object o : crlHolder.getRevokedCertificates()) { - X509CRLEntryHolder crlEnt = (X509CRLEntryHolder)it.next(); + X509CRLEntryHolder crlEnt = (X509CRLEntryHolder)o; if (crlEnt.getSerialNumber().intValue() == 1) { diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/AnnotatedKeyTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/AnnotatedKeyTest.java index 4fb2002e49..a9850e4931 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/AnnotatedKeyTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/AnnotatedKeyTest.java @@ -131,11 +131,9 @@ public void testKeyTransOAEPDefault() assertEquals(2, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(PKCSObjectIdentifiers.id_RSAES_OAEP, recipient.getKeyEncryptionAlgorithm().getAlgorithm()); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java index 0495f4b1e1..7056fe644d 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java @@ -269,11 +269,9 @@ public void testUnprotectedAttributes() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -305,11 +303,9 @@ public void testKeyTrans() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -340,11 +336,9 @@ public void testKeyTransRC4() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(_reciKP.getPrivate().getEncoded())))); 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..72eae42094 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java @@ -489,11 +489,10 @@ private void verifyRSASignatures(CMSSignedData s, byte[] contentDigest) SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -516,11 +515,10 @@ private void verifySignatures(CMSSignedData s, byte[] contentDigest) SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -1159,10 +1157,9 @@ public void testSHA1WithRSACounterSignature() Collection csSigners = cs.getSigners(); assertEquals(2, csSigners.size()); - Iterator it = csSigners.iterator(); - while (it.hasNext()) + for (Object csSigner : csSigners) { - SignerInformation cSigner = (SignerInformation)it.next(); + SignerInformation cSigner = (SignerInformation)csSigner; Collection certCollection = certStore.getMatches(cSigner.getSID()); Iterator certIt = certCollection.iterator(); @@ -1457,11 +1454,10 @@ private void checkSignerStoreReplacement( signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - - while (it.hasNext()) + + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -1480,11 +1476,10 @@ public void testUnsortedAttributes() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); X509CertificateHolder cert = (X509CertificateHolder)certIt.next(); @@ -1805,10 +1800,9 @@ public void testCounterSig() Collection csSigners = cs.getSigners(); assertEquals(1, csSigners.size()); - Iterator it = csSigners.iterator(); - while (it.hasNext()) + for (Object csSigner : csSigners) { - SignerInformation cSigner = (SignerInformation)it.next(); + SignerInformation cSigner = (SignerInformation)csSigner; Collection certCollection = sig.getCertificates().getMatches(cSigner.getSID()); Iterator certIt = certCollection.iterator(); @@ -1867,11 +1861,10 @@ private void verifySignatures(CMSSignedDataParser sp) SignerInformationStore signers = sp.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/CMSAuthEnvelopedDataStreamGeneratorTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/CMSAuthEnvelopedDataStreamGeneratorTest.java index 1a73d5fad3..95a0b09660 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/CMSAuthEnvelopedDataStreamGeneratorTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/CMSAuthEnvelopedDataStreamGeneratorTest.java @@ -193,11 +193,9 @@ public AttributeTable getAttributes(Map parameters) Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), "1.2.840.113549.1.1.1"); @@ -264,11 +262,9 @@ public AttributeTable getAttributes(Map parameters) Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), "1.2.840.113549.1.1.1"); @@ -322,11 +318,9 @@ public void testNoAttributes() Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), "1.2.840.113549.1.1.1"); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java index bc633dd494..56997e2d75 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java @@ -136,11 +136,10 @@ private void verifySignatures(CMSSignedDataParser sp, byte[] contentDigest) SignerInformationStore signers = sp.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthEnvelopedDataStreamTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthEnvelopedDataStreamTest.java index 1ab81dbfa5..54221d83dd 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthEnvelopedDataStreamTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthEnvelopedDataStreamTest.java @@ -138,11 +138,10 @@ private void verifyData( assertEquals(ep.getEncAlgOID(), expectedOid); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -187,12 +186,8 @@ public void testUnprotectedAttributes() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (RecipientInformation recipient : c) { - RecipientInformation recipient = it.next(); - assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC)); @@ -403,12 +398,9 @@ public void testKeyTransAES128AndOriginatorInfo() assertEquals(ep.getEncAlgOID(), CMSAlgorithm.AES128_GCM.getId()); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (RecipientInformation recipient : c) { - RecipientInformation recipient = it.next(); - assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); CMSTypedStream recData = recipient.getContentStream( @@ -445,12 +437,9 @@ public void testKeyTransAES128() assertEquals(ep.getEncAlgOID(), CMSAlgorithm.AES128_GCM.getId()); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (RecipientInformation recipient : c) { - RecipientInformation recipient = it.next(); - assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); CMSTypedStream recData = recipient.getContentStream(new JceKeyTransAuthEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC)); @@ -489,12 +478,9 @@ public void testAESKEK() assertEquals(ep.getEncAlgOID(), CMSAlgorithm.AES128_GCM.getId()); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (RecipientInformation recipient : c) { - RecipientInformation recipient = it.next(); - CMSTypedStream recData = recipient.getContentStream(new JceKEKAuthEnvelopedRecipient(kek).setProvider(BC)); assertTrue(Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream()))); @@ -531,12 +517,9 @@ public void testChaCha20Poly1305KEK() assertEquals(ep.getEncAlgOID(), CMSAlgorithm.ChaCha20Poly1305.getId()); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (RecipientInformation recipient : c) { - RecipientInformation recipient = it.next(); - CMSTypedStream recData = recipient.getContentStream(new JceKEKAuthEnvelopedRecipient(kek).setProvider(BC)); assertTrue(Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream()))); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java index ca3ab472f6..bb8457201a 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java @@ -153,11 +153,9 @@ public void testOriginatorInfo() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -192,11 +190,9 @@ private void tryKeyTrans(byte[] data, ASN1ObjectIdentifier macAlg) assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -232,11 +228,9 @@ private void tryKeyTransWithDigest(byte[] data, ASN1ObjectIdentifier macAlg) assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java index 7e772d1473..9f7259da4c 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java @@ -232,11 +232,9 @@ public void testEncoding() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -275,11 +273,9 @@ public void testOriginatorInfo() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -321,11 +317,9 @@ public void testAES256CCM() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -369,11 +363,9 @@ public void testAES256CCMContentType() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -495,11 +487,9 @@ private void tryKeyTrans(ASN1ObjectIdentifier macAlg) assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -533,11 +523,9 @@ private void tryKeyTransWithDigest(ASN1ObjectIdentifier macAlg) assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java index 4786f62f30..7e2554ee3d 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java @@ -181,11 +181,10 @@ private void verifyData( assertEquals(ep.getEncryptionAlgOID(), expectedOid); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -230,11 +229,9 @@ public void testUnprotectedAttributes() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -560,11 +557,10 @@ public void testKeyTransAES128AndOriginatorInfo() assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -601,11 +597,10 @@ public void testKeyTransAES128() assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -653,11 +648,10 @@ public void testKeyTransCAST5SunJCE() assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.CAST5_CBC); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -697,11 +691,10 @@ public void testAESKEK() assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC); Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), "2.16.840.1.101.3.4.1.25"); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java index d8e8845400..bb2a1d25ce 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java @@ -676,11 +676,9 @@ public void testUnprotectedAttributes() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -711,11 +709,9 @@ public void testContentType() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -974,11 +970,9 @@ public void testKeyTrans() assertEquals(2, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -1025,11 +1019,9 @@ public void testKeyTransWithHKDF() assertEquals(2, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -1072,11 +1064,9 @@ public void testKeyTransOAEPDefault() assertEquals(2, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(PKCSObjectIdentifiers.id_RSAES_OAEP, recipient.getKeyEncryptionAlgorithm().getAlgorithm()); @@ -1152,11 +1142,9 @@ private void doTestKeyTransOAEPDefaultNamed(String digest, String mgfDigest) assertEquals(2, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(PKCSObjectIdentifiers.id_RSAES_OAEP, recipient.getKeyEncryptionAlgorithm().getAlgorithm()); @@ -1198,11 +1186,9 @@ public void testKeyTransOAEPInCert() assertEquals(2, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(PKCSObjectIdentifiers.id_RSAES_OAEP, recipient.getKeyEncryptionAlgorithm().getAlgorithm()); @@ -1321,11 +1307,9 @@ public void testOriginatorInfoGeneration() assertEquals(2, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); @@ -1368,11 +1352,9 @@ public void testKeyTransRC2bit40() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC)); @@ -1401,11 +1383,9 @@ public void testKeyTransRC4() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC)); @@ -2516,18 +2496,16 @@ public void testGost3410_2012_KeyTransGen() Collection c = recipients.getRecipients(); - Iterator it = c.iterator(); - - while (it.hasNext()) - { - RecipientInformation recipient = (RecipientInformation)it.next(); + for (Object o : c) + { + RecipientInformation recipient = (RecipientInformation)o; - assertEquals(recipient.getKeyEncryptionAlgOID(), RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512.getId()); + assertEquals(recipient.getKeyEncryptionAlgOID(), RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512.getId()); - byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(privKey).setProvider(BC)); + byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(privKey).setProvider(BC)); - assertTrue(Arrays.equals(data, recData)); - } + assertTrue(Arrays.equals(data, recData)); + } } @@ -2550,11 +2528,9 @@ public void testGost3410_2001_KeyTrans() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), CryptoProObjectIdentifiers.gostR3410_2001.getId()); @@ -2592,11 +2568,9 @@ public void testGithub539_Gost3410_2012_KeyTrans() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), RosstandartObjectIdentifiers.id_tc26_gost_3410_12_256.getId()); @@ -2623,11 +2597,9 @@ public void testGost3410_2012_KeyTrans() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), RosstandartObjectIdentifiers.id_tc26_gost_3410_12_256.getId()); @@ -2667,11 +2639,9 @@ public void testGost3410_2001_KeyAgree() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_ESDH.getId()); @@ -2709,11 +2679,9 @@ public void testGost3410_2001_KeyTransRand() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), CryptoProObjectIdentifiers.gostR3410_2001.getId()); @@ -2751,11 +2719,9 @@ public void testGost3410_2001_KeyAgreeRand() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_ESDH.getId()); @@ -2793,11 +2759,9 @@ public void testGost3410_2012_KeyAgree() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), RosstandartObjectIdentifiers.id_tc26_agreement_gost_3410_12_256.getId()); @@ -2902,11 +2866,9 @@ public void testGost3410_2001_KeyAgree_Creation() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), RosstandartObjectIdentifiers.id_tc26_agreement_gost_3410_12_256.getId()); @@ -2965,11 +2927,9 @@ public void testGost3410_2012_256_KeyAgree_Creation() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), RosstandartObjectIdentifiers.id_tc26_agreement_gost_3410_12_256.getId()); @@ -3028,11 +2988,9 @@ public void testGost3410_2012_512_KeyAgree_Creation() assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), RosstandartObjectIdentifiers.id_tc26_agreement_gost_3410_12_512.getId()); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java index b11de46a3f..423435e1fc 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java @@ -185,11 +185,10 @@ private void verifySignatures(CMSSignedDataParser sp, byte[] contentDigest) assertTrue(digestIDs.size() > 0); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - - while (it.hasNext()) + + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -979,11 +978,10 @@ public AttributeTable getAttributes(Map parameters) SignerInformationStore signers = sp.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; checkAttribute(signer.getContentDigest(), signer.getSignedAttributes().get(dummyOid1)); checkAttribute(signer.getSignature(), signer.getUnsignedAttributes().get(dummyOid2)); } @@ -1371,11 +1369,10 @@ public void testMSPKCS7() SignerInformationStore signers = sp.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java index 5e41a1c9a0..e485df079d 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java @@ -912,11 +912,10 @@ private void verifyRSASignatures(CMSSignedData s, byte[] contentDigest) SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -939,11 +938,10 @@ private void verifySignatures(CMSSignedData s, byte[] contentDigest) SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -1425,11 +1423,10 @@ private void verifySignatures(CMSSignedData s, boolean shouldPass, String messag SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -1589,11 +1586,10 @@ public void testSignerInformationExtension() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -2183,11 +2179,10 @@ public void testGostNoAttributesEncapsulated() SignerInformationStore signers = data.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -2233,10 +2228,9 @@ public void testSHA1WithRSACounterSignature() Collection csSigners = cs.getSigners(); assertEquals(2, csSigners.size()); - Iterator it = csSigners.iterator(); - while (it.hasNext()) + for (Object csSigner : csSigners) { - SignerInformation cSigner = (SignerInformation)it.next(); + SignerInformation cSigner = (SignerInformation)csSigner; Collection certCollection = certStore.getMatches(cSigner.getSID()); Iterator certIt = certCollection.iterator(); @@ -3148,11 +3142,10 @@ private void checkSignerStoreReplacement( signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - - while (it.hasNext()) + + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -3171,11 +3164,10 @@ public void testUnsortedAttributes() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); X509CertificateHolder cert = (X509CertificateHolder)certIt.next(); @@ -3495,11 +3487,9 @@ public void testNoAttrEncapsulatedSample() Collection c = signers.getSigners(); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); X509CertificateHolder cert = (X509CertificateHolder)certIt.next(); @@ -3523,10 +3513,9 @@ public void testCounterSig() Collection csSigners = cs.getSigners(); assertEquals(1, csSigners.size()); - Iterator it = csSigners.iterator(); - while (it.hasNext()) + for (Object csSigner : csSigners) { - SignerInformation cSigner = (SignerInformation)it.next(); + SignerInformation cSigner = (SignerInformation)csSigner; Collection certCollection = sig.getCertificates().getMatches(cSigner.getSID()); Iterator certIt = certCollection.iterator(); @@ -3581,11 +3570,10 @@ public void testMixed() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -3767,11 +3755,10 @@ private void verifySignatures(CMSSignedDataParser sp) SignerInformationStore signers = sp.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -3800,11 +3787,8 @@ public SignerInformationVerifier get(SignerId signerId) { SignerInformationStore signers = sd.getSignerInfos(); - Iterator it = signers.getSigners().iterator(); - while (it.hasNext()) + for (SignerInformation signer : signers.getSigners()) { - SignerInformation signer = (SignerInformation)it.next(); - SignerInformationVerifier verifier = verifierProvider.get(signer.getSID()); assertTrue(signer.verify(verifier)); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NullProviderTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/NullProviderTest.java index 2219f08906..543a10aef9 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NullProviderTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/NullProviderTest.java @@ -109,11 +109,10 @@ public void testSHA1WithRSAEncapsulated() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certsAndCrls.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); X509CertificateHolder cert = (X509CertificateHolder)certIt.next(); @@ -159,11 +158,10 @@ public void testSHA1WithRSAStream() SignerInformationStore signers = sp.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -223,11 +221,9 @@ private void testKeyTrans(String algorithm) assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/PQCSignedDataTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/PQCSignedDataTest.java index 414b5b4c9f..a910048216 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/PQCSignedDataTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/PQCSignedDataTest.java @@ -290,11 +290,10 @@ public void testFalconEncapsulated() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -351,11 +350,10 @@ public void testLmsEncapsulated() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -675,12 +673,11 @@ private void checkSignature(CMSSignedData s, CMSSignedDataGenerator gen) SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/Rfc4134Test.java b/pkix/src/test/java/org/bouncycastle/cms/test/Rfc4134Test.java index 440e78d7d1..4c38bbf733 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/Rfc4134Test.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/Rfc4134Test.java @@ -330,11 +330,10 @@ private void verifySignatures(CMSSignedData s, byte[] contentDigest) SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -368,11 +367,10 @@ private void verifySignatures(CMSSignedDataParser sp) SignerInformationStore signers = sp.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certs.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/SunProviderTest.java b/pkix/src/test/java/org/bouncycastle/cms/test/SunProviderTest.java index 40299cd26b..af97c1df2c 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/SunProviderTest.java +++ b/pkix/src/test/java/org/bouncycastle/cms/test/SunProviderTest.java @@ -110,11 +110,10 @@ public void testSHA1WithRSAEncapsulated() SignerInformationStore signers = s.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certsAndCrls.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -161,11 +160,10 @@ public void testSHA1WithRSAStream() SignerInformationStore signers = sp.getSignerInfos(); Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certStore.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -226,11 +224,9 @@ private void testKeyTrans(String algorithm) assertEquals(1, c.size()); - Iterator it = c.iterator(); - - while (it.hasNext()) + for (Object o : c) { - RecipientInformation recipient = (RecipientInformation)it.next(); + RecipientInformation recipient = (RecipientInformation)o; assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId()); diff --git a/pkix/src/test/java/org/bouncycastle/mime/test/MultipartParserTest.java b/pkix/src/test/java/org/bouncycastle/mime/test/MultipartParserTest.java index ec8ea4870c..41bf8aa6fa 100644 --- a/pkix/src/test/java/org/bouncycastle/mime/test/MultipartParserTest.java +++ b/pkix/src/test/java/org/bouncycastle/mime/test/MultipartParserTest.java @@ -168,11 +168,10 @@ public void signedData(MimeParserContext parserContext, Headers headers, Store c throws CMSException { Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certificates.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -226,11 +225,10 @@ public void signedData(MimeParserContext parserContext, Headers headers, Store c throws CMSException { Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certificates.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -281,11 +279,10 @@ public void signedData(MimeParserContext parserContext, Headers headers, Store c throws CMSException { Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certificates.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); @@ -350,11 +347,10 @@ public void signedData(MimeParserContext parserContext, Headers headers, Store c throws CMSException { Collection c = signers.getSigners(); - Iterator it = c.iterator(); - while (it.hasNext()) + for (Object o : c) { - SignerInformation signer = (SignerInformation)it.next(); + SignerInformation signer = (SignerInformation)o; Collection certCollection = certificates.getMatches(signer.getSID()); Iterator certIt = certCollection.iterator(); diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLImpl.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLImpl.java index e2de3fb4fc..3712a01590 100644 --- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLImpl.java +++ b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLImpl.java @@ -618,10 +618,9 @@ else if (oid.equals(Extension.freshestCRL)) Set set = getRevokedCertificates(); if (set != null) { - Iterator it = set.iterator(); - while (it.hasNext()) + for (Object o : set) { - buf.append(it.next()); + buf.append(o); buf.append(nl); } } diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java index f650eaa29b..ca11b0458a 100644 --- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java +++ b/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java @@ -261,10 +261,8 @@ private static Hashtable copyMap(Map paramsMap) { Hashtable newTable = new Hashtable(); - Iterator keys = paramsMap.keySet().iterator(); - while (keys.hasNext()) + for (Object key : paramsMap.keySet()) { - Object key = keys.next(); newTable.put(key, paramsMap.get(key)); } diff --git a/prov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java b/prov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java index 8c92697086..2d6aea062f 100644 --- a/prov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java +++ b/prov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java @@ -158,10 +158,9 @@ public Builder() public Builder(SkeinParameterSpec params) { - Iterator keys = params.parameters.keySet().iterator(); - while (keys.hasNext()) + for (Object o : params.parameters.keySet()) { - Integer key = (Integer)keys.next(); + Integer key = (Integer)o; parameters.put(key, params.parameters.get(key)); } } 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..6e65c4718b 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java @@ -565,10 +565,8 @@ protected static boolean isAnyPolicy( protected static void findCertificates(Set certs, PKIXCertStoreSelector certSelect, List certStores) throws AnnotatedException { - Iterator iter = certStores.iterator(); - while (iter.hasNext()) + for (Object obj : certStores) { - Object obj = iter.next(); if (obj instanceof Store) { Store certStore = (Store)obj; diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/CrlCache.java b/prov/src/main/java/org/bouncycastle/jce/provider/CrlCache.java index 34a7542640..8a802fe862 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/CrlCache.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/CrlCache.java @@ -170,12 +170,9 @@ public Collection getMatches(Selector selector) else { List col = new ArrayList(); - Iterator iter = _local.iterator(); - while (iter.hasNext()) + for (CRL obj : _local) { - CRL obj = iter.next(); - if (selector.match(obj)) { col.add(obj); diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java b/prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java index 3d2f8f2e47..ec69fd08af 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java @@ -327,10 +327,8 @@ protected static Collection findCertificates(X509AttributeCertStoreSelector cert { Set certs = new HashSet(); - Iterator iter = certStores.iterator(); - while (iter.hasNext()) + for (Object obj : certStores) { - Object obj = iter.next(); if (obj instanceof Store) { Store certStore = (Store)obj; diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java b/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java index 0c0e47c212..14a308c2a6 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java @@ -71,10 +71,8 @@ private static void findCRLs(Set crls, PKIXCRLStoreSelector crlSelect, List crlS AnnotatedException lastException = null; boolean foundValidStore = false; - Iterator iter = crlStores.iterator(); - while (iter.hasNext()) + for (Object obj : crlStores) { - Object obj = iter.next(); if (obj instanceof Store) { Store store = (Store)obj; diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi_8.java b/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi_8.java index f40c4c6ef1..07ff7d0a8b 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi_8.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi_8.java @@ -153,10 +153,9 @@ else if (params instanceof PKIXExtendedParameters) PKIXCertRevocationChecker revocationChecker = null; List pathCheckers = new ArrayList(); - Iterator certIter = paramsPKIX.getCertPathCheckers().iterator(); - while (certIter.hasNext()) + for (Object o : paramsPKIX.getCertPathCheckers()) { - PKIXCertPathChecker checker = (PKIXCertPathChecker)certIter.next(); + PKIXCertPathChecker checker = (PKIXCertPathChecker)o; checker.init(false); diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/RFC3280CertPathUtilities.java b/prov/src/main/java/org/bouncycastle/jce/provider/RFC3280CertPathUtilities.java index 09c146283c..cecc9471e4 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/RFC3280CertPathUtilities.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/RFC3280CertPathUtilities.java @@ -839,10 +839,9 @@ protected static PKIXPolicyNode prepareCertB( tmp.add(sd_p); } - Iterator it_idp = m_idp.entrySet().iterator(); - while (it_idp.hasNext()) + for (Object o : m_idp.entrySet()) { - Map.Entry e_idp = (Map.Entry)it_idp.next(); + Map.Entry e_idp = (Map.Entry)o; String id_p = (String)e_idp.getKey(); HashSet expectedPolicies = (HashSet)e_idp.getValue(); @@ -1275,11 +1274,8 @@ protected static PKIXPolicyNode processCertD( { PKIXPolicyNode _node = (PKIXPolicyNode)_nodes.get(k); - Iterator _policySetIter = _node.getExpectedPolicies().iterator(); - while (_policySetIter.hasNext()) + for (Object _tmp : _node.getExpectedPolicies()) { - Object _tmp = _policySetIter.next(); - String _policy; if (_tmp instanceof String) { @@ -2346,10 +2342,9 @@ else if (CertPathValidatorUtilities.isAnyPolicy(userInitialPolicySet)) // (g) (i } } - Iterator _vpnsIter = _validPolicyNodeSet.iterator(); - while (_vpnsIter.hasNext()) + for (Object o : _validPolicyNodeSet) { - PKIXPolicyNode _node = (PKIXPolicyNode)_vpnsIter.next(); + PKIXPolicyNode _node = (PKIXPolicyNode)o; String _validPolicy = _node.getValidPolicy(); if (!acceptablePolicies.contains(_validPolicy)) @@ -2410,10 +2405,9 @@ else if (CertPathValidatorUtilities.isAnyPolicy(userInitialPolicySet)) // (g) (i // // (g) (iii) 2 // - Iterator _vpnsIter = _validPolicyNodeSet.iterator(); - while (_vpnsIter.hasNext()) + for (Object o : _validPolicyNodeSet) { - PKIXPolicyNode _node = (PKIXPolicyNode)_vpnsIter.next(); + PKIXPolicyNode _node = (PKIXPolicyNode)o; String _validPolicy = _node.getValidPolicy(); if (!userInitialPolicySet.contains(_validPolicy)) diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java b/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java index 44e102edde..3f9d0c498e 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java @@ -519,10 +519,9 @@ else if (oid.equals(Extension.freshestCRL)) Set set = getRevokedCertificates(); if (set != null) { - Iterator it = set.iterator(); - while (it.hasNext()) + for (Object o : set) { - buf.append(it.next()); + buf.append(o); buf.append(nl); } } diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java b/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java index c8463ef137..02a35e1691 100644 --- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java +++ b/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java @@ -108,10 +108,9 @@ private Collection getCertificatesFromCrossCertificatePairs( Set crossCerts = new HashSet(helper.getCrossCertificatePairs(ps)); Set forward = new HashSet(); Set reverse = new HashSet(); - Iterator it = crossCerts.iterator(); - while (it.hasNext()) + for (Object crossCert : crossCerts) { - X509CertificatePair pair = (X509CertificatePair)it.next(); + X509CertificatePair pair = (X509CertificatePair)crossCert; if (pair.getForward() != null) { forward.add(pair.getForward()); diff --git a/prov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java b/prov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java index 949b62aca0..2a3e27eea6 100644 --- a/prov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java +++ b/prov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java @@ -362,10 +362,9 @@ protected static void prepareNextCertB1( throws AnnotatedException, CertPathValidatorException { boolean idp_found = false; - Iterator nodes_i = policyNodes[i].iterator(); - while (nodes_i.hasNext()) + for (Object o : policyNodes[i]) { - PKIXPolicyNode node = (PKIXPolicyNode)nodes_i.next(); + PKIXPolicyNode node = (PKIXPolicyNode)o; if (node.getValidPolicy().equals(id_p)) { idp_found = true; @@ -376,10 +375,9 @@ protected static void prepareNextCertB1( if (!idp_found) { - nodes_i = policyNodes[i].iterator(); - while (nodes_i.hasNext()) + for (Object o : policyNodes[i]) { - PKIXPolicyNode node = (PKIXPolicyNode)nodes_i.next(); + PKIXPolicyNode node = (PKIXPolicyNode)o; if (ANY_POLICY.equals(node.getValidPolicy())) { Set pq = null; @@ -571,12 +569,9 @@ protected static Collection findCertificates(PKIXCertStoreSelector certSelect, throws AnnotatedException { Set certs = new HashSet(); - Iterator iter = certStores.iterator(); - while (iter.hasNext()) + for (Object obj : certStores) { - Object obj = iter.next(); - if (obj instanceof Store) { Store certStore = (Store)obj; @@ -614,12 +609,9 @@ protected static Collection findCertificates(X509AttributeCertStoreSelector cert throws AnnotatedException { Set certs = new HashSet(); - Iterator iter = certStores.iterator(); - while (iter.hasNext()) + for (Object obj : certStores) { - Object obj = iter.next(); - if (obj instanceof X509Store) { X509Store certStore = (X509Store)obj; diff --git a/prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXParameters.java b/prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXParameters.java index 50a292b2e3..68c5f4d5ed 100644 --- a/prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXParameters.java +++ b/prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXParameters.java @@ -211,10 +211,9 @@ public void setCertStores(List stores) { if (stores != null) { - Iterator it = stores.iterator(); - while (it.hasNext()) + for (Object store : stores) { - addCertStore((CertStore)it.next()); + addCertStore((CertStore)store); } } } diff --git a/prov/src/main/java/org/bouncycastle/x509/PKIXCRLUtil.java b/prov/src/main/java/org/bouncycastle/x509/PKIXCRLUtil.java index ebabf5693d..a8706328ea 100644 --- a/prov/src/main/java/org/bouncycastle/x509/PKIXCRLUtil.java +++ b/prov/src/main/java/org/bouncycastle/x509/PKIXCRLUtil.java @@ -48,10 +48,8 @@ private static void findCRLs(HashSet crls, X509CRLStoreSelector crlSelect, List AnnotatedException lastException = null; boolean foundValidStore = false; - Iterator iter = crlStores.iterator(); - while (iter.hasNext()) + for (Object obj : crlStores) { - Object obj = iter.next(); if (obj instanceof X509Store) { X509Store store = (X509Store)obj; diff --git a/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java b/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java index d8d090f066..4e6a85043e 100644 --- a/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java +++ b/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java @@ -1241,11 +1241,8 @@ private void checkPolicy() { PKIXPolicyNode _node = (PKIXPolicyNode) _nodes.get(k); - Iterator _policySetIter = _node.getExpectedPolicies().iterator(); - while (_policySetIter.hasNext()) + for (Object _tmp : _node.getExpectedPolicies()) { - Object _tmp = _policySetIter.next(); - String _policy; if (_tmp instanceof String) { @@ -1418,12 +1415,11 @@ else if (_tmp instanceof ASN1ObjectIdentifier) tmp.add(sd_p); } } - - Iterator it_idp = s_idp.iterator(); - while (it_idp.hasNext()) + + for (Object o : s_idp) { - String id_p = (String)it_idp.next(); - + String id_p = (String)o; + // // (1) // @@ -1650,11 +1646,10 @@ else if (isAnyPolicy(userInitialPolicySet)) // (g) (ii) } } } - - Iterator _vpnsIter = _validPolicyNodeSet.iterator(); - while (_vpnsIter.hasNext()) + + for (Object o : _validPolicyNodeSet) { - PKIXPolicyNode _node = (PKIXPolicyNode)_vpnsIter.next(); + PKIXPolicyNode _node = (PKIXPolicyNode)o; String _validPolicy = _node.getValidPolicy(); if (!acceptablePolicies.contains(_validPolicy)) @@ -1723,10 +1718,9 @@ else if (isAnyPolicy(userInitialPolicySet)) // (g) (ii) // // (g) (iii) 2 // - Iterator _vpnsIter = _validPolicyNodeSet.iterator(); - while (_vpnsIter.hasNext()) + for (Object o : _validPolicyNodeSet) { - PKIXPolicyNode _node = (PKIXPolicyNode)_vpnsIter.next(); + PKIXPolicyNode _node = (PKIXPolicyNode)o; String _validPolicy = _node.getValidPolicy(); if (!userInitialPolicySet.contains(_validPolicy)) @@ -1856,11 +1850,10 @@ private void checkCriticalExtensions() if (!criticalExtensions.isEmpty()) { ErrorBundle msg; - Iterator it = criticalExtensions.iterator(); - while (it.hasNext()) + for (Object criticalExtension : criticalExtensions) { msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.unknownCriticalExt", - new Object[] {new ASN1ObjectIdentifier((String) it.next())}); + new Object[] {new ASN1ObjectIdentifier((String) criticalExtension)}); addError(msg, index); } } diff --git a/prov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java b/prov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java index 5879371da5..489ecffbe5 100644 --- a/prov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java +++ b/prov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java @@ -148,10 +148,9 @@ public void addCRL(X509CRL other) if (revocations != null) { - Iterator it = revocations.iterator(); - while (it.hasNext()) + for (Object revocation : revocations) { - X509CRLEntry entry = (X509CRLEntry)it.next(); + X509CRLEntry entry = (X509CRLEntry)revocation; ASN1InputStream aIn = new ASN1InputStream(entry.getEncoded()); diff --git a/prov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java b/prov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java index 8121a498ed..2dbbda01da 100644 --- a/prov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java +++ b/prov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java @@ -394,10 +394,9 @@ private List attrCertSubjectSerialSearch( if (serials.size() > 0 && params.getSearchForSerialNumberIn() != null) { - Iterator it = serials.iterator(); - while (it.hasNext()) + for (Object o : serials) { - serial = (String)it.next(); + serial = (String)o; list.addAll(search(splitString(params.getSearchForSerialNumberIn()), serial, attrs)); } } @@ -449,10 +448,9 @@ private List cRLIssuerSearch(X509CRLStoreSelector xselector, } } } - Iterator it = issuers.iterator(); - while (it.hasNext()) + for (Object o : issuers) { - issuer = ((X500Principal)it.next()).getName("RFC1779"); + issuer = ((X500Principal)o).getName("RFC1779"); String attrValue = null; for (int i = 0; i < issuerAttributeNames.length; i++) diff --git a/prov/src/test/java/org/bouncycastle/jce/provider/test/CRL5Test.java b/prov/src/test/java/org/bouncycastle/jce/provider/test/CRL5Test.java index 8b1c022ac4..81ceecc573 100644 --- a/prov/src/test/java/org/bouncycastle/jce/provider/test/CRL5Test.java +++ b/prov/src/test/java/org/bouncycastle/jce/provider/test/CRL5Test.java @@ -224,10 +224,9 @@ public void indirectCRLTest() ByteArrayInputStream in = new ByteArrayInputStream(inDirectCrl); X509CRL crl = (X509CRL) cf.generateCRL(in); Set set = crl.getRevokedCertificates(); - Iterator it = set.iterator(); - while (it.hasNext()) + for (Object o : set) { - if (((X509CRLEntry)it.next()).getCertificateIssuer() == null) + if (((X509CRLEntry)o).getCertificateIssuer() == null) { fail("certificate issuer CRL entry extension is null"); } @@ -241,10 +240,9 @@ public void directCRLTest() ByteArrayInputStream in = new ByteArrayInputStream(directCRL); X509CRL crl = (X509CRL) cf.generateCRL(in); Set set = crl.getRevokedCertificates(); - Iterator it = set.iterator(); - while (it.hasNext()) + for (Object o : set) { - if (((X509CRLEntry)it.next()).getCertificateIssuer() != null) + if (((X509CRLEntry)o).getCertificateIssuer() != null) { fail("certificate issuer CRL entry extension is not null"); }