hg: jdk8u/jdk8u-dev/jdk: 8062552: Support keystore type detection for JKS and PKCS12 keystores

[vincent.x.ryan at oracle.com]

Changeset: 67a15c76095d
Author:    vinnie
Date:      2015-05-25 09:18 +0100
URL:       http://hg.openjdk.java.net/jdk8u/jdk8u-dev/jdk/rev/67a15c76095d

8062552: Support keystore type detection for JKS and PKCS12 keystores
Reviewed-by: weijun

! src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
! src/share/classes/sun/security/provider/JavaKeyStore.java
+ src/share/classes/sun/security/provider/KeyStoreDelegator.java
! src/share/classes/sun/security/provider/SunEntries.java
! src/share/lib/security/java.security-aix
! src/share/lib/security/java.security-linux
! src/share/lib/security/java.security-macosx
! src/share/lib/security/java.security-solaris
! src/share/lib/security/java.security-windows
+ test/java/security/KeyStore/TestKeystoreCompat.java
+ test/java/security/KeyStore/trusted.pem