hg: jdk9/sandbox/jdk: Merge

naoto.sato at oracle.com naoto.sato at oracle.com
Tue Jun 30 16:59:54 UTC 2015


Changeset: 4bbecdf2af14
Author:    naoto
Date:      2015-06-30 09:58 -0700
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/4bbecdf2af14

Merge

! .hgtags
! src/java.base/share/classes/java/io/BufferedOutputStream.java
! src/java.base/share/classes/java/io/FilterOutputStream.java
! src/java.base/share/classes/java/security/Provider.java
! src/java.base/share/classes/java/security/Security.java
! src/java.base/share/classes/java/util/Base64.java
! src/java.base/share/classes/java/util/DoubleSummaryStatistics.java
! src/java.base/share/classes/java/util/IntSummaryStatistics.java
! src/java.base/share/classes/java/util/LongSummaryStatistics.java
! src/java.base/share/classes/sun/security/jca/ProviderConfig.java
! src/java.base/share/classes/sun/security/jca/ProviderList.java
! src/java.base/share/classes/sun/security/jca/Providers.java
! src/java.base/share/classes/sun/security/tools/keytool/Main.java
! src/java.base/share/conf/security/java.policy
! src/java.base/share/conf/security/java.security
! src/java.naming/share/classes/sun/security/provider/certpath/ldap/JdkLDAP.java
! src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java
! src/java.security.jgss/share/classes/sun/security/jgss/SunProvider.java
! src/java.security.sasl/share/classes/com/sun/security/sasl/Provider.java
! src/java.security.sasl/share/classes/javax/security/sasl/Sasl.java
! src/java.smartcardio/share/classes/sun/security/smartcardio/SunPCSC.java
! src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
! src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
! src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java
! src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/SunMSCAPI.java
! src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
! src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Config.java
! src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/Secmod.java
! src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java
! src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java
! src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java
! src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java
! src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java
! src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java
! src/jdk.deploy.osx/macosx/classes/apple/security/AppleProvider.java
! src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
! test/ProblemList.txt
! test/TEST.ROOT
! test/TEST.groups
! test/com/sun/crypto/provider/Cipher/AES/Test4511676.java
! test/com/sun/crypto/provider/Cipher/AES/Test4512524.java
! test/com/sun/crypto/provider/Cipher/AES/Test4512704.java
! test/com/sun/crypto/provider/Cipher/AES/Test4513830.java
! test/com/sun/crypto/provider/Cipher/AES/Test4517355.java
! test/com/sun/crypto/provider/Cipher/AES/Test4626070.java
! test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java
! test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java
! test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java
! test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java
! test/com/sun/crypto/provider/Cipher/DES/DESSecretKeySpec.java
! test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java
! test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java
! test/com/sun/crypto/provider/Cipher/DES/FlushBug.java
! test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java
! test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java
! test/com/sun/crypto/provider/Cipher/DES/Sealtest.java
! test/com/sun/crypto/provider/Cipher/UTIL/SunJCEGetInstance.java
! test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java
! test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
! test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java
! test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java
! test/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java
! test/com/sun/crypto/provider/KeyGenerator/Test4628062.java
! test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java
! test/com/sun/crypto/provider/Mac/HmacMD5.java
! test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java
! test/java/lang/SecurityManager/CheckSecurityProvider.java
! test/java/security/KeyStore/EntryMethods.java
! test/java/security/Provider/DefaultPKCS11.java
! test/java/security/Security/SynchronizedAccess.java
! test/java/util/Base64/TestBase64.java
! test/javax/net/ssl/TLS/CipherTestUtils.java
! test/sun/net/www/protocol/http/B6369510.java
! test/sun/security/krb5/config/NamingManager.java
! test/sun/security/pkcs11/KeyStore/Basic.java
! test/sun/security/pkcs11/KeyStore/ClientAuth.java
! test/sun/security/pkcs11/PKCS11Test.java
! test/sun/security/pkcs11/rsa/TestCACerts.java
! test/tools/launcher/MiscTests.java



More information about the jdk9-sandbox-changes mailing list