Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/ikvm-fork.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openjdk/allsources.lst1439
-rw-r--r--openjdk/java/security/ProtectionDomain.java38
-rw-r--r--openjdk/map.xml19
-rw-r--r--openjdk/response.txt133
-rw-r--r--openjdk/sun/misc/SharedSecrets.java18
-rw-r--r--openjdk/sun/security/jgss/wrapper/SunNativeProvider.java6
-rw-r--r--openjdk/tools.rsp4
-rw-r--r--runtime/openjdk.cs6
8 files changed, 897 insertions, 766 deletions
diff --git a/openjdk/allsources.lst b/openjdk/allsources.lst
index 406fb5f1..51d7629f 100644
--- a/openjdk/allsources.lst
+++ b/openjdk/allsources.lst
@@ -7654,25 +7654,25 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/com/sun/net/httpserver/package-info.java
@OPENJDK6@/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
@OPENJDK6@/jdk/src/share/classes/com/sun/net/httpserver/spi/package-info.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/HostnameVerifier.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/Provider.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/KeyManager.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactory.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/SSLContext.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/SSLContextSpi.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/SSLPermission.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/SSLSecurity.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/TrustManager.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/X509KeyManager.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/X509TrustManager.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/HostnameVerifier.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/KeyManager.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactory.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/SSLContext.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/SSLContextSpi.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/SSLPermission.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/SSLSecurity.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/TrustManager.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/X509KeyManager.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/X509TrustManager.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/Provider.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
@OPENJDK7@/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java
@OPENJDK7@/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java
@OPENJDK7@/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java
@@ -7868,8 +7868,8 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/module/Crypt.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/module/NTLoginModule.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/module/NTSystem.java
@@ -7898,7 +7898,16 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/UserPrincipal.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/X500Principal.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
-@OPENJDK6@/jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/jgss/InquireType.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/ntlm/Client.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/ntlm/NTLMException.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/ntlm/Server.java
+@OPENJDK7@/jdk/src/share/classes/com/sun/security/ntlm/Version.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java
@OPENJDK6@/jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java
@@ -8684,7 +8693,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/java/net/ContentHandler.java
@OPENJDK6@/jdk/src/share/classes/java/net/ContentHandlerFactory.java
@OPENJDK6@/jdk/src/share/classes/java/net/CookieHandler.java
-@OPENJDK6@/jdk/src/share/classes/java/net/CookieManager.java
+@OPENJDK7@/jdk/src/share/classes/java/net/CookieManager.java
@OPENJDK6@/jdk/src/share/classes/java/net/CookiePolicy.java
@OPENJDK6@/jdk/src/share/classes/java/net/CookieStore.java
@OPENJDK6@/jdk/src/share/classes/java/net/DatagramPacket.java
@@ -8692,9 +8701,9 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/java/net/DatagramSocketImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java
@OPENJDK6@/jdk/src/share/classes/java/net/FileNameMap.java
-@OPENJDK6@/jdk/src/share/classes/java/net/HttpCookie.java
+@OPENJDK7@/jdk/src/share/classes/java/net/HttpCookie.java
@OPENJDK6@/jdk/src/share/classes/java/net/HttpRetryException.java
-@OPENJDK6@/jdk/src/share/classes/java/net/HttpURLConnection.java
+@OPENJDK7@/jdk/src/share/classes/java/net/HttpURLConnection.java
@OPENJDK6@/jdk/src/share/classes/java/net/IDN.java
@OPENJDK6@/jdk/src/share/classes/java/net/Inet4Address.java
@OPENJDK6@/jdk/src/share/classes/java/net/Inet4AddressImpl.java
@@ -8702,7 +8711,8 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/java/net/Inet6AddressImpl.java
@OPENJDK6@/jdk/src/share/classes/java/net/InetAddress.java
@OPENJDK6@/jdk/src/share/classes/java/net/InetAddressImpl.java
-@OPENJDK6@/jdk/src/share/classes/java/net/InetSocketAddress.java
+@OPENJDK7@/jdk/src/share/classes/java/net/InetSocketAddress.java
+@OPENJDK7@/jdk/src/share/classes/java/net/InMemoryCookieStore.java
@OPENJDK6@/jdk/src/share/classes/java/net/InterfaceAddress.java
@OPENJDK6@/jdk/src/share/classes/java/net/JarURLConnection.java
@OPENJDK6@/jdk/src/share/classes/java/net/MalformedURLException.java
@@ -8734,7 +8744,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/java/net/URISyntaxException.java
@OPENJDK6@/jdk/src/share/classes/java/net/URL.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLClassLoader.java
-@OPENJDK6@/jdk/src/share/classes/java/net/URLConnection.java
+@OPENJDK7@/jdk/src/share/classes/java/net/URLConnection.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLDecoder.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLEncoder.java
@OPENJDK6@/jdk/src/share/classes/java/net/URLStreamHandler.java
@@ -8919,166 +8929,172 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/java/rmi/UnexpectedException.java
@OPENJDK6@/jdk/src/share/classes/java/rmi/UnknownHostException.java
@OPENJDK6@/jdk/src/share/classes/java/rmi/UnmarshalException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/AccessControlContext.java
-@OPENJDK6@/jdk/src/share/classes/java/security/AccessControlException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/acl/Acl.java
-@OPENJDK6@/jdk/src/share/classes/java/security/acl/AclEntry.java
-@OPENJDK6@/jdk/src/share/classes/java/security/acl/AclNotFoundException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/acl/Group.java
-@OPENJDK6@/jdk/src/share/classes/java/security/acl/LastOwnerException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/acl/NotOwnerException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/acl/Owner.java
-@OPENJDK6@/jdk/src/share/classes/java/security/acl/Permission.java
-@OPENJDK6@/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java
-@OPENJDK6@/jdk/src/share/classes/java/security/AlgorithmParameterGeneratorSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/AlgorithmParameters.java
-@OPENJDK6@/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/AllPermission.java
-@OPENJDK6@/jdk/src/share/classes/java/security/AuthProvider.java
-@OPENJDK6@/jdk/src/share/classes/java/security/BasicPermission.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/Certificate.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertificateEncodingException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertificateException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertificateExpiredException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertificateFactory.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertificateNotYetValidException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertificateParsingException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPath.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathBuilder.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathBuilderException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathBuilderResult.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathParameters.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathValidator.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathValidatorResult.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertSelector.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertStore.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertStoreException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertStoreParameters.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CertStoreSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CollectionCertStoreParameters.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CRL.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CRLException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/CRLSelector.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/LDAPCertStoreParameters.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/PKIXBuilderParameters.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/PKIXParameters.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/PolicyNode.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/TrustAnchor.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/X509Certificate.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/X509CertSelector.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/X509CRL.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/X509CRLEntry.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/X509CRLSelector.java
-@OPENJDK6@/jdk/src/share/classes/java/security/cert/X509Extension.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Certificate.java
-@OPENJDK6@/jdk/src/share/classes/java/security/CodeSigner.java
-@OPENJDK6@/jdk/src/share/classes/java/security/CodeSource.java
-@OPENJDK6@/jdk/src/share/classes/java/security/DigestException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/DigestInputStream.java
-@OPENJDK6@/jdk/src/share/classes/java/security/DigestOutputStream.java
-@OPENJDK6@/jdk/src/share/classes/java/security/DomainCombiner.java
-@OPENJDK6@/jdk/src/share/classes/java/security/GeneralSecurityException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Guard.java
-@OPENJDK6@/jdk/src/share/classes/java/security/GuardedObject.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Identity.java
-@OPENJDK6@/jdk/src/share/classes/java/security/IdentityScope.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/DSAKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/DSAParams.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/DSAPrivateKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/DSAPublicKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/ECKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/ECPrivateKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/ECPublicKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/RSAKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/RSAPrivateKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/interfaces/RSAPublicKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/InvalidAlgorithmParameterException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/InvalidKeyException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/InvalidParameterException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Key.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyFactory.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyFactorySpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyManagementException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyPair.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyPairGenerator.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyPairGeneratorSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyRep.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyStore.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyStoreException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/KeyStoreSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/MessageDigest.java
-@OPENJDK6@/jdk/src/share/classes/java/security/MessageDigestSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/NoSuchAlgorithmException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/NoSuchProviderException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Permission.java
-@OPENJDK6@/jdk/src/share/classes/java/security/PermissionCollection.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Permissions.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Policy.java
-@OPENJDK6@/jdk/src/share/classes/java/security/PolicySpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Principal.java
-@OPENJDK6@/jdk/src/share/classes/java/security/PrivateKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/PrivilegedAction.java
-@OPENJDK6@/jdk/src/share/classes/java/security/PrivilegedActionException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/PrivilegedExceptionAction.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Provider.java
-@OPENJDK6@/jdk/src/share/classes/java/security/ProviderException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/PublicKey.java
-@OPENJDK6@/jdk/src/share/classes/java/security/SecureClassLoader.java
-@OPENJDK6@/jdk/src/share/classes/java/security/SecureRandom.java
-@OPENJDK6@/jdk/src/share/classes/java/security/SecureRandomSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Security.java
-@OPENJDK6@/jdk/src/share/classes/java/security/SecurityPermission.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Signature.java
-@OPENJDK6@/jdk/src/share/classes/java/security/SignatureException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/SignatureSpi.java
-@OPENJDK6@/jdk/src/share/classes/java/security/SignedObject.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Signer.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/AlgorithmParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/DSAParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/DSAPrivateKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/DSAPublicKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/ECField.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/ECFieldF2m.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/ECFieldFp.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/ECGenParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/ECParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/ECPoint.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/ECPrivateKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/ECPublicKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/EllipticCurve.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/EncodedKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/InvalidKeySpecException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/InvalidParameterSpecException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/KeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/MGF1ParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/PSSParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/RSAKeyGenParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/RSAOtherPrimeInfo.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/RSAPrivateKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/RSAPublicKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/spec/X509EncodedKeySpec.java
-@OPENJDK6@/jdk/src/share/classes/java/security/Timestamp.java
-@OPENJDK6@/jdk/src/share/classes/java/security/UnrecoverableEntryException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/UnrecoverableKeyException.java
-@OPENJDK6@/jdk/src/share/classes/java/security/UnresolvedPermission.java
-@OPENJDK6@/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java
-@OPENJDK6@/jdk/src/share/classes/java/security/URIParameter.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AccessControlContext.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AccessControlException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AlgorithmConstraints.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AlgorithmParameterGeneratorSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AlgorithmParameters.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AllPermission.java
+@OPENJDK7@/jdk/src/share/classes/java/security/AuthProvider.java
+@OPENJDK7@/jdk/src/share/classes/java/security/BasicPermission.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Certificate.java
+@OPENJDK7@/jdk/src/share/classes/java/security/CodeSigner.java
+@OPENJDK7@/jdk/src/share/classes/java/security/CodeSource.java
+@OPENJDK7@/jdk/src/share/classes/java/security/CryptoPrimitive.java
+@OPENJDK7@/jdk/src/share/classes/java/security/DigestException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/DigestInputStream.java
+@OPENJDK7@/jdk/src/share/classes/java/security/DigestOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/java/security/DomainCombiner.java
+@OPENJDK7@/jdk/src/share/classes/java/security/GeneralSecurityException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Guard.java
+@OPENJDK7@/jdk/src/share/classes/java/security/GuardedObject.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Identity.java
+@OPENJDK7@/jdk/src/share/classes/java/security/IdentityScope.java
+@OPENJDK7@/jdk/src/share/classes/java/security/InvalidAlgorithmParameterException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/InvalidKeyException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/InvalidParameterException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Key.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyFactory.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyFactorySpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyManagementException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyPair.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyPairGenerator.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyPairGeneratorSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyRep.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyStore.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyStoreException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/KeyStoreSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/MessageDigest.java
+@OPENJDK7@/jdk/src/share/classes/java/security/MessageDigestSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/NoSuchAlgorithmException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/NoSuchProviderException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Permission.java
+@OPENJDK7@/jdk/src/share/classes/java/security/PermissionCollection.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Permissions.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Policy.java
+@OPENJDK7@/jdk/src/share/classes/java/security/PolicySpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Principal.java
+@OPENJDK7@/jdk/src/share/classes/java/security/PrivateKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/PrivilegedAction.java
+@OPENJDK7@/jdk/src/share/classes/java/security/PrivilegedActionException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/PrivilegedExceptionAction.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Provider.java
+@OPENJDK7@/jdk/src/share/classes/java/security/ProviderException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/PublicKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/SecureClassLoader.java
+@OPENJDK7@/jdk/src/share/classes/java/security/SecureRandom.java
+@OPENJDK7@/jdk/src/share/classes/java/security/SecureRandomSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Security.java
+@OPENJDK7@/jdk/src/share/classes/java/security/SecurityPermission.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Signature.java
+@OPENJDK7@/jdk/src/share/classes/java/security/SignatureException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/SignatureSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/SignedObject.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Signer.java
+@OPENJDK7@/jdk/src/share/classes/java/security/Timestamp.java
+@OPENJDK7@/jdk/src/share/classes/java/security/UnrecoverableEntryException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/UnrecoverableKeyException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/UnresolvedPermission.java
+@OPENJDK7@/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java
+@OPENJDK7@/jdk/src/share/classes/java/security/URIParameter.java
+@OPENJDK7@/jdk/src/share/classes/java/security/acl/Acl.java
+@OPENJDK7@/jdk/src/share/classes/java/security/acl/AclEntry.java
+@OPENJDK7@/jdk/src/share/classes/java/security/acl/AclNotFoundException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/acl/Group.java
+@OPENJDK7@/jdk/src/share/classes/java/security/acl/LastOwnerException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/acl/NotOwnerException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/acl/Owner.java
+@OPENJDK7@/jdk/src/share/classes/java/security/acl/Permission.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/Certificate.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertificateEncodingException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertificateException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertificateExpiredException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertificateFactory.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertificateNotYetValidException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertificateParsingException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPath.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathBuilder.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathBuilderException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathBuilderResult.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathParameters.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathValidator.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathValidatorResult.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertSelector.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertStore.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertStoreException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertStoreParameters.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CertStoreSpi.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CollectionCertStoreParameters.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CRL.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CRLException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CRLReason.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/CRLSelector.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/Extension.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/LDAPCertStoreParameters.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/PKIXBuilderParameters.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/PKIXParameters.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/PKIXReason.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/PolicyNode.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/TrustAnchor.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/X509Certificate.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/X509CertSelector.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/X509CRL.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/X509CRLEntry.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/X509CRLSelector.java
+@OPENJDK7@/jdk/src/share/classes/java/security/cert/X509Extension.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/DSAKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/DSAParams.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/DSAPrivateKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/DSAPublicKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/ECKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/ECPrivateKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/ECPublicKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/RSAKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/RSAPrivateKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/interfaces/RSAPublicKey.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/AlgorithmParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/DSAParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/DSAPrivateKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/DSAPublicKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/ECField.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/ECFieldF2m.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/ECFieldFp.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/ECGenParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/ECParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/ECPoint.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/ECPrivateKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/ECPublicKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/EllipticCurve.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/EncodedKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/InvalidKeySpecException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/InvalidParameterSpecException.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/KeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/MGF1ParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/PSSParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/RSAKeyGenParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/RSAOtherPrimeInfo.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/RSAPrivateKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/RSAPublicKeySpec.java
+@OPENJDK7@/jdk/src/share/classes/java/security/spec/X509EncodedKeySpec.java
@OPENJDK6@/jdk/src/share/classes/java/sql/Array.java
@OPENJDK6@/jdk/src/share/classes/java/sql/BatchUpdateException.java
@OPENJDK6@/jdk/src/share/classes/java/sql/Blob.java
@@ -9276,16 +9292,16 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java
@OPENJDK6@/jdk/src/share/classes/java/util/Iterator.java
@OPENJDK6@/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/Attributes.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/JarEntry.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/JarException.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/JarFile.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/JarInputStream.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/JarOutputStream.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/JarVerifier.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/Manifest.java
-@OPENJDK6@/jdk/src/share/classes/java/util/jar/Pack200.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/Attributes.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/JarEntry.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/JarException.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/JarFile.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/JarInputStream.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/JarOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/JarVerifier.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/Manifest.java
+@OPENJDK7@/jdk/src/share/classes/java/util/jar/Pack200.java
@OPENJDK6@/jdk/src/share/classes/java/util/JumboEnumSet.java
@OPENJDK6@/jdk/src/share/classes/java/util/LinkedHashMap.java
@OPENJDK6@/jdk/src/share/classes/java/util/LinkedHashSet.java
@@ -9819,41 +9835,43 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/javax/naming/TimeLimitExceededException.java
@OPENJDK6@/jdk/src/share/classes/javax/net/ServerSocketFactory.java
@OPENJDK6@/jdk/src/share/classes/javax/net/SocketFactory.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/HostnameVerifier.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/KeyManager.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/KeyManagerFactory.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/KeyManagerFactorySpi.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLContext.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLContextSpi.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLException.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLHandshakeException.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLKeyException.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLPermission.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLProtocolException.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLSession.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLSocket.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/TrustManager.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/TrustManagerFactory.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/X509KeyManager.java
-@OPENJDK6@/jdk/src/share/classes/javax/net/ssl/X509TrustManager.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/HostnameVerifier.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/KeyManager.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/KeyManagerFactory.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/KeyManagerFactorySpi.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLContext.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLContextSpi.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLException.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLHandshakeException.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLKeyException.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLPermission.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLProtocolException.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLSession.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLSocket.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/TrustManager.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/TrustManagerFactory.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/X509KeyManager.java
+@OPENJDK7@/jdk/src/share/classes/javax/net/ssl/X509TrustManager.java
@OPENJDK6@/jdk/src/share/classes/javax/print/attribute/Attribute.java
@OPENJDK6@/jdk/src/share/classes/javax/print/attribute/AttributeSet.java
@OPENJDK6@/jdk/src/share/classes/javax/print/attribute/AttributeSetUtilities.java
@@ -10003,12 +10021,14 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/Destroyable.java
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/DestroyFailedException.java
-@OPENJDK6@/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
-@OPENJDK6@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java
-@OPENJDK6@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
-@OPENJDK6@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
-@OPENJDK6@/jdk/src/share/classes/javax/security/auth/kerberos/KeyImpl.java
-@OPENJDK6@/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
+@OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
+@OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java
+@OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java
+@OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
+@OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
+@OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/KeyImpl.java
+@OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java
+@OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/login/AccountException.java
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/login/AccountExpiredException.java
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/login/AccountLockedException.java
@@ -11453,6 +11473,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/JavaSecurityAccess.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java
+@OPENJDK7@/jdk/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java
@OPENJDK7@/jdk/src/share/classes/sun/misc/Launcher.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/Lock.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/LRUCache.java
@@ -11535,13 +11556,13 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/net/idn/UCharacterEnums.java
@OPENJDK6@/jdk/src/share/classes/sun/net/InetAddressCachePolicy.java
@OPENJDK6@/jdk/src/share/classes/sun/net/NetProperties.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/NetworkClient.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/NetworkClient.java
@OPENJDK6@/jdk/src/share/classes/sun/net/NetworkServer.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/ProgressEvent.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/ProgressListener.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/ProgressMeteringPolicy.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/ProgressMonitor.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/ProgressSource.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/ProgressEvent.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/ProgressListener.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/ProgressMeteringPolicy.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/ProgressMonitor.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/ProgressSource.java
@OPENJDK6@/jdk/src/share/classes/sun/net/ResourceManager.java
@OPENJDK6@/jdk/src/share/classes/sun/net/smtp/SmtpClient.java
@OPENJDK6@/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java
@@ -11566,16 +11587,19 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/content/text/plain.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/content/text/PlainTextInputStream.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/HeaderParser.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/http/HttpClient.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/http/Hurryable.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/http/KeepAliveStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/http/PosterOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/HttpCapture.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/HttpCaptureInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/HttpCaptureOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/HttpClient.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/Hurryable.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/KeepAliveStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/http/PosterOutputStream.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/MessageHeader.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/MeteredStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/MeteredStream.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/MimeEntry.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/MimeLauncher.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/MimeTable.java
@@ -11584,26 +11608,31 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/ftp/Handler.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/gopher/Handler.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCache.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/Handler.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/InMemoryCookieStore.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateCallbackHandler.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/NegotiatorImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/https/Handler.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java
-@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCache.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/AuthScheme.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/Handler.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/Negotiator.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/https/Handler.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java
+@OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java
@@ -12053,236 +12082,248 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java
@OPENJDK6@/jdk/src/share/classes/sun/security/ec/ECPublicKeyImpl.java
@OPENJDK6@/jdk/src/share/classes/sun/security/ec/NamedCurve.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
@OPENJDK6@/jdk/src/share/classes/sun/security/jca/GetInstance.java
@OPENJDK6@/jdk/src/share/classes/sun/security/jca/JCAUtil.java
@OPENJDK6@/jdk/src/share/classes/sun/security/jca/ProviderConfig.java
@OPENJDK6@/jdk/src/share/classes/sun/security/jca/ProviderList.java
@OPENJDK6@/jdk/src/share/classes/sun/security/jca/Providers.java
@OPENJDK6@/jdk/src/share/classes/sun/security/jca/ServiceId.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/GSSExceptionImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/GSSHeader.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/GSSNameImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/GSSToken.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/GSSUtil.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/CipherHelper.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5CredElement.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Token.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/MicToken.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/WrapToken.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/LoginConfigImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/ProviderList.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spi/GSSNameSpi.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spi/MechanismFactory.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/SunProvider.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/jgss/TokenTracker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/Asn1Exception.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/Checksum.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/Config.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/Confounder.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/Credentials.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/EncryptedData.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/APOptions.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/APRep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/APReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ASRep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ASReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/AuthContext.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/Tag.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/crc32.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/NullEType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/EncASRepPart.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/EncKDCRepPart.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/EncTicketPart.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo2.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/HostAddress.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KdcErrException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KDCRep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KerberosTime.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/Krb5.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KrbApErrException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KrbErrException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KRBPriv.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KRBSafe.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/LastReqEntry.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/LoginOptions.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/MethodData.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/PAData.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/rcache/CacheTable.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/rcache/ReplayCache.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/SeqNumber.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/TCPClient.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/TGSRep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/TGSReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/Ticket.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/TicketFlags.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/UDPClient.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/util/KerberosFlags.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbAppMessage.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbApRep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbApReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbAsRep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbAsReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbCred.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbCryptoException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbKdcRep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbKdcReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbPriv.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbSafe.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbTgsRep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/KrbTgsReq.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/PrincipalName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/Realm.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/RealmException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/krb5/ServiceName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/ContentInfo.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/EncodingException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/ParsingException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/PKCS10.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/PKCS10Attribute.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/PKCS10Attributes.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/PKCS9Attributes.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSCaller.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSExceptionImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSHeader.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSNameImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSToken.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/GSSUtil.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/HttpCaller.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/LoginConfigImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/ProviderList.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/SunProvider.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/TokenTracker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/CipherHelper.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5CredElement.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Token.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/MicToken.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/WrapToken.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spi/GSSNameSpi.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spi/MechanismFactory.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/wrapper/GSSCredElement.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/wrapper/GSSLibStub.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/Asn1Exception.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/Checksum.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/Config.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/Confounder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/Credentials.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/EncryptedData.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KdcComm.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbAppMessage.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbApRep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbApReq.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbAsRep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbAsReq.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbCred.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbCryptoException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbKdcRep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbPriv.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbSafe.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbTgsRep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/KrbTgsReq.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/PrincipalName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/Realm.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/RealmException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/ServiceName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/APOptions.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/APRep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/APReq.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ASRep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ASReq.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/AuthContext.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/EncASRepPart.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/EncKDCRepPart.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/EncTicketPart.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo2.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/HostAddress.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KdcErrException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KDCRep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KerberosTime.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/Krb5.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KrbApErrException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KrbErrException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KRBPriv.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KRBSafe.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/LastReqEntry.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/LoginOptions.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/MethodData.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/NetClient.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/PAData.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/SeqNumber.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/TGSRep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/TGSReq.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/Ticket.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/TicketFlags.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/Tag.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/crc32.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/NullEType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/rcache/CacheTable.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/rcache/ReplayCache.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/util/KerberosFlags.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/util/KerberosString.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/ContentInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/EncodingException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/ParsingException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/PKCS10.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/PKCS10Attribute.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/PKCS10Attributes.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/PKCS9Attributes.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs12/MacData.java
@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
@OPENJDK6@/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/BasicChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/Builder.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/BuildStep.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/CertId.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/KeyChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/LDAPCertStore.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/OCSPChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/State.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/Vertex.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/BasicChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/Builder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/BuildStep.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/CertId.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/KeyChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/OCSPChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/State.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/Vertex.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
@OPENJDK6@/jdk/src/share/classes/sun/security/provider/ConfigSpiFile.java
@OPENJDK6@/jdk/src/share/classes/sun/security/provider/DigestBase.java
@OPENJDK6@/jdk/src/share/classes/sun/security/provider/DSA.java
@@ -12324,201 +12365,210 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/security/rsa/RSASignature.java
@OPENJDK6@/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java
@OPENJDK6@/jdk/src/share/classes/sun/security/rsa/SunRsaSignEntries.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/Alerts.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/AppInputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/ByteBufferInputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/CipherBox.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/CipherSuiteList.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/Debug.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/DefaultSSLContextImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/DHCrypt.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/ECDHCrypt.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/EngineArgs.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/EphemeralKeyManager.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/HandshakeHash.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/HandshakeOutStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/Handshaker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/InputRecord.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/JsseJce.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/KerberosPreMasterSecret.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/MAC.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/ProtocolList.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/RandomCookie.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/Record.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/RSASignature.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SessionId.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/Alerts.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/AppInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/ByteBufferInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/CipherBox.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/CipherSuiteList.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/Debug.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/DHCrypt.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/ECDHCrypt.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/EngineArgs.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/EphemeralKeyManager.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/HandshakeHash.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/HandshakeOutStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/Handshaker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/InputRecord.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/JsseJce.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/Krb5Helper.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/MAC.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/ProtocolList.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/RandomCookie.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/Record.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/RSASignature.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SessionId.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java
@OPENJDK6@/jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java
@OPENJDK6@/jdk/src/share/classes/sun/security/timestamp/Timestamper.java
@OPENJDK6@/jdk/src/share/classes/sun/security/timestamp/TimestampToken.java
@OPENJDK6@/jdk/src/share/classes/sun/security/timestamp/TSRequest.java
@OPENJDK6@/jdk/src/share/classes/sun/security/timestamp/TSResponse.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/tools/JarSigner.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/tools/JarSignerResources.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/tools/KeyTool.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/tools/PolicyTool.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/tools/TimestampedSigner.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_de.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_es.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_fr.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_it.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_ja.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_ko.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_sv.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/BigInt.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/BitArray.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/ByteArrayLexOrder.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/ByteArrayTagOrder.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Cache.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Debug.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/DerEncoder.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/DerInputBuffer.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/DerInputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/DerOutputStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/DerValue.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/HostnameChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/ManifestDigester.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Password.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/PathList.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/PendingException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/tools/JarSigner.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/tools/JarSignerResources.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/tools/KeyTool.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/tools/TimestampedSigner.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_de.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_es.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_fr.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_it.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_ja.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_ko.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_sv.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/BigInt.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/BitArray.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/ByteArrayLexOrder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/ByteArrayTagOrder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Cache.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Debug.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/DerEncoder.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/DerInputBuffer.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/DerInputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/DerOutputStream.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/DerValue.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/HostnameChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/ManifestDigester.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Password.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/PathList.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/PendingException.java
@OPENJDK7@/jdk/src/share/classes/sun/security/util/PermissionFactory.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/PolicyUtil.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/PropertyExpander.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_de.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_es.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_fr.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_it.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_ja.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_ko.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_sv.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/ResourcesMgr.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/validator/EndEntityChecker.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/validator/KeyStores.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/validator/PKIXValidator.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/validator/Validator.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/validator/ValidatorException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/AccessDescription.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/AlgIdDSA.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/AttributeNameEnumeration.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/AVA.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/BasicConstraintsExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertAndKeyGen.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertAttrSet.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertException.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateAlgorithmId.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateExtensions.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateIssuerExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateIssuerName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateIssuerUniqueIdentity.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificatePolicyId.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificatePolicyMap.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificatePolicySet.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateSerialNumber.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateSubjectName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateSubjectUniqueIdentity.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateValidity.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateVersion.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertificateX509Key.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CertParseError.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CRLExtensions.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CRLNumberExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/DistributionPoint.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/DistributionPointName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/DNSName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/EDIPartyName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/Extension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/FreshestCRLExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/GeneralName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/GeneralNameInterface.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/GeneralNames.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/GeneralSubtree.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/GeneralSubtrees.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/IPAddressName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/KeyIdentifier.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/KeyUsageExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/NameConstraintsExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/OIDMap.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/OIDName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/OtherName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/PKIXExtensions.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/PolicyInformation.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/PolicyMappingsExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/RDN.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/ReasonFlags.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/RFC822Name.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/SerialNumber.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/UniqueIdentity.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/URIName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X400Address.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X500Name.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X500Signer.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X509AttributeName.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X509Cert.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X509CertInfo.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
-@OPENJDK6@/jdk/src/share/classes/sun/security/x509/X509Key.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/PolicyUtil.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/PropertyExpander.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/ResourcesMgr.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_de.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_es.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_fr.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_it.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_ja.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_ko.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_sv.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/validator/EndEntityChecker.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/validator/KeyStores.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/validator/PKIXValidator.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/validator/Validator.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/validator/ValidatorException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/AccessDescription.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/AlgIdDSA.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/AttributeNameEnumeration.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/AVA.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/BasicConstraintsExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertAndKeyGen.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertAttrSet.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertException.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateAlgorithmId.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateExtensions.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateIssuerExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateIssuerName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateIssuerUniqueIdentity.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificatePolicyId.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificatePolicyMap.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificatePolicySet.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateSerialNumber.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateSubjectName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateSubjectUniqueIdentity.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateValidity.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateVersion.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertificateX509Key.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CertParseError.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CRLExtensions.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CRLNumberExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/DistributionPoint.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/DistributionPointName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/DNSName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/EDIPartyName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/Extension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/FreshestCRLExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/GeneralName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/GeneralNameInterface.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/GeneralNames.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/GeneralSubtree.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/GeneralSubtrees.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/InvalidityDateExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/IPAddressName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/KeyIdentifier.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/KeyUsageExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/NameConstraintsExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/OCSPNoCheckExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/OIDMap.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/OIDName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/OtherName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/PKIXExtensions.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/PolicyInformation.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/PolicyMappingsExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/RDN.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/ReasonFlags.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/RFC822Name.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/SerialNumber.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/UniqueIdentity.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/URIName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/X400Address.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/X500Name.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/X509AttributeName.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/X509CertInfo.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
+@OPENJDK7@/jdk/src/share/classes/sun/security/x509/X509Key.java
@OPENJDK6@/jdk/src/share/classes/sun/swing/AccessibleMethod.java
@OPENJDK6@/jdk/src/share/classes/sun/swing/AccumulativeRunnable.java
@OPENJDK6@/jdk/src/share/classes/sun/swing/BakedArrayList.java
@@ -12808,13 +12858,12 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/tools/asm/StringExpressionConstantData.java
@OPENJDK6@/jdk/src/share/classes/sun/tools/asm/SwitchData.java
@OPENJDK6@/jdk/src/share/classes/sun/tools/asm/TryData.java
-@OPENJDK6@/jdk/src/share/classes/sun/tools/jar/CommandLine.java
-@OPENJDK6@/jdk/src/share/classes/sun/tools/jar/JarException.java
-@OPENJDK6@/jdk/src/share/classes/sun/tools/jar/JarImageSource.java
-@OPENJDK6@/jdk/src/share/classes/sun/tools/jar/JarVerifierStream.java
-@OPENJDK6@/jdk/src/share/classes/sun/tools/jar/Main.java
-@OPENJDK6@/jdk/src/share/classes/sun/tools/jar/Manifest.java
-@OPENJDK6@/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
+@OPENJDK7@/jdk/src/share/classes/sun/tools/jar/CommandLine.java
+@OPENJDK7@/jdk/src/share/classes/sun/tools/jar/JarException.java
+@OPENJDK7@/jdk/src/share/classes/sun/tools/jar/JarImageSource.java
+@OPENJDK7@/jdk/src/share/classes/sun/tools/jar/Main.java
+@OPENJDK7@/jdk/src/share/classes/sun/tools/jar/Manifest.java
+@OPENJDK7@/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
@OPENJDK6@/jdk/src/share/classes/sun/tools/java/AmbiguousClass.java
@OPENJDK6@/jdk/src/share/classes/sun/tools/java/AmbiguousMember.java
@OPENJDK6@/jdk/src/share/classes/sun/tools/java/ArrayType.java
@@ -13029,7 +13078,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
@OPENJDK6@/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferencesFactory.java
@OPENJDK6@/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java
-@OPENJDK6@/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java
+@OPENJDK7@/jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
@OPENJDK6@/jdk/src/windows/classes/com/sun/management/OSMBeanFactory.java
@OPENJDK6@/jdk/src/windows/classes/java/io/Win32FileSystem.java
@OPENJDK6@/jdk/src/windows/classes/java/lang/ProcessEnvironment.java
@@ -13043,10 +13092,10 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/windows/classes/sun/nio/ch/SinkChannelImpl.java
@OPENJDK6@/jdk/src/windows/classes/sun/nio/ch/SourceChannelImpl.java
@OPENJDK6@/jdk/src/windows/classes/sun/print/Win32MediaTray.java
-@OPENJDK6@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java
-@OPENJDK6@/jdk/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
-@OPENJDK6@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java
-@OPENJDK6@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java
+@OPENJDK7@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java
+@OPENJDK7@/jdk/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
+@OPENJDK7@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java
+@OPENJDK7@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java
@OPENJDK6@/jdk/src/windows/classes/sun/security/provider/NativePRNG.java
@OPENJDK6@/jdk/src/windows/classes/sun/security/provider/NativeSeedGenerator.java
@OPENJDK6@/langtools/src/share/classes/com/sun/javadoc/AnnotationDesc.java
diff --git a/openjdk/java/security/ProtectionDomain.java b/openjdk/java/security/ProtectionDomain.java
index fa7995ea..3ceda027 100644
--- a/openjdk/java/security/ProtectionDomain.java
+++ b/openjdk/java/security/ProtectionDomain.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2011, 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
@@ -36,6 +36,8 @@ import static sun.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache;
import sun.misc.SharedSecrets;
import sun.security.util.Debug;
import sun.security.util.SecurityConstants;
+import sun.misc.JavaSecurityAccess;
+import sun.misc.SharedSecrets;
/**
*
@@ -59,6 +61,36 @@ import sun.security.util.SecurityConstants;
public class ProtectionDomain {
+ static {
+ // Set up JavaSecurityAccess in SharedSecrets
+ SharedSecrets.setJavaSecurityAccess(
+ new JavaSecurityAccess() {
+ public <T> T doIntersectionPrivilege(
+ PrivilegedAction<T> action,
+ final AccessControlContext stack,
+ final AccessControlContext context)
+ {
+ if (action == null) {
+ throw new NullPointerException();
+ }
+ return AccessController.doPrivileged(
+ action,
+ new AccessControlContext(
+ stack.getContext(), context).optimize()
+ );
+ }
+
+ public <T> T doIntersectionPrivilege(
+ PrivilegedAction<T> action,
+ AccessControlContext context)
+ {
+ return doIntersectionPrivilege(action,
+ AccessController.getContext(), context);
+ }
+ }
+ );
+ }
+
/* CodeSource */
private CodeSource codesource ;
@@ -397,8 +429,8 @@ public class ProtectionDomain {
int swag = 32;
int vcap = 8;
Enumeration<Permission> e;
- List<Permission> pdVector = new ArrayList<Permission>(vcap);
- List<Permission> plVector = new ArrayList<Permission>(swag);
+ List<Permission> pdVector = new ArrayList<>(vcap);
+ List<Permission> plVector = new ArrayList<>(swag);
//
// Build a vector of domain permissions for subsequent merge
diff --git a/openjdk/map.xml b/openjdk/map.xml
index a2286137..86bc2732 100644
--- a/openjdk/map.xml
+++ b/openjdk/map.xml
@@ -1901,6 +1901,25 @@
</code>
</replace-method-call>
</method>
+ <method name="getJavaSecurityProtectionDomainAccess" sig="()Lsun.misc.JavaSecurityProtectionDomainAccess;">
+ <replace-method-call class="sun.misc.Unsafe" name="ensureClassInitialized" sig="(Ljava.lang.Class;)V">
+ <code>
+ <pop />
+ <pop />
+ <runclassinit class="java.security.ProtectionDomain" />
+ </code>
+ </replace-method-call>
+ </method>
+ <method name="getJavaSecurityAccess" sig="()Lsun.misc.JavaSecurityAccess;">
+ <replace-method-call class="sun.misc.Unsafe" name="ensureClassInitialized" sig="(Ljava.lang.Class;)V">
+ <code>
+ <pop />
+ <pop />
+ <!-- JDK bug: They are initializing AccessController here, but the setJavaSecurityAccess call is in ProtectionDomain -->
+ <runclassinit class="java.security.ProtectionDomain" />
+ </code>
+ </replace-method-call>
+ </method>
</class>
<class name="java.util.concurrent.atomic.AtomicReference">
<method name="compareAndSet" sig="(Ljava.lang.Object;Ljava.lang.Object;)Z">
diff --git a/openjdk/response.txt b/openjdk/response.txt
index 9e185372..456a3521 100644
--- a/openjdk/response.txt
+++ b/openjdk/response.txt
@@ -82,6 +82,7 @@ assembly.class
@OPENJDK7@/jdk/src/share/classes/java/lang/reflect/*.class
@OPENJDK6@/jdk/src/share/classes/java/math/*.class
@OPENJDK6@/jdk/src/share/classes/java/net/*.class
+ @OPENJDK7@/jdk/src/share/classes/java/net/*.class
@OPENJDK6@/jdk/src/share/classes/java/nio/*.class
@OPENJDK6@/jdk/src/share/classes/java/nio/channels/*.class
@OPENJDK7@/jdk/src/share/classes/java/nio/channels/*.class
@@ -91,21 +92,22 @@ assembly.class
@OPENJDK7@/jdk/src/share/classes/java/nio/file/*.class
@OPENJDK7@/jdk/src/share/classes/java/nio/file/attribute/*.class
@OPENJDK7@/jdk/src/share/classes/java/nio/file/spi/*.class
- @OPENJDK6@/jdk/src/share/classes/java/security/*.class
- @OPENJDK6@/jdk/src/share/classes/java/security/cert/*.class
+ @OPENJDK7@/jdk/src/share/classes/java/security/*.class
+ @OPENJDK7@/jdk/src/share/classes/java/security/cert/*.class
@OPENJDK6@/jdk/src/share/classes/java/sql/Timestamp.class
@OPENJDK6@/jdk/src/share/classes/java/util/*.class
@OPENJDK7@/jdk/src/share/classes/java/util/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/concurrent/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/concurrent/atomic/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/concurrent/locks/*.class
- @OPENJDK6@/jdk/src/share/classes/java/util/jar/Attributes*.class
- @OPENJDK6@/jdk/src/share/classes/java/util/jar/Manifest*.class
+ @OPENJDK7@/jdk/src/share/classes/java/util/jar/Attributes*.class
+ @OPENJDK7@/jdk/src/share/classes/java/util/jar/Manifest*.class
@OPENJDK6@/jdk/src/share/classes/java/util/regex/*.class
@OPENJDK6@/jdk/src/share/classes/javax/net/*.class
@OPENJDK6@/jdk/src/share/classes/sun/misc/*.class
@OPENJDK7@/jdk/src/share/classes/sun/misc/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/net/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/ftp/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/idn/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/smtp/*.class
@@ -113,10 +115,12 @@ assembly.class
@OPENJDK6@/jdk/src/share/classes/sun/net/spi/nameservice/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/util/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/www/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/net/www/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/www/content/text/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/net/www/http/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/net/www/http/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/ftp/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/http/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/spnego/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/jar/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/mailto/*.class
@OPENJDK6@/jdk/src/share/classes/sun/nio/*.class
@@ -143,15 +147,15 @@ assembly.class
@OPENJDK6@/jdk/src/share/classes/sun/security/provider/Sun.class
@OPENJDK6@/jdk/src/share/classes/sun/security/provider/SunEntries$1.class
@OPENJDK6@/jdk/src/share/classes/sun/security/provider/SunEntries.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/util/Debug.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/util/Debug.class
@OPENJDK7@/jdk/src/share/classes/sun/security/util/PermissionFactory.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/util/PropertyExpander$ExpandException.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/util/PropertyExpander.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/util/PropertyExpander$ExpandException.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/util/PropertyExpander.class
SecurityConstants*.class
@OPENJDK6@/jdk/src/share/classes/sun/util/*.class
@OPENJDK7@/jdk/src/share/classes/sun/util/logging/*.class
@OPENJDK6@/jdk/src/solaris/classes/java/io/*.class
- @OPENJDK6@/jdk/src/solaris/classes/sun/net/www/protocol/http/*.class
+ @OPENJDK7@/jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/*.class
@OPENJDK6@/jdk/src/windows/classes/java/io/*.class
@OPENJDK6@/jdk/src/windows/classes/java/lang/*.class
@OPENJDK6@/jdk/src/windows/classes/java/net/*.class
@@ -160,7 +164,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Corba.dll
- -baseaddress:0x569F0000
+ -baseaddress:0x56A20000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/corba/*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/cosnaming/jndiprovider.properties
@OPENJDK6@/build/linux-amd64/impsrc/com/sun/corba/se/impl/activation/*.class
@@ -278,7 +282,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.API.dll
- -baseaddress:0x57050000
+ -baseaddress:0x57080000
@OPENJDK6@/build/linux-amd64/impsrc/javax/xml/*.class
@OPENJDK6@/build/linux-amd64/impsrc/javax/xml/datatype/*.class
@OPENJDK6@/build/linux-amd64/impsrc/javax/xml/namespace/*.class
@@ -310,7 +314,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.XPath.dll
- -baseaddress:0x57110000
+ -baseaddress:0x57140000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xalan/internal/res/*
@OPENJDK6@/build/linux-amd64/impsrc/com/sun/org/apache/xalan/internal/extensions/*.class
@OPENJDK6@/build/linux-amd64/impsrc/com/sun/org/apache/xalan/internal/res/*.class
@@ -335,7 +339,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.Parse.dll
- -baseaddress:0x57440000
+ -baseaddress:0x57470000
-resource:com/sun/org/apache/xml/internal/serialize/HTMLEntities.res=@OPENJDK6@/build/linux-amd64/impsrc/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xerces/*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xml/internal/serializer/*
@@ -394,7 +398,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.Transform.dll
- -baseaddress:0x57AD0000
+ -baseaddress:0x57B00000
@OPENJDK6@/build/linux-amd64/impsrc/com/sun/java_cup/internal/runtime/*.class
@OPENJDK6@/build/linux-amd64/impsrc/com/sun/org/apache/bcel/internal/*.class
@OPENJDK6@/build/linux-amd64/impsrc/com/sun/org/apache/bcel/internal/classfile/*.class
@@ -418,7 +422,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.Bind.dll
- -baseaddress:0x57EF0000
+ -baseaddress:0x57F20000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/javax/xml/bind/*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/bind/*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/fastinfoset/*
@@ -477,7 +481,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.WebServices.dll
- -baseaddress:0x58250000
+ -baseaddress:0x58280000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/messaging/*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/ws/*
@OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/messaging/saaj/*.class
@@ -570,7 +574,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.Crypto.dll
- -baseaddress:0x586D0000
+ -baseaddress:0x58700000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xml/internal/security/*
@OPENJDK6@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/*.class
@@ -606,7 +610,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.SwingAWT.dll
- -baseaddress:0x58820000
+ -baseaddress:0x58850000
-remap:swingawt.xml
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/sun.java2d.*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/java/swing/*
@@ -701,19 +705,19 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Charsets.dll
- -baseaddress:0x59960000
+ -baseaddress:0x59990000
@OPENJDK6@/jdk/src/share/classes/sun/io/*.class
@OPENJDK6@/jdk/src/share/classes/sun/nio/cs/ext/*.class
}
{
-out:IKVM.OpenJDK.Util.dll
- -baseaddress:0x5A7A0000
+ -baseaddress:0x5A7D0000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/java/util/jar/pack/intrinsic.properties
java/util/zip/*.class
@OPENJDK6@/build/linux-amd64/gensrc/sun/util/logging/resources/*.class
@OPENJDK6@/build/linux-amd64/gensrc/sun/util/resources/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/java/util/jar/pack/*.class
- @OPENJDK6@/jdk/src/share/classes/java/util/jar/*.class
+ @OPENJDK7@/jdk/src/share/classes/java/util/jar/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/logging/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/prefs/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/spi/*.class
@@ -725,7 +729,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Text.dll
- -baseaddress:0x5ABC0000
+ -baseaddress:0x5ABF0000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/sun/text/*
java/text/*.class
@OPENJDK6@/jdk/src/share/classes/java/text/*.class
@@ -736,72 +740,75 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Security.dll
- -baseaddress:0x5ADA0000
+ -baseaddress:0x5ADD0000
sun/security/jgss/wrapper/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/crypto/provider/*.class
- @OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/*.class
- @OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/*.class
- @OPENJDK6@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/*.class
+ @OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/*.class
+ @OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/*.class
+ @OPENJDK7@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/callback/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/login/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/auth/module/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/cert/internal/x509/*.class
- @OPENJDK6@/jdk/src/share/classes/com/sun/security/jgss/*.class
+ @OPENJDK7@/jdk/src/share/classes/com/sun/security/jgss/*.class
+ @OPENJDK7@/jdk/src/share/classes/com/sun/security/ntlm/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/sasl/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/sasl/digest/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/sasl/gsskerb/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/security/sasl/util/*.class
- @OPENJDK6@/jdk/src/share/classes/java/security/acl/*.class
- @OPENJDK6@/jdk/src/share/classes/java/security/interfaces/*.class
- @OPENJDK6@/jdk/src/share/classes/java/security/spec/*.class
+ @OPENJDK7@/jdk/src/share/classes/java/security/acl/*.class
+ @OPENJDK7@/jdk/src/share/classes/java/security/interfaces/*.class
+ @OPENJDK7@/jdk/src/share/classes/java/security/spec/*.class
@OPENJDK6@/jdk/src/share/classes/javax/crypto/*.class
@OPENJDK6@/jdk/src/share/classes/javax/crypto/interfaces/*.class
@OPENJDK6@/jdk/src/share/classes/javax/crypto/spec/*.class
- @OPENJDK6@/jdk/src/share/classes/javax/net/ssl/*.class
+ @OPENJDK7@/jdk/src/share/classes/javax/net/ssl/*.class
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/*.class
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/callback/*.class
- @OPENJDK6@/jdk/src/share/classes/javax/security/auth/kerberos/*.class
+ @OPENJDK7@/jdk/src/share/classes/javax/security/auth/kerberos/*.class
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/login/*.class
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/spi/*.class
@OPENJDK6@/jdk/src/share/classes/javax/security/auth/x500/*.class
@OPENJDK6@/jdk/src/share/classes/javax/security/cert/*.class
@OPENJDK6@/jdk/src/share/classes/javax/security/sasl/*.class
@OPENJDK6@/jdk/src/share/classes/org/ietf/jgss/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/net/www/protocol/https/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/http/ntlm/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/net/www/protocol/https/*.class
@OPENJDK6@/jdk/src/share/classes/sun/security/acl/*.class
@OPENJDK6@/jdk/src/share/classes/sun/security/ec/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/internal/interfaces/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/internal/spec/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/jgss/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/jgss/krb5/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spi/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/jgss/spnego/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/krb5/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ccache/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/ktab/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/rcache/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/krb5/internal/util/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/pkcs/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/internal/interfaces/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/internal/spec/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/jgss/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/jgss/krb5/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spi/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/jgss/spnego/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/krb5/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ccache/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/ktab/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/rcache/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/krb5/internal/util/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/pkcs/*.class
@OPENJDK6@/jdk/src/share/classes/sun/security/pkcs12/*.class
@OPENJDK6@/jdk/src/share/classes/sun/security/provider/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/provider/certpath/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/provider/certpath/ldap/*.class
@OPENJDK6@/jdk/src/share/classes/sun/security/rsa/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/ssl/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/ssl/*.class
@OPENJDK6@/jdk/src/share/classes/sun/security/timestamp/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/util/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/validator/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/x509/*.class
- @OPENJDK6@/jdk/src/windows/classes/sun/security/krb5/internal/tools/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/util/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/validator/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/x509/*.class
+ @OPENJDK7@/jdk/src/windows/classes/sun/security/krb5/internal/tools/*.class
@OPENJDK6@/jdk/src/windows/classes/sun/security/provider/*.class
}
{
-out:IKVM.OpenJDK.Management.dll
- -baseaddress:0x5B4C0000
+ -baseaddress:0x5B580000
com/sun/management/*.class
ConnectorBootstrap$DefaultValues.class
ConnectorBootstrap.class
@@ -845,7 +852,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Misc.dll
- -baseaddress:0x5B8B0000
+ -baseaddress:0x5B970000
@OPENJDK6@/build/linux-amd64/impsrc/javax/activity/*.class
@OPENJDK6@/build/linux-amd64/impsrc/javax/annotation/*.class
@OPENJDK6@/build/linux-amd64/impsrc/javax/annotation/processing/*.class
@@ -935,7 +942,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Naming.dll
- -baseaddress:0x5B970000
+ -baseaddress:0x5BA30000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/ldap/jndiprovider.properties
sun/net/dns/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/jndi/dns/*.class
@@ -960,7 +967,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Jdbc.dll
- -baseaddress:0x5BAC0000
+ -baseaddress:0x5BB80000
-resource:META-INF/services/java.sql.Driver=resources/META-INF/services/java.sql.Driver
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/rowset/*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/javax/sql/*
@@ -978,7 +985,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Remoting.dll
- -baseaddress:0x5BC10000
+ -baseaddress:0x5BCD0000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/sun/rmi/*
@OPENJDK6@/build/linux-amd64/classes/com/sun/jndi/rmi/registry/*.class
@OPENJDK6@/build/linux-amd64/classes/java/rmi/activation/*.class
@@ -1004,7 +1011,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Beans.dll
- -baseaddress:0x5BD30000
+ -baseaddress:0x5BDF0000
@OPENJDK6@/build/linux-amd64/impsrc/com/sun/activation/registries/*.class
@OPENJDK6@/build/linux-amd64/impsrc/javax/activation/*.class
@OPENJDK6@/jdk/src/share/classes/com/sun/beans/*.class
@@ -1016,7 +1023,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Media.dll
- -baseaddress:0x5BDF0000
+ -baseaddress:0x5BEB0000
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/javax.print.*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/javax.sound.*
-recurse:@OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/imageio/plugins/common/iio-plugin.properties
diff --git a/openjdk/sun/misc/SharedSecrets.java b/openjdk/sun/misc/SharedSecrets.java
index 84e01391..f273c6cf 100644
--- a/openjdk/sun/misc/SharedSecrets.java
+++ b/openjdk/sun/misc/SharedSecrets.java
@@ -28,8 +28,9 @@ package sun.misc;
import java.util.jar.JarFile;
import java.io.Console;
import java.security.ProtectionDomain;
+import javax.security.auth.kerberos.KeyTab;
-import java.security.AccessControlContext;
+import java.security.AccessController;
/** A repository of "shared secrets", which are a mechanism for
calling implementation-private methods in another package without
@@ -48,6 +49,7 @@ public class SharedSecrets {
private static JavaNetAccess javaNetAccess;
private static JavaSecurityProtectionDomainAccess javaSecurityProtectionDomainAccess;
private static JavaSecurityAccess javaSecurityAccess;
+ private static JavaxSecurityAuthKerberosAccess javaxSecurityAuthKerberosAccess;
public static JavaUtilJarAccess javaUtilJarAccess() {
if (javaUtilJarAccess == null) {
@@ -103,8 +105,20 @@ public class SharedSecrets {
public static JavaSecurityAccess getJavaSecurityAccess() {
if (javaSecurityAccess == null) {
- unsafe.ensureClassInitialized(AccessControlContext.class);
+ unsafe.ensureClassInitialized(AccessController.class);
}
return javaSecurityAccess;
}
+
+ public static void setJavaxSecurityAuthKerberosAccess
+ (JavaxSecurityAuthKerberosAccess jsaka) {
+ javaxSecurityAuthKerberosAccess = jsaka;
+ }
+
+ public static JavaxSecurityAuthKerberosAccess
+ getJavaxSecurityAuthKerberosAccess() {
+ if (javaxSecurityAuthKerberosAccess == null)
+ unsafe.ensureClassInitialized(KeyTab.class);
+ return javaxSecurityAuthKerberosAccess;
+ }
}
diff --git a/openjdk/sun/security/jgss/wrapper/SunNativeProvider.java b/openjdk/sun/security/jgss/wrapper/SunNativeProvider.java
index 69b89b8c..42e027df 100644
--- a/openjdk/sun/security/jgss/wrapper/SunNativeProvider.java
+++ b/openjdk/sun/security/jgss/wrapper/SunNativeProvider.java
@@ -27,8 +27,14 @@ package sun.security.jgss.wrapper;
// this is a compilation stub only
public final class SunNativeProvider extends java.security.Provider
{
+ public static final SunNativeProvider INSTANCE = new SunNativeProvider();
+
public SunNativeProvider()
{
super(null, 0.0, null);
}
+
+ static void debug(String message)
+ {
+ }
}
diff --git a/openjdk/tools.rsp b/openjdk/tools.rsp
index 17386881..888faf2a 100644
--- a/openjdk/tools.rsp
+++ b/openjdk/tools.rsp
@@ -155,9 +155,9 @@
@OPENJDK6@/jdk/src/share/classes/sun/rmi/rmic/*.class
@OPENJDK6@/jdk/src/share/classes/sun/rmi/rmic/newrmic/*.class
@OPENJDK6@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/security/tools/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/security/tools/*.class
@OPENJDK6@/jdk/src/share/classes/sun/tools/asm/*.class
- @OPENJDK6@/jdk/src/share/classes/sun/tools/jar/*.class
+ @OPENJDK7@/jdk/src/share/classes/sun/tools/jar/*.class
@OPENJDK6@/jdk/src/share/classes/sun/tools/java/*.class
@OPENJDK6@/jdk/src/share/classes/sun/tools/javac/*.class
@OPENJDK6@/jdk/src/share/classes/sun/tools/native2ascii/*.class
diff --git a/runtime/openjdk.cs b/runtime/openjdk.cs
index 37ce9259..21185dcc 100644
--- a/runtime/openjdk.cs
+++ b/runtime/openjdk.cs
@@ -8008,8 +8008,12 @@ namespace IKVM.NativeCode.sun.security.krb5
static class Config
{
- public static string getWindowsDirectory()
+ public static string getWindowsDirectory(bool isSystem)
{
+ if (isSystem)
+ {
+ return Environment.SystemDirectory;
+ }
return Environment.GetEnvironmentVariable("SystemRoot");
}
}