--- old/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java 2019-08-14 00:18:07.000000000 +0800 +++ new/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java 2019-08-14 00:18:06.000000000 +0800 @@ -68,10 +68,12 @@ } } - // special JKS that supports JKS and PKCS12 file formats - public static final class DualFormatJKS extends KeyStoreDelegator { - public DualFormatJKS() { - super("JKS", JKS.class, "PKCS12", PKCS12KeyStore.class); + // special JKS that supports JKS/PKCS12/PEM file formats + public static final class MultipleFormatJKS extends KeyStoreDelegator { + public MultipleFormatJKS() { + super("JKS", JKS.class, + List.of("PKCS12", "PEM"), + List.of(PKCS12KeyStore.class, PemKeyStore.class)); } }