8278560: X509KeyManagerImpl::getAliases might return a good key with others

Reviewed-by: xuelei

src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java

@@ -382,15 +382,13 @@ final class X509KeyManagerImpl extends X509ExtendedKeyManager
                             issuerSet, false, checkType, constraints,
                             requestedServerNames, idAlgorithm);
                 if (results != null) {
-                    // the results will either be a single perfect match
-                    // or 1 or more imperfect matches
-                    // if it's a perfect match, return immediately
-                    EntryStatus status = results.get(0);
-                    if (status.checkResult == CheckResult.OK) {
-                        if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
-                            SSLLogger.fine("KeyMgr: choosing key: " + status);
+                    for (EntryStatus status : results) {
+                        if (status.checkResult == CheckResult.OK) {
+                            if (SSLLogger.isOn && SSLLogger.isOn("keymanager")) {
+                                SSLLogger.fine("KeyMgr: choosing key: " + status);
+                            }
+                            return makeAlias(status);
                         }
-                        return makeAlias(status);
                     }
                     if (allResults == null) {
                         allResults = new ArrayList<EntryStatus>();

test/jdk/sun/security/ssl/X509KeyManager/NoGoodKey.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8278560
+ * @summary X509KeyManagerImpl::getAliases might return a good key with others
+ * @library /test/lib
+ * @modules java.base/sun.security.tools.keytool
+ *          java.base/sun.security.util
+ *          java.base/sun.security.x509
+ */
+import jdk.test.lib.Asserts;
+import sun.security.tools.keytool.CertAndKeyGen;
+import sun.security.util.KnownOIDs;
+import sun.security.util.ObjectIdentifier;
+import sun.security.x509.CertificateExtensions;
+import sun.security.x509.ExtendedKeyUsageExtension;
+import sun.security.x509.X500Name;
+
+import java.io.*;
+import java.security.*;
+import java.security.cert.Certificate;
+import java.util.Date;
+import java.util.Vector;
+import javax.net.ssl.*;
+
+public class NoGoodKey {
+    public static void main(String[] args) throws Exception {
+
+        PrintStream oldErr = System.err;
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+
+        CertificateExtensions exts = new CertificateExtensions();
+        Vector<ObjectIdentifier> xku = new Vector<>(1);
+        xku.add(ObjectIdentifier.of(KnownOIDs.KP_TimeStamping));
+        var ext = new ExtendedKeyUsageExtension(xku);
+        exts.set(ext.getId(), ext);
+
+        KeyStore ks = KeyStore.getInstance("pkcs12");
+        char[] pass = "password".toCharArray();
+        ks.load(null, null);
+
+        CertAndKeyGen ckg;
+
+        // This is for the first keyType but wrong extendedKeyUsage
+        ckg = new CertAndKeyGen("EC", "SHA256withECDSA");
+        ckg.generate("secp256r1");
+        ks.setKeyEntry("a", ckg.getPrivateKey(), pass, new java.security.cert.Certificate[]
+                { ckg.getSelfCertificate(new X500Name("CN=user"), new Date(), 10000, exts) });
+
+        // This is for the 2nd keyType and is perfect
+        ckg = new CertAndKeyGen("RSA", "SHA256withRSA");
+        ckg.generate(2048);
+        ks.setKeyEntry("b", ckg.getPrivateKey(), pass, new Certificate[]
+                { ckg.getSelfCertificate(new X500Name("CN=user"), 10000) });
+
+        try {
+            System.setProperty("javax.net.debug", "keymanager");
+            System.setErr(new PrintStream(bout));
+            var kmf = KeyManagerFactory.getInstance("NewSunX509");
+            kmf.init(ks, pass);
+            var km = (X509ExtendedKeyManager) kmf.getKeyManagers()[0];
+
+            // b will be chosen anyway
+            Asserts.assertEQ(km.chooseClientAlias(new String[]{"EC", "RSA"}, null, null), "1.0.b");
+        } finally {
+            System.setErr(oldErr);
+        }
+
+        // make sure it's chosen as good matching key
+        String log = bout.toString();
+        Asserts.assertFalse(log.contains("no good matching key found"), log);
+    }
+}