archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8295953: Use enhanced-for cycle instead of Enumeration in sun.security

Browse source 
Reviewed-by: weijun
This commit is contained in:
Andrey Turbanov 2022-11-07 16:45:39 +00:00
parent ba303c048e
commit 3baad069a6
6 changed files with 14 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
View file

@ -483,9 +483,9 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
public String engineGetCertificateAlias(Certificate cert) {
Certificate certElem;
for (Enumeration<String> e = entries.keys(); e.hasMoreElements(); ) {
String alias = e.nextElement();
Object entry = entries.get(alias);
for (Map.Entry<String, Object> e : entries.entrySet()) {
String alias = e.getKey();
Object entry = e.getValue();
if (entry instanceof TrustedCertEntry) {
certElem = ((TrustedCertEntry)entry).cert;
} else if (((KeyEntry)entry).chain != null) {
@ -566,10 +566,9 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
dos.writeInt(entries.size());
for (Enumeration<String> e = entries.keys(); e.hasMoreElements();) {
String alias = e.nextElement();
Object entry = entries.get(alias);
for (Map.Entry<String, Object> e : entries.entrySet()) {
String alias = e.getKey();
Object entry = e.getValue();
if (entry instanceof KeyEntry) {

9
src/java.base/share/classes/sun/security/provider/PolicyParser.java
View file

@ -316,8 +316,6 @@ public class PolicyParser {
{
PrintWriter out = new PrintWriter(new BufferedWriter(policy));
Enumeration<GrantEntry> enum_ = grantElements();
out.println("/* AUTOMATICALLY GENERATED ON "+
(new java.util.Date()) + "*/");
out.println("/* DO NOT EDIT */");
@ -333,8 +331,7 @@ public class PolicyParser {
}
// write "grant" entries
while (enum_.hasMoreElements()) {
GrantEntry ge = enum_.nextElement();
for (GrantEntry ge : grantEntries) {
ge.write(out);
out.println();
}
@ -938,9 +935,7 @@ public class PolicyParser {
}
}
out.println(" {");
Enumeration<PermissionEntry> enum_ = permissionEntries.elements();
while (enum_.hasMoreElements()) {
PermissionEntry pe = enum_.nextElement();
for (PermissionEntry pe : permissionEntries) {
out.write(" ");
pe.write(out);
}

4
src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
View file

@ -1311,9 +1311,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
public String[] getValueNames() {
ArrayList<Object> v = new ArrayList<>();
Object securityCtx = SecureKey.getCurrentSecurityContext();
for (Enumeration<SecureKey> e = boundValues.keys();
e.hasMoreElements(); ) {
SecureKey key = e.nextElement();
for (SecureKey key : boundValues.keySet()) {
if (securityCtx.equals(key.getSecurityContext())) {
v.add(key.getAppKey());
}

4
src/java.base/share/classes/sun/security/tools/keytool/Main.java
View file

@ -4177,9 +4177,7 @@ public final class Main {
// Try out each certificate in the vector, until we find one
// whose public key verifies the signature of the certificate
// in question.
for (Enumeration<Pair<String,X509Certificate>> issuerCerts = vec.elements();
issuerCerts.hasMoreElements(); ) {
Pair<String,X509Certificate> issuerCert = issuerCerts.nextElement();
for (Pair<String, X509Certificate> issuerCert : vec) {
PublicKey issuerPubKey = issuerCert.snd.getPublicKey();
try {
certToVerify.snd.verify(issuerPubKey);

8
src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
View file

@ -408,12 +408,8 @@ public class X509CRLEntryImpl extends X509CRLEntry
if (extAlias == null) { // may be unknown
ObjectIdentifier findOID = ObjectIdentifier.of(oid);
Extension ex;
ObjectIdentifier inCertOID;
for (Enumeration<Extension> e = extensions.getElements();
e.hasMoreElements();) {
ex = e.nextElement();
inCertOID = ex.getExtensionId();
for (Extension ex : extensions.getAllExtensions()) {
ObjectIdentifier inCertOID = ex.getExtensionId();
if (inCertOID.equals(findOID)) {
crlExt = ex;
break;

8
src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
View file

@ -1014,12 +1014,8 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
if (extAlias == null) { // may be unknown
ObjectIdentifier findOID = ObjectIdentifier.of(oid);
Extension ex;
ObjectIdentifier inCertOID;
for (Enumeration<Extension> e = extensions.getElements();
e.hasMoreElements();) {
ex = e.nextElement();
inCertOID = ex.getExtensionId();
for (Extension ex : extensions.getAllExtensions()) {
ObjectIdentifier inCertOID = ex.getExtensionId();
if (inCertOID.equals(findOID)) {
crlExt = ex;
break;