From ac51e4d10caf33153f1ffcd1622a5ec212210ffe Mon Sep 17 00:00:00 2001 From: weijun Date: Fri, 27 May 2011 09:01:33 +0800 Subject: [PATCH] 7048466: Move sun.misc.JavaxSecurityAuthKerberosAccess to sun.security.krb5 package Reviewed-by: weijun, alanb Contributed-by: Mandy Chung --- .../JavaxSecurityAuthKerberosAccessImpl.java | 2 +- .../javax/security/auth/kerberos/KeyTab.java | 6 +-- src/share/classes/sun/misc/SharedSecrets.java | 14 ------ .../sun/security/jgss/krb5/Krb5Util.java | 4 +- .../JavaxSecurityAuthKerberosAccess.java | 2 +- .../sun/security/krb5/KerberosSecrets.java | 46 +++++++++++++++++++ 6 files changed, 53 insertions(+), 21 deletions(-) rename src/share/classes/sun/{misc => security/krb5}/JavaxSecurityAuthKerberosAccess.java (98%) create mode 100644 src/share/classes/sun/security/krb5/KerberosSecrets.java diff --git a/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java b/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java index 56ed40eed..4b20626ec 100644 --- a/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java +++ b/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java @@ -25,7 +25,7 @@ package javax.security.auth.kerberos; -import sun.misc.JavaxSecurityAuthKerberosAccess; +import sun.security.krb5.JavaxSecurityAuthKerberosAccess; import sun.security.krb5.EncryptionKey; import sun.security.krb5.PrincipalName; diff --git a/src/share/classes/javax/security/auth/kerberos/KeyTab.java b/src/share/classes/javax/security/auth/kerberos/KeyTab.java index c2f8dd794..3ebce9975 100644 --- a/src/share/classes/javax/security/auth/kerberos/KeyTab.java +++ b/src/share/classes/javax/security/auth/kerberos/KeyTab.java @@ -27,8 +27,8 @@ package javax.security.auth.kerberos; import java.io.File; import java.util.Objects; -import sun.misc.SharedSecrets; import sun.security.krb5.EncryptionKey; +import sun.security.krb5.KerberosSecrets; import sun.security.krb5.PrincipalName; import sun.security.krb5.RealmException; @@ -74,9 +74,9 @@ public final class KeyTab { // is maintained in snapshot, this field is never "resolved". private final File file; - // Set up JavaxSecurityAuthKerberosAccess in SharedSecrets + // Set up JavaxSecurityAuthKerberosAccess in KerberosSecrets static { - SharedSecrets.setJavaxSecurityAuthKerberosAccess( + KerberosSecrets.setJavaxSecurityAuthKerberosAccess( new JavaxSecurityAuthKerberosAccessImpl()); } diff --git a/src/share/classes/sun/misc/SharedSecrets.java b/src/share/classes/sun/misc/SharedSecrets.java index 969da9a74..0bd39b4a5 100644 --- a/src/share/classes/sun/misc/SharedSecrets.java +++ b/src/share/classes/sun/misc/SharedSecrets.java @@ -29,7 +29,6 @@ import java.util.jar.JarFile; import java.io.Console; import java.io.FileDescriptor; import java.security.ProtectionDomain; -import javax.security.auth.kerberos.KeyTab; import java.security.AccessController; @@ -52,7 +51,6 @@ public class SharedSecrets { private static JavaIOFileDescriptorAccess javaIOFileDescriptorAccess; private static JavaSecurityProtectionDomainAccess javaSecurityProtectionDomainAccess; private static JavaSecurityAccess javaSecurityAccess; - private static JavaxSecurityAuthKerberosAccess javaxSecurityAuthKerberosAccess; public static JavaUtilJarAccess javaUtilJarAccess() { if (javaUtilJarAccess == null) { @@ -141,16 +139,4 @@ public class SharedSecrets { } 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/src/share/classes/sun/security/jgss/krb5/Krb5Util.java b/src/share/classes/sun/security/jgss/krb5/Krb5Util.java index 22552a71c..c51138823 100644 --- a/src/share/classes/sun/security/jgss/krb5/Krb5Util.java +++ b/src/share/classes/sun/security/jgss/krb5/Krb5Util.java @@ -44,7 +44,7 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Set; -import sun.misc.SharedSecrets; +import sun.security.krb5.KerberosSecrets; import sun.security.krb5.PrincipalName; /** * Utilities for obtaining and converting Kerberos tickets. @@ -378,7 +378,7 @@ public class Krb5Util { */ public static EncryptionKey[] keysFromJavaxKeyTab( KeyTab ktab, PrincipalName cname) { - return SharedSecrets.getJavaxSecurityAuthKerberosAccess(). + return KerberosSecrets.getJavaxSecurityAuthKerberosAccess(). keyTabGetEncryptionKeys(ktab, cname); } diff --git a/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java b/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java similarity index 98% rename from src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java rename to src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java index 9c8f9f2d3..3992e4871 100644 --- a/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java +++ b/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java @@ -23,7 +23,7 @@ * questions. */ -package sun.misc; +package sun.security.krb5; import javax.security.auth.kerberos.KeyTab; import sun.security.krb5.EncryptionKey; diff --git a/src/share/classes/sun/security/krb5/KerberosSecrets.java b/src/share/classes/sun/security/krb5/KerberosSecrets.java new file mode 100644 index 000000000..44f2f0f94 --- /dev/null +++ b/src/share/classes/sun/security/krb5/KerberosSecrets.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package sun.security.krb5; + +import javax.security.auth.kerberos.KeyTab; +import sun.misc.Unsafe; + +public class KerberosSecrets { + private static final Unsafe unsafe = Unsafe.getUnsafe(); + private static JavaxSecurityAuthKerberosAccess javaxSecurityAuthKerberosAccess; + + public static void setJavaxSecurityAuthKerberosAccess + (JavaxSecurityAuthKerberosAccess jsaka) { + javaxSecurityAuthKerberosAccess = jsaka; + } + + public static JavaxSecurityAuthKerberosAccess + getJavaxSecurityAuthKerberosAccess() { + if (javaxSecurityAuthKerberosAccess == null) + unsafe.ensureClassInitialized(KeyTab.class); + return javaxSecurityAuthKerberosAccess; + } +} -- GitLab