8006946: PKCS12 test failure due to incorrect alias name

Reviewed-by: mullan

8006946: PKCS12 test failure due to incorrect alias name
Reviewed-by: mullan
eec1ebc3 · vinnie · d7c329bc · eec1ebc3
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java +3 -3

未找到文件。
--- a/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
+++ b/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
@@ -2224,11 +2224,11 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
                        keyId = "01".getBytes("UTF8");
                    }
                }
-                if (alias == null) {
-                    alias = getUnfriendlyName();
-                }
                // Trusted certificate
                if (trustedKeyUsage != null) {
+                    if (alias == null) {
+                        alias = getUnfriendlyName();
+                    }
                    CertEntry certEntry =
                        new CertEntry(cert, keyId, alias, trustedKeyUsage,
                            attributes);