diff options
Diffstat (limited to 'libjava/javax/security')
13 files changed, 12 insertions, 21 deletions
diff --git a/libjava/javax/security/auth/Subject.java b/libjava/javax/security/auth/Subject.java index 5391acec825..37baecc8aed 100644 --- a/libjava/javax/security/auth/Subject.java +++ b/libjava/javax/security/auth/Subject.java @@ -235,7 +235,7 @@ public final class Subject implements Serializable */ public static Object doAsPrivileged (final Subject subject, final PrivilegedExceptionAction action, - final AccessControlContext acc) + AccessControlContext acc) throws PrivilegedActionException { final SecurityManager sm = System.getSecurityManager(); @@ -243,6 +243,8 @@ public final class Subject implements Serializable { sm.checkPermission (new AuthPermission ("doAsPrivileged")); } + if (acc == null) + acc = new AccessControlContext (new java.security.ProtectionDomain[0]); AccessControlContext context = new AccessControlContext (acc, new SubjectDomainCombiner (subject)); return AccessController.doPrivileged (action, context); diff --git a/libjava/javax/security/auth/callback/Callback.java b/libjava/javax/security/auth/callback/Callback.java index 655ad3348ba..71932cb0f13 100644 --- a/libjava/javax/security/auth/callback/Callback.java +++ b/libjava/javax/security/auth/callback/Callback.java @@ -59,7 +59,6 @@ package javax.security.auth.callback; * @see PasswordCallback * @see TextInputCallback * @see TextOutputCallback - * @version $Revision: 1.1 $ */ public interface Callback { } diff --git a/libjava/javax/security/auth/callback/CallbackHandler.java b/libjava/javax/security/auth/callback/CallbackHandler.java index 289999c5ee1..ed1195a89e3 100644 --- a/libjava/javax/security/auth/callback/CallbackHandler.java +++ b/libjava/javax/security/auth/callback/CallbackHandler.java @@ -80,7 +80,6 @@ import java.io.IOException; * <p>All default handler implementations must provide a public zero-argument * constructor.</p> * - * @version $Revision: 1.1 $ */ public interface CallbackHandler { diff --git a/libjava/javax/security/auth/callback/ChoiceCallback.java b/libjava/javax/security/auth/callback/ChoiceCallback.java index 44b5ffcba5e..8fd038edf70 100644 --- a/libjava/javax/security/auth/callback/ChoiceCallback.java +++ b/libjava/javax/security/auth/callback/ChoiceCallback.java @@ -47,7 +47,6 @@ import java.io.Serializable; * selected choice(s). * * @see CallbackHandler - * @version $Revision: 1.1 $ */ public class ChoiceCallback implements Callback, Serializable { diff --git a/libjava/javax/security/auth/callback/ConfirmationCallback.java b/libjava/javax/security/auth/callback/ConfirmationCallback.java index 8abd393f52c..aa912189fb2 100644 --- a/libjava/javax/security/auth/callback/ConfirmationCallback.java +++ b/libjava/javax/security/auth/callback/ConfirmationCallback.java @@ -47,7 +47,6 @@ import java.io.Serializable; * similar confirmations. * * @see CallbackHandler - * @version $Revision: 1.1 $ */ public class ConfirmationCallback implements Callback, Serializable { @@ -254,7 +253,7 @@ public class ConfirmationCallback implements Callback, Serializable * NO, CANCEL or OK). * @throws IllegalArgumentException if <code>prompt</code> is <code>null</code>, * if <code>prompt</code> has a length of <code>0</code>, if - * <code>messageType</code> is not either <ode>INFORMATION</code>, + * <code>messageType</code> is not either <code>INFORMATION</code>, * <code>WARNING</code>, or <code>ERROR</code>, if <code>optionType</code> is * not either <code>YES_NO_OPTION</code>, <code>YES_NO_CANCEL_OPTION</code>, * or <code>OK_CANCEL_OPTION</code>, or if <code>defaultOption</code> does @@ -289,7 +288,7 @@ public class ConfirmationCallback implements Callback, Serializable * <code>options</code> array. * @throws IllegalArgumentException if <code>prompt</code> is <code>null</code>, * if <code>prompt</code> has a length of <code>0</code>, if - * <code>messageType</code> is not either <ode>INFORMATION</code>, + * <code>messageType</code> is not either <code>INFORMATION</code>, * <code>WARNING</code>, or <code>ERROR</code>, if <code>options</code> is * <code>null</code>, if <code>options</code> has a length of <code>0</code>, * if any element from <code>options</code> is <code>null</code>, if any diff --git a/libjava/javax/security/auth/callback/LanguageCallback.java b/libjava/javax/security/auth/callback/LanguageCallback.java index 71910632b48..b53149adcb3 100644 --- a/libjava/javax/security/auth/callback/LanguageCallback.java +++ b/libjava/javax/security/auth/callback/LanguageCallback.java @@ -47,7 +47,6 @@ import java.util.Locale; * the {@link Locale} used for localizing text. * * @see CallbackHandler - * @version $Revision: 1.1 $ */ public class LanguageCallback implements Callback, Serializable { diff --git a/libjava/javax/security/auth/callback/NameCallback.java b/libjava/javax/security/auth/callback/NameCallback.java index c98edfdbea9..094349e19a0 100644 --- a/libjava/javax/security/auth/callback/NameCallback.java +++ b/libjava/javax/security/auth/callback/NameCallback.java @@ -46,7 +46,6 @@ import java.io.Serializable; * name information. * * @see CallbackHandler - * @version $Revision: 1.1 $ */ public class NameCallback implements Callback, Serializable { diff --git a/libjava/javax/security/auth/callback/PasswordCallback.java b/libjava/javax/security/auth/callback/PasswordCallback.java index 5620bc5cd79..7e5f9cb7cab 100644 --- a/libjava/javax/security/auth/callback/PasswordCallback.java +++ b/libjava/javax/security/auth/callback/PasswordCallback.java @@ -46,7 +46,6 @@ import java.io.Serializable; * password information. * * @see CallbackHandler, - * @version $Revision: 1.1 $ */ public class PasswordCallback implements Callback, Serializable { diff --git a/libjava/javax/security/auth/callback/TextInputCallback.java b/libjava/javax/security/auth/callback/TextInputCallback.java index 55c1aa2534d..01b544cb24b 100644 --- a/libjava/javax/security/auth/callback/TextInputCallback.java +++ b/libjava/javax/security/auth/callback/TextInputCallback.java @@ -46,7 +46,6 @@ import java.io.Serializable; * generic text information. * * @see CallbackHandler - * @version $Revision: 1.1 $ */ public class TextInputCallback implements Callback, Serializable { diff --git a/libjava/javax/security/auth/callback/TextOutputCallback.java b/libjava/javax/security/auth/callback/TextOutputCallback.java index 380a5ef60f0..47202bcaa72 100644 --- a/libjava/javax/security/auth/callback/TextOutputCallback.java +++ b/libjava/javax/security/auth/callback/TextOutputCallback.java @@ -47,7 +47,6 @@ import java.io.Serializable; * error messages.</p> * * @see CallbackHandler - * @version $Revision: 1.2 $ */ public class TextOutputCallback implements Callback, Serializable { diff --git a/libjava/javax/security/auth/callback/UnsupportedCallbackException.java b/libjava/javax/security/auth/callback/UnsupportedCallbackException.java index 215942c40b5..167a5e23671 100644 --- a/libjava/javax/security/auth/callback/UnsupportedCallbackException.java +++ b/libjava/javax/security/auth/callback/UnsupportedCallbackException.java @@ -42,7 +42,6 @@ package javax.security.auth.callback; * Signals that a {@link CallbackHandler} does not recognize a particular * {@link Callback}. * - * @version $Revision: 1.1 $ */ public class UnsupportedCallbackException extends Exception { diff --git a/libjava/javax/security/sasl/Sasl.java b/libjava/javax/security/sasl/Sasl.java index 334aac602ba..257198b0e45 100644 --- a/libjava/javax/security/sasl/Sasl.java +++ b/libjava/javax/security/sasl/Sasl.java @@ -1,5 +1,5 @@ /* Sasl.java -- - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -221,7 +221,7 @@ public class Sasl * breaking into future sessions. The property contains <code>"true"</code> * if mechanisms that implement forward secrecy between sessions are * required; <code>"false"</code> if such mechanisms are not required. The - * default is <code>"false"</code>.</p> + * default is <code>"false"</code>. * * <p>The value of this constant is <code>"javax.security.sasl.policy.forward"</code>. * </p> @@ -233,7 +233,6 @@ public class Sasl * credentials are required. The property contains <code>"true"</code> if * mechanisms that pass client credentials are required; <code>"false"</code> * if such mechanisms are not required. The default is <code>"false"</code>. - * </p> * * <p>The value of this constant is <code>"javax.security.sasl.policy.credentials"</code>. * </p> @@ -280,7 +279,7 @@ public class Sasl // ------------------------------------------------------------------------- /** - * <p>Creates a {@link SaslClient} for the specified mechanism.</p> + * Creates a {@link SaslClient} for the specified mechanism. * * <p>This method uses the JCA Security Provider Framework, described in the * "Java Cryptography Architecture API Specification & Reference", for @@ -490,7 +489,7 @@ public class Sasl } /** - * <p>Creates a {@link SaslServer} for the specified mechanism.</p> + * Creates a {@link SaslServer} for the specified mechanism. * * <p>This method uses the JCA Security Provider Framework, described in the * "Java Cryptography Architecture API Specification & Reference", for @@ -521,7 +520,7 @@ public class Sasl * * <pre> * SaslServerFactory.DIGEST-MD5 com.wiz.sasl.digest.ServerFactory - * </pre></p> + * </pre> * * <p>See the "Java Cryptography Architecture API Specification & * Reference" for information about how to install and configure security diff --git a/libjava/javax/security/sasl/SaslServerFactory.java b/libjava/javax/security/sasl/SaslServerFactory.java index 1299634d8b5..d2f279190fa 100644 --- a/libjava/javax/security/sasl/SaslServerFactory.java +++ b/libjava/javax/security/sasl/SaslServerFactory.java @@ -48,8 +48,8 @@ import javax.security.auth.callback.CallbackHandler; * simultaneous requests. It must also have a public constructor that accepts * no arguments.</p> * - * This interface is not normally accessed directly by a server, which will use - * the {@link Sasl} static methods to create a {@link SaslServer} instance + * <p>This interface is not normally accessed directly by a server, which will + * use the {@link Sasl} static methods to create a {@link SaslServer} instance * instead. However, a particular environment may provide and install a new or * different <code>SaslServerFactory</code>.</p> * |