diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 16c71d7c2b95..93b636480680 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,6 +1,73 @@ +2002-05-24 Bryce McKinlay + + Merge JDK 1.4 java.security changes from classpath. + + * java/security/AccessControlException.java: Merge from Classpath. + * java/security/AccessController.java: Likewise. + * java/security/AllPermission.java: Likewise. + * java/security/BasicPermission.java: Likewise. + * java/security/Certificate.java: Likewise. + * java/security/CodeSource.java: Likewise. + * java/security/DigestException.java: Likewise. + * java/security/DigestOutputStream.java: Likewise. + * java/security/DomainCombiner.java: Likewise. + * java/security/GeneralSecurityException.java: Likewise. + * java/security/Guard.java: Likewise. + * java/security/GuardedObject.java: Likewise. + * java/security/InvalidAlgorithmParameterException.java: Likewise. + * java/security/InvalidKeyException.java: Likewise. + * java/security/InvalidParameterException.java: Likewise. + * java/security/Key.java: Likewise. + * java/security/KeyException.java: Likewise. + * java/security/KeyManagementException.java: Likewise. + * java/security/KeyStoreException.java: Likewise. + * java/security/MessageDigest.java: Likewise. + * java/security/NoSuchAlgorithmException.java: Likewise. + * java/security/NoSuchProviderException.java: Likewise. + * java/security/Permission.java: Likewise. + * java/security/PermissionCollection.java: Likewise. + * java/security/Permissions.java: Likewise. + * java/security/Policy.java: Likewise. + * java/security/Principal.java: Likewise. + * java/security/PrivateKey.java: Likewise. + * java/security/PrivilegedAction.java: Likewise. + * java/security/PrivilegedActionException.java: Likewise. + * java/security/PrivilegedExceptionAction.java: Likewise. + * java/security/ProtectionDomain.java: Likewise. + * java/security/ProviderException.java: Likewise. + * java/security/PublicKey.java: Likewise. + * java/security/SecureClassLoader.java: Likewise. + * java/security/SecurityPermission.java: Likewise. + * java/security/SignatureException.java: Likewise. + * java/security/UnrecoverableKeyException.java: Likewise. + * java/security/UnresolvedPermission.java: Likewise. + * java/security/acl/AclNotFoundException.java: Likewise. + * java/security/acl/LastOwnerException.java: Likewise. + * java/security/acl/NotOwnerException.java: Likewise. + * java/security/cert/CRLException.java: Likewise. + * java/security/cert/CertificateEncodingException.java: Likewise. + * java/security/cert/CertificateException.java: Likewise. + * java/security/cert/CertificateExpiredException.java: Likewise. + * java/security/cert/CertificateFactory.java: Likewise. + * java/security/cert/CertificateNotYetValidException.java: Likewise. + * java/security/cert/CertificateParsingException.java: Likewise. + * java/security/spec/InvalidKeySpecException.java: Likewise. + * java/security/spec/InvalidParameterSpecException.java: Likewise. + + * java/security/cert/CertPath.java: New file. + * java/security/cert/CertPathBuilderException.java: New file. + * java/security/cert/CertPathValidatorException.java: New file. + * java/security/cert/CertStoreException.java: New file. + + * Makefile.am: Add new CertPath classes. + * Makefile.in: Rebuilt. + + * gnu/java/util/EmptyEnumeration.java: New file from classpath. + 2002-05-24 Bryce McKinlay Merge JDK 1.4 exception chaining support from classpath. + * java/lang/Throwable.java: Merge 1.4 support from classpath. (stackTraceBytes): Rename from stackTrace. * java/lang/Exception.java: Merge from classpath. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index a96a3cccb182..a959fdbba5e6 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -1422,6 +1422,7 @@ gnu/java/text/LineBreakIterator.java \ gnu/java/text/SentenceBreakIterator.java \ gnu/java/text/WordBreakIterator.java \ gnu/java/util/DoubleEnumeration.java \ +gnu/java/util/EmptyEnumeration.java \ java/lang/ref/PhantomReference.java \ java/lang/ref/Reference.java \ java/lang/ref/ReferenceQueue.java \ @@ -1558,6 +1559,10 @@ java/security/cert/CertificateFactory.java \ java/security/cert/CertificateFactorySpi.java \ java/security/cert/CertificateNotYetValidException.java \ java/security/cert/CertificateParsingException.java \ +java/security/cert/CertPath.java \ +java/security/cert/CertPathBuilderException.java \ +java/security/cert/CertPathValidatorException.java \ +java/security/cert/CertStoreException.java \ java/security/cert/X509CRL.java \ java/security/cert/X509CRLEntry.java \ java/security/cert/X509Certificate.java \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 8fff46ef37ed..6c4a9001a847 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1184,6 +1184,7 @@ gnu/java/text/LineBreakIterator.java \ gnu/java/text/SentenceBreakIterator.java \ gnu/java/text/WordBreakIterator.java \ gnu/java/util/DoubleEnumeration.java \ +gnu/java/util/EmptyEnumeration.java \ java/lang/ref/PhantomReference.java \ java/lang/ref/Reference.java \ java/lang/ref/ReferenceQueue.java \ @@ -1320,6 +1321,10 @@ java/security/cert/CertificateFactory.java \ java/security/cert/CertificateFactorySpi.java \ java/security/cert/CertificateNotYetValidException.java \ java/security/cert/CertificateParsingException.java \ +java/security/cert/CertPath.java \ +java/security/cert/CertPathBuilderException.java \ +java/security/cert/CertPathValidatorException.java \ +java/security/cert/CertStoreException.java \ java/security/cert/X509CRL.java \ java/security/cert/X509CRLEntry.java \ java/security/cert/X509Certificate.java \ @@ -2018,7 +2023,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/text/LineBreakIterator.P \ .deps/gnu/java/text/SentenceBreakIterator.P \ .deps/gnu/java/text/WordBreakIterator.P \ -.deps/gnu/java/util/DoubleEnumeration.P .deps/interpret.P \ +.deps/gnu/java/util/DoubleEnumeration.P \ +.deps/gnu/java/util/EmptyEnumeration.P .deps/interpret.P \ .deps/java/applet/Applet.P .deps/java/applet/AppletContext.P \ .deps/java/applet/AppletStub.P .deps/java/applet/AudioClip.P \ .deps/java/awt/AWTError.P .deps/java/awt/AWTEvent.P \ @@ -2454,6 +2460,10 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/security/acl/NotOwnerException.P \ .deps/java/security/acl/Owner.P .deps/java/security/acl/Permission.P \ .deps/java/security/cert/CRL.P .deps/java/security/cert/CRLException.P \ +.deps/java/security/cert/CertPath.P \ +.deps/java/security/cert/CertPathBuilderException.P \ +.deps/java/security/cert/CertPathValidatorException.P \ +.deps/java/security/cert/CertStoreException.P \ .deps/java/security/cert/Certificate.P \ .deps/java/security/cert/CertificateEncodingException.P \ .deps/java/security/cert/CertificateException.P \ diff --git a/libjava/gnu/java/util/EmptyEnumeration.java b/libjava/gnu/java/util/EmptyEnumeration.java new file mode 100644 index 000000000000..4e80499c8a44 --- /dev/null +++ b/libjava/gnu/java/util/EmptyEnumeration.java @@ -0,0 +1,96 @@ +/* EmptyEnumeration.java -- a constant empty enumeration + Copyright (C) 2001, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.java.util; + +import java.io.Serializable; +import java.util.Enumeration; +import java.util.NoSuchElementException; + +/** + * This is a helper class that produces an empty Enumerations. There is only + * one instance of this class that can be used whenever one needs a + * non-null but empty enumeration. Using this class prevents multiple + * small objects and inner classes. getInstance() returns + * the only instance of this class. It can be shared by multiple objects and + * threads. + * + * @author Mark Wielaard (mark@klomp.org) + */ +public final class EmptyEnumeration implements Enumeration, Serializable +{ + /** The only instance of this class */ + private static final EmptyEnumeration instance = new EmptyEnumeration(); + + /** + * Private constructor that creates a new empty Enumeration. + */ + private EmptyEnumeration() + { + } + + /** + * Returns the only instance of this class. + * It can be shared by multiple objects and threads. + * + * @return the common empty enumeration + */ + public static EmptyEnumeration getInstance() + { + return instance; + } + + /** + * Returns false, since there are no elements. + * + * @return false + */ + public boolean hasMoreElements() + { + return false; + } + + /** + * Always throws NoSuchElementException, since it is empty. + * + * @throws NoSuchElementException this is empty + */ + public Object nextElement() + { + throw new NoSuchElementException(); + } +} diff --git a/libjava/java/security/AccessControlException.java b/libjava/java/security/AccessControlException.java index 11c7d688415b..ff8b5a93fb3e 100644 --- a/libjava/java/security/AccessControlException.java +++ b/libjava/java/security/AccessControlException.java @@ -1,5 +1,5 @@ /* AccessControlException.java -- Permission is denied - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,38 +39,44 @@ package java.security; /** * This exception is thrown when the AccessController denies - * an attempt to perform an operation. + * an attempt to perform an operation. This often keeps track of the + * permission that was not granted. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @see AccessController + * @status updated to 1.4 */ public class AccessControlException extends SecurityException { /** - * The Permission associated with this exception + * Compatible with JDK 1.1+. */ - private Permission perm; + private static final long serialVersionUID = 5138225684096988535L; /** - * This method initializes a new instance of AccessControlException - * with a descriptive error message. There will be no Permission - * object associated with this exception. + * The Permission associated with this exception. * - * @param msg The descriptive error message + * @serial the permission + */ + private final Permission perm; + + /** + * Create a new instance with a descriptive error message, and a null + * Permission object. + * + * @param msg the descriptive error message */ public AccessControlException(String msg) { - super(msg); + this(msg, null); } /** - * This method initializes a new instance of AccessControlException - * with a descriptive error message and an instance of Permission - * that is the permission that caused the exception to be thrown. + * Create a new instance with a descriptive error message and an associated + * Permission object. * - * @param msg The descriptive error message - * @param perm The Permission object that caused this exception. + * @param msg the descriptive error message + * @param perm the permission that caused this */ public AccessControlException(String msg, Permission perm) { @@ -82,10 +88,10 @@ public class AccessControlException extends SecurityException * This method returns the Permission object that caused * this exception to be thrown. * - * @return The requested Permission object, or null if none is available. + * @return the denied permission, or null */ public Permission getPermission() { - return (perm); + return perm; } } diff --git a/libjava/java/security/AccessController.java b/libjava/java/security/AccessController.java index 2c6b557b11ad..41ca1cec5fb4 100644 --- a/libjava/java/security/AccessController.java +++ b/libjava/java/security/AccessController.java @@ -43,7 +43,7 @@ package java.security; * through the checkPermission() method. * Manipulates the access control context for code that needs to be executed * the protection domain of the calling class (by explicitly ignoring the - * context of the calling code) in the doPriviliged() methods. + * context of the calling code) in the doPrivileged() methods. * And provides a getContext() method which gives the access * control context of the current thread that can be used for checking * permissions at a later time and/or in another thread. @@ -131,7 +131,7 @@ public final class AccessController * @param action the PrivilegedExceptionAction whose * run() should be be called. * @returns the result of the action.run() method. - * @exception PriviligedActionException wrapped around any exception that + * @exception PrivilegedActionException wrapped around any exception that * is thrown in the run() method. */ public static Object doPrivileged(PrivilegedExceptionAction action) @@ -163,7 +163,7 @@ public final class AccessController * @param context the AccessControlContext whose protection * domains should be added to the protection domain of the calling class. * @returns the result of the action.run() method. - * @exception PriviligedActionException wrapped around any exception that + * @exception PrivilegedActionException wrapped around any exception that * is thrown in the run() method. */ public static Object doPrivileged(PrivilegedExceptionAction action, diff --git a/libjava/java/security/AllPermission.java b/libjava/java/security/AllPermission.java index 64e0e5dc3911..4473fa11cb97 100644 --- a/libjava/java/security/AllPermission.java +++ b/libjava/java/security/AllPermission.java @@ -1,5 +1,5 @@ /* AllPermission.java -- Permission to do anything - Copyright (C) 1998, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,98 +37,160 @@ exception statement from your version. */ package java.security; +import java.util.Enumeration; +import java.util.Collections; +import gnu.java.util.EmptyEnumeration; + /** * This class is a permission that implies all other permissions. Granting * this permission effectively grants all others. Extreme caution should * be exercised in granting this permission. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @author Eric Blake + * @see AccessController + * @see Permissions + * @see SecurityManager + * @since 1.1 + * @status updated to 1.4 */ public final class AllPermission extends Permission { /** - * This method initializes a new instance of AllPermission. It - * performs no actions. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -2916474571451318075L; + + /** + * Create a new AllPermission object. */ public AllPermission() { - super("all"); + super("*"); } /** - * This method initializes a new instance of AllPermission. The - * arguments passed to this method are used to set internal field for the - * permission name. However, these are not used in - * determining the actual permissions granted. This class always will - * return true in its implies method. + * Create a new AllPermission object. The parameters are ignored, as all + * permission implies ALL PERMISSION. * - * @param name The name of this permission. - * @param actions The action list for this permission - ignored in this class. + * @param name ignored + * @param actions ignored */ public AllPermission(String name, String actions) { - super(name); + super("*"); } /** * This method always returns true to indicate that this * permission always implies that any other permission is also granted. * - * @param perm The Permission to test against - ignored in this class. - * - * @return Always returns true + * @param perm ignored + * @return true, the permission is implied */ public boolean implies(Permission perm) { - return (true); + return true; } /** - * This method tests this class for equality against another Object. - * This will return true if and only if the specified - * Object is an instance of AllPermission. + * Checks an object for equality. All AllPermissions are equal. * - * @param obj The Object to test for equality to this object + * @param obj the Object to test for equality */ public boolean equals(Object obj) { - if (obj instanceof AllPermission) - return (true); - - return (false); + return obj instanceof AllPermission; } /** - * This method returns a hash code for this object. + * This method returns a hash code for this object. This returns 1. * - * @return A hash value for this object. + * @return a hash value for this object */ public int hashCode() { - return (System.identityHashCode(this)); + return 1; } /** * This method returns the list of actions associated with this object. * This will always be the empty string ("") for this class. * - * @return The action list. + * @return the action list */ public String getActions() { - return (""); + return ""; } /** - * This method returns a new instance of PermissionCollection - * suitable for holding instance of AllPermission. + * Returns a PermissionCollection which can hold AllPermission. * - * @return A new PermissionCollection. + * @return a permission collection */ public PermissionCollection newPermissionCollection() { - return (null); + return new AllPermissionCollection(); } -} +} // class AllPermission + +/** + * Implements AllPermission.newPermissionCollection, and obeys serialization + * of JDK. + * + * @author Eric Blake + */ +final class AllPermissionCollection extends PermissionCollection +{ + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -4023755556366636806L; + + /** + * Whether an AllPermission has been added to the collection. + * + * @serial if all permission is in the collection yet + */ + private boolean all_allowed; + + /** + * Add an AllPermission. + * + * @param perm the permission to add + * @throws IllegalArgumentException if perm is not an AllPermission + * @throws SecurityException if the collection is read-only + */ + public void add(Permission perm) + { + if (isReadOnly()) + throw new SecurityException(); + if (! (perm instanceof AllPermission)) + throw new IllegalArgumentException(); + all_allowed = true; + } + + /** + * Returns true if this collection implies a permission. + * + * @param perm the permission to check + * @return true if this collection contains an AllPermission + */ + public boolean implies(Permission perm) + { + return all_allowed; + } + + /** + * Returns an enumeration of the elements in the collection. + * + * @return the elements in the collection + */ + public Enumeration elements() + { + return all_allowed + ? Collections.enumeration(Collections.singleton(new AllPermission())) + : EmptyEnumeration.getInstance(); + } +} // class AllPermissionCollection diff --git a/libjava/java/security/BasicPermission.java b/libjava/java/security/BasicPermission.java index 7e7d09db8e51..25630fb798b5 100644 --- a/libjava/java/security/BasicPermission.java +++ b/libjava/java/security/BasicPermission.java @@ -1,5 +1,5 @@ -/* BasicPermission.java -- Implements a simple named permission. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* BasicPermission.java -- implements a simple named permission + Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,90 +44,94 @@ import java.util.Enumeration; /** * This class implements a simple model for named permissions without an * associated action list. That is, either the named permission is granted - * or it is not. - *

- * It also supports trailing wildcards to allow the - * easy granting of permissions in a hierarchical fashion. (For example, - * the name "org.gnu.*" might grant all permissions under the "org.gnu" - * permissions hierarchy). The only valid wildcard character is a '*' - * which matches anything. It must be the rightmost element in the - * permission name and must follow a '.' or else the Permission name must - * consist of only a '*'. Any other occurrence of a '*' is not valid. - *

- * This class ignores the action list. Subclasses can choose to implement + * or it is not. + * + *

It also supports trailing wildcards to allow the easy granting of + * permissions in a hierarchical fashion. (For example, the name "org.gnu.*" + * might grant all permissions under the "org.gnu" permissions hierarchy). + * The only valid wildcard character is a '*' which matches anything. It + * must be the rightmost element in the permission name and must follow a + * '.' or else the Permission name must consist of only a '*'. Any other + * occurrence of a '*' is not valid. + * + *

This class ignores the action list. Subclasses can choose to implement * actions on top of this class if desired. * - * @version 0.1 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @author Eric Blake + * @see Permission + * @see Permissions + * @see PermissionCollection + * @see RuntimePermission + * @see SecurityPermission + * @see PropertyPermission + * @see AWTPermission + * @see NetPermission + * @see SecurityManager + * @since 1.1 + * @status updated to 1.4 */ public abstract class BasicPermission extends java.security.Permission implements Serializable - // FIXME extends with fully qualified classname as workaround for gcj 3.0.4 + // FIXME extends with fully qualified classname is workaround for gcj 3.0.4. { /** - * This method initializes a new instance of BasicPermission - * with the specified name. If the name contains an illegal wildcard - * character, an exception is thrown. - * - * @param name The name of this permission. - * - * @exception IllegalArgumentException If the name contains an invalid wildcard character - * @exception NullPointerException If the name is null + * Compatible with JDK 1.1+. */ - public BasicPermission(String name) - throws IllegalArgumentException, NullPointerException + private static final long serialVersionUID = 6279438298436773498L; + + /** + * Create a new instance with the specified permission name. If the name + * is empty, or contains an illegal wildcard character, an exception is + * thrown. + * + * @param name the name of this permission + * @throws NullPointerException if name is null + * @throws IllegalArgumentException if name is invalid + */ + public BasicPermission(String name) { super(name); - if (name.indexOf("*") != -1) { - if (!name.endsWith(".*") && !name.equals("*")) - throw new IllegalArgumentException("Bad wildcard: " + name); - - if (name.indexOf("*") != name.lastIndexOf("*")) - throw new IllegalArgumentException("Bad wildcard: " + name); + if ((! name.endsWith(".*") && ! name.equals("*")) + || name.indexOf("*") != name.lastIndexOf("*")) + throw new IllegalArgumentException("Bad wildcard: " + name); } + if ("".equals(name)) + throw new IllegalArgumentException("Empty name"); } /** - * This method initializes a new instance of BasicPermission - * with the specified name. If the name contains an illegal wildcard - * character, an exception is thrown. The action list passed to this - * form of the constructor is ignored. + * Create a new instance with the specified permission name. If the name + * is empty, or contains an illegal wildcard character, an exception is + * thrown. The actions parameter is ignored. * - * @param name The name of this permission. - * @param actions The list of actions for this permission - ignored in this class. - * - * @exception IllegalArgumentException If the name contains an invalid wildcard character - * @exception NullPointerException If the name is null + * @param name the name of this permission + * @param actions ignored + * @throws NullPointerException if name is null + * @throws IllegalArgumentException if name is invalid */ - public BasicPermission(String name, String actions) - throws IllegalArgumentException, NullPointerException + public BasicPermission(String name, String actions) { - // ignore actions this(name); } /** - * This method tests to see if the specified permission is implied by - * this permission. This will be true if the following conditions are met: - *

- *

    - *
  • The specified object is an instance of BasicPermission, - * or a subclass. - *
  • The name of the specified permission is identical to this permission's - * name or the name of the specified permission satisfies a wildcard match - * on this permission. + * This method tests to see if the specified permission is implied by this + * permission. This will be true if the following conditions are met:
      + *
    • The specified object is an instance of the same class as this + * object.
      • + *
    • The name of the specified permission is implied by this permission's + * name based on wildcard matching. For example, "a.*" implies "a.b".
      • *
    * - * @param perm The Permission object to test against. - * - * @return true if the specified permission is implied by this one or false otherwise. + * @param perm the Permission object to test against + * @return true if the specified permission is implied */ public boolean implies(Permission perm) { - if (!(perm instanceof BasicPermission)) + if (! getClass().isInstance(perm)) return false; String otherName = perm.getName(); @@ -137,36 +141,25 @@ public abstract class BasicPermission extends java.security.Permission return true; int last = name.length() - 1; - if (name.charAt(last) == '*' - && otherName.startsWith(name.substring(0, last))) - return true; - - return false; + return name.charAt(last) == '*' + && otherName.startsWith(name.substring(0, last)); } /** * This method tests to see if this object is equal to the specified * Object. This will be true if and only if the specified - * object meets the following conditions: - *

    - *

      - *
    • It is an instance of BasicPermission, or a subclass. - *
    • It has the same name as this permission. + * object meets the following conditions:
        + *
      • It is an instance of the same class as this.
        • + *
      • It has the same name as this permission.
        • *
      * - * @param obj The Object to test for equality against this object - * - * @return true if the specified Object is equal to this object or false otherwise. + * @param obj the Object to test for equality + * @return true if obj is semantically equal to this */ public boolean equals(Object obj) { - if (!(obj instanceof BasicPermission)) - return (false); - - if (!getName().equals(((BasicPermission) obj).getName())) - return (false); - - return (true); + return getClass().isInstance(obj) + && getName().equals(((BasicPermission) obj).getName()); } /** @@ -174,87 +167,143 @@ public abstract class BasicPermission extends java.security.Permission * code returned is the value returned by calling the hashCode * method on the String that is the name of this permission. * - * @return A hash value for this object + * @return a hash value for this object */ public int hashCode() { - return (getName().hashCode()); + return getName().hashCode(); } /** - * This method returns a list of the actions associated with this + * This method returns a list of the actions associated with this * permission. This method always returns the empty string ("") since * this class ignores actions. * - * @return The action list. + * @return the action list */ public String getActions() { - return (""); + return ""; } /** * This method returns an instance of PermissionCollection - * suitable for storing BasicPermission objects. This returns - * be a sub class of PermissionCollection - * that allows for an efficient and consistent implementation of - * the implies method. The collection doesn't handle subclasses - * of BasicPermission correctly; they must override this method. + * suitable for storing BasicPermission objects. The + * collection returned can only store objects of the same type as this. + * Subclasses which use actions must override this method; but a class with + * no actions will work fine with this. * - * @return A new empty PermissionCollection object. + * @return a new empty PermissionCollection object */ public PermissionCollection newPermissionCollection() { - return new PermissionCollection() - { - Hashtable permissions = new Hashtable(); - boolean allAllowed = false; - - public void add(Permission permission) - { - if (isReadOnly()) - throw new IllegalStateException("readonly"); - - BasicPermission bp = (BasicPermission) permission; - String name = bp.getName(); - if (name.equals("*")) - allAllowed = true; - permissions.put(name, bp); - } - - public boolean implies(Permission permission) - { - if (!(permission instanceof BasicPermission)) - return false; - - if (allAllowed) - return true; - - BasicPermission toImply = (BasicPermission) permission; - String name = toImply.getName(); - if (name.equals("*")) - return false; - - int prefixLength = name.length(); - if (name.endsWith("*")) - prefixLength -= 2; - - while (true) - { - if (permissions.get(name) != null) - return true; - - prefixLength = name.lastIndexOf('.', prefixLength); - if (prefixLength < 0) - return false; - name = name.substring(0, prefixLength + 1) + '*'; - } - } - - public Enumeration elements() - { - return permissions.elements(); - } - }; + return new BasicPermissionCollection(getClass()); } -} +} // class BasicPermission + +/** + * Implements AllPermission.newPermissionCollection, and obeys serialization + * of JDK. + * + * @author Eric Blake + */ +final class BasicPermissionCollection extends PermissionCollection +{ + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 739301742472979399L; + + /** + * The permissions in the collection. + * + * @serial a hash mapping name to permissions, all of type permClass + */ + private final Hashtable permissions = new Hashtable(); + + /** + * If "*" is in the collection. + * + * @serial true if a permission named "*" is in the collection + */ + private boolean all_allowed; + + /** + * The runtime class which all entries in the table must belong to. + * + * @serial the limiting subclass of this collection + */ + private final Class permClass; + + /** + * Construct a collection over the given runtime class. + * + * @param c the class + */ + BasicPermissionCollection(Class c) + { + permClass = c; + } + + /** + * Add a Permission. It must be of the same type as the permission which + * created this collection. + * + * @param perm the permission to add + * @throws IllegalArgumentException if perm is not the correct type + * @throws SecurityException if the collection is read-only + */ + public void add(Permission perm) + { + if (isReadOnly()) + throw new SecurityException("readonly"); + if (! permClass.isInstance(perm)) + throw new IllegalArgumentException("Expecting instance of " + permClass); + BasicPermission bp = (BasicPermission) perm; + String name = bp.getName(); + if (name.equals("*")) + all_allowed = true; + permissions.put(name, bp); + } + + /** + * Returns true if this collection implies the given permission. + * + * @param permission the permission to check + * @return true if it is implied by this + */ + public boolean implies(Permission permission) + { + if (! permClass.isInstance(permission)) + return false; + if (all_allowed) + return true; + BasicPermission toImply = (BasicPermission) permission; + String name = toImply.getName(); + if (name.equals("*")) + return false; + int prefixLength = name.length(); + if (name.endsWith("*")) + prefixLength -= 2; + + while (true) + { + if (permissions.get(name) != null) + return true; + prefixLength = name.lastIndexOf('.', prefixLength); + if (prefixLength < 0) + return false; + name = name.substring(0, prefixLength + 1) + '*'; + } + } + + /** + * Enumerate over the collection. + * + * @return an enumeration of the collection contents + */ + public Enumeration elements() + { + return permissions.elements(); + } +} // class BasicPermissionCollection diff --git a/libjava/java/security/Certificate.java b/libjava/java/security/Certificate.java index 624980fdb837..f37d919a7334 100644 --- a/libjava/java/security/Certificate.java +++ b/libjava/java/security/Certificate.java @@ -1,5 +1,5 @@ -/* Certificate.java -- Interface for modeling digital certificates - Copyright (C) 1998 Free Software Foundation, Inc. +/* Certificate.java -- deprecated interface for modeling digital certificates + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,84 +42,90 @@ import java.io.OutputStream; import java.io.IOException; /** - * This interface models a digital certificate which verifies the + * This interface models a digital certificate which verifies the * authenticity of a party. This class simply allows certificate * information to be queried, it does not guarantee that the certificate * is valid. - *

      - * This class is deprecated in favor of the new java.security.cert package. - * It exists for backward compatibility only. - * - * @deprecated * - * @version 0.0 + *

      This class is deprecated in favor of the new java.security.cert package. + * It exists for backward compatibility only. * * @author Aaron M. Renn (arenn@urbanophile.com) + * @since 1.1 + * @deprecated use {@link java.security.cert} instead + * @status updated to 1.4 */ public interface Certificate { - /** * This method returns the Principal that is guaranteeing * this certificate. * - * @return The Principal guaranteeing the certificate + * @return the Principal guaranteeing the certificate + * @deprecated this entire interface is deprecated */ - public abstract Principal getGuarantor(); + Principal getGuarantor(); /** * This method returns the Principal being guaranteed by * this certificate. * - * @return The Principal guaranteed by this certificate. + * @return the Principal guaranteed by this certificate + * @deprecated this entire interface is deprecated */ - public abstract Principal getPrincipal(); + Principal getPrincipal(); /** * This method returns the public key for the Principal that * is being guaranteed. * - * @return The PublicKey of the Principal being guaranteed + * @return the PublicKey of the Principal being guaranteed + * @deprecated this entire interface is deprecated */ - public abstract PublicKey getPublicKey(); - - /** - * This method returns the encoding format of the certificate (e.g., "PGP", - * "X.509"). This format is used by the encodedecode methods. - * - * @return The encoding format being used - */ - public abstract String getFormat(); + PublicKey getPublicKey(); /** * This method writes the certificate to an OutputStream in * a format that can be understood by the decode method. * - * @param out The OutputStream to write to. - * - * @exception KeyException If there is a problem with the internals of this certificate - * @exception IOException If an error occurs writing to the stream. + * @param out the OutputStream to write to + * @throws KeyException if there is a problem with the certificate + * @throws IOException if an error occurs writing to the stream + * @see #decode(InputStream) + * @see #getFormat() + * @deprecated this entire interface is deprecated */ - public abstract void - encode(OutputStream out) throws KeyException, IOException; + void encode(OutputStream out) throws KeyException, IOException; /** * This method reads an encoded certificate from an InputStream. * - * @param in The InputStream to read from. - * - * @param KeyException If there is a problem with the certificate data - * @param IOException If an error occurs reading from the stream. + * @param in the InputStream to read from + * @throws KeyException if there is a problem with the certificate data + * @throws IOException if an error occurs reading from the stream + * @see #encode(OutputStream) + * @see #getFormat() + * @deprecated this entire interface is deprecated */ - public abstract void - decode(InputStream in) throws KeyException, IOException; + void decode(InputStream in) throws KeyException, IOException; + + /** + * This method returns the encoding format of the certificate (e.g., "PGP", + * "X.509"). This format is used by the encode and + * decode methods. + * + * @return the encoding format being used + * @deprecated this entire interface is deprecated + */ + String getFormat(); /** * This method returns a String representation of the contents * of this certificate. * - * @param detail true to provided detailed information about this certificate, false otherwise + * @param detail true to provided more detailed information + * @return the string representation + * @deprecated this entire interface is deprecated */ - public abstract String toString(boolean detail); -} + String toString(boolean detail); +} // interface Certificate diff --git a/libjava/java/security/CodeSource.java b/libjava/java/security/CodeSource.java index 9662923d1894..36ee734efd38 100644 --- a/libjava/java/security/CodeSource.java +++ b/libjava/java/security/CodeSource.java @@ -1,5 +1,5 @@ /* CodeSource.java -- Code location and certifcates - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,56 +35,102 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.security; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.Serializable; import java.net.URL; import java.net.SocketPermission; +// Note that this overrides Certificate in this package. +import java.security.cert.Certificate; +import java.security.cert.CertificateFactory; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; /** * This class represents a location from which code is loaded (as - * represented by a URL) and the list of certificates that are used to + * represented by a URL), and the list of certificates that are used to * check the signatures of signed code loaded from this source. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @author Eric Blake + * @since 1.1 + * @status updated to 1.4 */ public class CodeSource implements Serializable { - private static final String linesep = System.getProperty("line.separator"); + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 4977541819976013951L; /** * This is the URL that represents the code base from which code will * be loaded. - */ - private URL location; - - /** - * This is the list of certificates for this code base - */ - // What is the serialized form of this? - private java.security.cert.Certificate[] certs; - - /** - * This method initializes a new instance of CodeSource that - * loads code from the specified URL location and which uses the - * specified certificates for verifying signatures. * - * @param location The location from which code will be loaded - * @param certs The list of certificates used for verifying signatures on code from this source + * @serial the code location */ - public CodeSource(URL location, java.security.cert.Certificate[] certs) + private final URL location; + + /** The set of certificates for this code base. */ + private transient HashSet certs; + + /** + * This creates a new instance of CodeSource that loads code + * from the specified URL location and which uses the specified certificates + * for verifying signatures. + * + * @param location the location from which code will be loaded + * @param certs the list of certificates + */ + public CodeSource(URL location, Certificate[] certs) { this.location = location; - this.certs = certs; + if (certs != null) + this.certs = new HashSet(Arrays.asList(certs)); + } + + /** + * This method returns a hash value for this object. + * + * @return a hash value for this object + */ + public int hashCode() + { + return (location == null ? 0 : location.hashCode()) + ^ (certs == null ? 0 : certs.hashCode()); + } + + /** + * This method tests the specified Object for equality with + * this object. This will be true if and only if the locations are equal + * and the certificate sets are identical (ignoring order). + * + * @param obj the Object to test against + * @return true if the specified object is equal to this one + */ + public boolean equals(Object obj) + { + if (! (obj instanceof CodeSource)) + return false; + CodeSource cs = (CodeSource) obj; + return (certs == null ? cs.certs == null : certs.equals(cs.certs)) + && (location == null ? cs.location == null + : location.equals(cs.location)); } /** * This method returns the URL specifying the location from which code * will be loaded under this CodeSource. * - * @return The code location for this CodeSource. + * @return the code location for this CodeSource */ public final URL getLocation() { @@ -93,235 +139,209 @@ public class CodeSource implements Serializable /** * This method returns the list of digital certificates that can be used - * to verify the signatures of code loaded under this CodeSource. + * to verify the signatures of code loaded under this + * CodeSource. * - * @return The certifcate list for this CodeSource. + * @return the certifcate list for this CodeSource */ - public final java.security.cert.Certificate[] getCertificates() + public final Certificate[] getCertificates() { - return certs; + if (certs == null) + return null; + Certificate[] c = new Certificate[certs.size()]; + certs.toArray(c); + return c; } /** - * This method tests to see if a specified CodeSource is + * This method tests to see if a specified CodeSource is * implied by this object. Effectively, to meet this test, the specified - * object must have all the certifcates this object has (but may have - * more) and must have a location that is a subset of this object's. In order + * object must have all the certifcates this object has (but may have more), + * and must have a location that is a subset of this object's. In order * for this object to imply the specified object, the following must be - * true: - *

      - *

        - *
      1. The specified CodeSource must not be null. - *
      2. If the specified CodeSource has a certificate list, - * all of that object's certificates must be present in the certificate - * list of this object. + * true:
          + *
        1. codesource must not be null.
          2. + *
        2. If codesource has a certificate list, all of it's + * certificates must be present in the certificate list of this + * code source.
          3. *
        3. If this object does not have a null location, then - * the following addtional tests must be passed. - *
            - *
          1. The specified CodeSource must not have a null location. - *
          2. The specified CodeSource's location must be equal to - * this object's location, or
            - *
              - *
            • The specifiec CodeSource's location protocol, port, - * and ref (aka, anchor) must equal this objects, and - *
            • The specified CodeSource's location host must imply this - * object's location host, as determined by contructing - * SocketPermission objects from each with no action list and - * using that classes's implies method. And, - *
            • If this object's location file ends with a '/', then the specified - * object's location file must start with this object's location file. - * Otherwise, the specified object's location file must start with this - * object's location file with the '/' character appended to it. - *
            - *
          + * the following addtional tests must be passed.
            + *
          1. codesource must not have a null + * location.
            2. + *
          2. codesource's location must be equal to this object's + * location, or
              + *
            • codesource's location protocol, port, and ref (aka, + * anchor) must equal this objects
              • + *
            • codesource's location host must imply this object's + * location host, as determined by contructing + * SocketPermission objects from each with no + * action list and using that classes's implies + * method
              • + *
            • If this object's location file ends with a '/', then the + * specified object's location file must start with this + * object's location file. Otherwise, the specified object's + * location file must start with this object's location file + * with the '/' character appended to it.
              • + *
            3. + *
          *
        * - * @param cs The CodeSource to test against this object + *

        For example, each of these locations imply the location + * "http://java.sun.com/classes/foo.jar":

          + * 
          +   * http:
+   * http://*.sun.com/classes/*
+   * http://java.sun.com/classes/-
+   * http://java.sun.com/classes/foo.jar
+   *
          + * Note that the code source with null location and null certificates implies + * all other code sources. * - * @return true if this specified CodeSource is specified by this object, false otherwise. + * @param cs the CodeSource to test against this object + * @return true if this specified CodeSource is implied */ public boolean implies(CodeSource cs) { if (cs == null) return false; - - // First check the certificate list - java.security.cert.Certificate[] their_certs = cs.getCertificates(); - java.security.cert.Certificate[] our_certs = getCertificates(); - - if (our_certs != null) - { - if (their_certs == null) - return false; - - for (int i = 0; i < our_certs.length; i++) - { - int j; - for (j = 0; j < their_certs.length; j++) - if (our_certs[i].equals(their_certs[j])) - break; - - if (j == their_certs.length) - return false; - } - } - - // Next check the location - URL their_loc = getLocation(); - URL our_loc = getLocation(); - - if (our_loc == null) + // First check the certificate list. + if (certs != null && (cs.certs == null || ! certs.containsAll(cs.certs))) + return false; + // Next check the location. + if (location == null) return true; - else if (their_loc == null) + if (cs.location == null + || ! location.getProtocol().equals(cs.location.getProtocol()) + || (location.getPort() != -1 + && location.getPort() != cs.location.getPort()) + || (location.getRef() != null + && ! location.getRef().equals(cs.location.getRef()))) return false; - - if (!our_loc.getProtocol().equals(their_loc.getProtocol())) - return false; - - if (our_loc.getPort() != -1) - if (our_loc.getPort() != their_loc.getPort()) - return false; - - if (our_loc.getRef() != null) - if (!our_loc.getRef().equals(their_loc.getRef())) - return false; - - // See javadoc comments for what we are doing here. - if (our_loc.getHost() != null) + if (location.getHost() != null) { - String their_host = their_loc.getHost(); - if (their_host == null) - return false; - - SocketPermission our_sockperm = - new SocketPermission(our_loc.getHost(), "accept"); - SocketPermission their_sockperm = - new SocketPermission(their_host, "accept"); - - if (!our_sockperm.implies(their_sockperm)) - return false; + String their_host = cs.location.getHost(); + if (their_host == null) + return false; + SocketPermission our_sockperm = + new SocketPermission(location.getHost(), "accept"); + SocketPermission their_sockperm = + new SocketPermission(their_host, "accept"); + if (! our_sockperm.implies(their_sockperm)) + return false; } - - String our_file = our_loc.getFile(); + String our_file = location.getFile(); if (our_file != null) { - if (!our_file.endsWith("/")) - our_file = our_file + "/"; - - String their_file = their_loc.getFile(); - if (their_file == null) - return false; - - if (!their_file.startsWith(our_file)) - return false; + if (! our_file.endsWith("/")) + our_file += "/"; + String their_file = cs.location.getFile(); + if (their_file == null + || ! their_file.startsWith(our_file)) + return false; } - return true; } - /** - * This method tests the specified Object for equality with - * this object. This will be true if and only if: - *

          - *

            - *
          • The specified object is not null. - *
          • The specified object is an instance of CodeSource. - *
          • The specified object's location is the same as this object's. - *
          • The specified object's certificate list contains the exact same - * entries as the object's. Note that the order of the certificate lists - * is not significant. - *
          - * - * @param obj The Object to test against. - * - * @return true if the specified object is equal to this one, false otherwise. - */ - public boolean equals(Object obj) - { - if (obj == null) - return false; - - if (!(obj instanceof CodeSource)) - return false; - - CodeSource cs = (CodeSource) obj; - - // First check the certificate list - java.security.cert.Certificate[] their_certs = cs.getCertificates(); - java.security.cert.Certificate[] our_certs = getCertificates(); - - if ((our_certs == null) && (their_certs != null)) - return false; - else if ((our_certs != null) && (their_certs == null)) - return false; - - if (our_certs != null) - { - if (our_certs.length != their_certs.length) - return false; - - for (int i = 0; i < our_certs.length; i++) - { - int j; - for (j = 0; j < their_certs.length; j++) - if (our_certs[i].equals(their_certs[j])) - break; - - if (j == their_certs.length) - return false; - } - } - - // Now the location - URL their_loc = cs.getLocation(); - URL our_loc = getLocation(); - - if ((our_loc == null) && (their_loc != null)) - return false; - - if (!our_loc.equals(their_loc)) - return false; - - return true; - } - - /** - * This method returns a hash value for this object. - * - * @return A hash value for this object. - */ - public int hashCode() - { - URL location = getLocation(); - if (location == null) - return System.identityHashCode(this); - - return location.hashCode(); - } - /** * This method returns a String that represents this object. - * This String will contain the object's hash code, location, - * and certificate list. + * The result is in the format "(" + getLocation() followed + * by a space separated list of certificates (or ""), + * followed by ")". * - * @return A String for this object + * @return a String for this object */ public String toString() { - StringBuffer sb = new StringBuffer(""); - - sb.append(super.toString() + " (" + linesep); - sb.append("Location: " + getLocation() + linesep); - - java.security.cert.Certificate[] certs = getCertificates(); - if (certs == null) - sb.append("" + linesep); + StringBuffer sb = new StringBuffer("(").append(location); + if (certs == null || certs.isEmpty()) + sb.append(" "); else - for (int i = 0; i < certs.length; i++) - sb.append(certs[i] + linesep); - - sb.append(")" + linesep); - - return sb.toString(); + { + Iterator iter = certs.iterator(); + for (int i = certs.size(); --i >= 0; ) + sb.append(' ').append(iter.next()); + } + return sb.append(")").toString(); } -} + + /** + * Reads this object from a serialization stream. + * + * @param s the input stream + * @throws IOException if reading fails + * @throws ClassNotFoundException if deserialization fails + * @serialData this reads the location, then expects an int indicating the + * number of certificates. Each certificate is a String type + * followed by an int encoding length, then a byte[] encoding + */ + private void readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException + { + s.defaultReadObject(); + int count = s.readInt(); + certs = new HashSet(); + while (--count >= 0) + { + String type = (String) s.readObject(); + int bytes = s.readInt(); + byte[] encoded = new byte[bytes]; + for (int i = 0; i < bytes; i++) + encoded[i] = s.readByte(); + ByteArrayInputStream stream = new ByteArrayInputStream(encoded); + try + { + CertificateFactory factory = CertificateFactory.getInstance(type); + certs.add(factory.generateCertificate(stream)); + } + catch (CertificateException e) + { + // XXX Should we ignore this certificate? + } + } + } + + /** + * Writes this object to a serialization stream. + * + * @param s the output stream + * @throws IOException if writing fails + * @serialData this writes the location, then writes an int indicating the + * number of certificates. Each certificate is a String type + * followed by an int encoding length, then a byte[] encoding + */ + private void writeObject(ObjectOutputStream s) throws IOException + { + s.defaultWriteObject(); + if (certs == null) + s.writeInt(0); + else + { + int count = certs.size(); + s.writeInt(count); + Iterator iter = certs.iterator(); + while (--count >= 0) + { + Certificate c = (Certificate) iter.next(); + s.writeObject(c.getType()); + byte[] encoded; + try + { + encoded = c.getEncoded(); + } + catch (CertificateEncodingException e) + { + // XXX Should we ignore this certificate? + encoded = null; + } + if (encoded == null) + s.writeInt(0); + else + { + s.writeInt(encoded.length); + for (int i = 0; i < encoded.length; i++) + s.writeByte(encoded[i]); + } + } + } + } +} // class CodeSource diff --git a/libjava/java/security/DigestException.java b/libjava/java/security/DigestException.java index c28c99dc3a8c..f5c8d627de67 100644 --- a/libjava/java/security/DigestException.java +++ b/libjava/java/security/DigestException.java @@ -1,5 +1,5 @@ /* DigestException.java -- A generic message digest exception - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,29 +38,30 @@ exception statement from your version. */ package java.security; /** - * This exception indicates that a generic message digest exception has + * This exception indicates that a generic message digest exception has * occurred. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @status updated to 1.4 */ public class DigestException extends GeneralSecurityException { /** - * This method initializes a new DigestException with no - * descriptive message. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 5821450303093652515L; + + /** + * Create a new instance with no descriptive message. */ public DigestException() { - super(); } /** - * This method initializes a new instance of DigestException - * with a descriptive error message. + * Create a new instance with a descriptive error message. * - * @param msg The descriptive message + * @param msg the descriptive message */ public DigestException(String msg) { diff --git a/libjava/java/security/DigestOutputStream.java b/libjava/java/security/DigestOutputStream.java index c1b303355700..e191e4a6398f 100644 --- a/libjava/java/security/DigestOutputStream.java +++ b/libjava/java/security/DigestOutputStream.java @@ -112,7 +112,7 @@ public class DigestOutputStream extends FilterOutputStream if (state) digest.update((byte) b); - super.write(b); + out.write(b); } /** @@ -131,7 +131,7 @@ public class DigestOutputStream extends FilterOutputStream if (state) digest.update(b, off, len); - super.write(b, off, len); + out.write(b, off, len); } /** diff --git a/libjava/java/security/DomainCombiner.java b/libjava/java/security/DomainCombiner.java index 17e5a278de5b..5d5397a55683 100644 --- a/libjava/java/security/DomainCombiner.java +++ b/libjava/java/security/DomainCombiner.java @@ -1,5 +1,5 @@ -/* DomainCombiner.java - Combines ProtectionDomains - Copyright (C) 1999 Free Software Foundation, Inc. +/* DomainCombiner.java -- Combines ProtectionDomains + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,27 +38,30 @@ exception statement from your version. */ package java.security; /** - A public interface used to combine two ProtectionDomains in a new - ProtectionDomain and update the current Protection Domains - associated with the current AccessControllerContext. - - It can add, subtract, or update ProtectionDomains or possibly - remove duplicates or any possible complex action but just not add - ones that do not already exist in either array. - - @since JDK 1.3 - @author Mark Benvenuto + * A public interface used to combine two ProtectionDomains in a new + * ProtectionDomain and update the current Protection Domains + * associated with the current AccessControlContext. + * + * It can add, subtract, or update ProtectionDomains or possibly + * remove duplicates or any possible complex action but just not add + * ones that do not already exist in either array. + * + * @author Mark Benvenuto + * @see AccessControlContext + * @see AccessController + * @since 1.3 + * @status updated to 1.4 */ public interface DomainCombiner { /** - Combines the current ProtectionDomains of the Thread with new - ProtectionDomains. - - @param currentDomains - the ProtectionDomains for the current thread. - @param assignedDomains - ProtectionsDomains to add - @returns a new array of all the ProtectionDomains + * Combines the current ProtectionDomains of the Thread with new + * ProtectionDomains. + * + * @param currentDomains - the ProtectionDomains for the current thread. + * @param assignedDomains - ProtectionsDomains to add + * @return a new array of all the ProtectionDomains */ - public ProtectionDomain[] combine(ProtectionDomain[]currentDomains, - ProtectionDomain[]assignedDomains); -} + ProtectionDomain[] combine(ProtectionDomain[] currentDomains, + ProtectionDomain[] assignedDomains); +} // interface DomainCombiner diff --git a/libjava/java/security/GeneralSecurityException.java b/libjava/java/security/GeneralSecurityException.java index a41a980f7942..d1db3c5d6fb3 100644 --- a/libjava/java/security/GeneralSecurityException.java +++ b/libjava/java/security/GeneralSecurityException.java @@ -1,5 +1,5 @@ /* GeneralSecurityException.java -- Common superclass of security exceptions - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,31 +41,32 @@ package java.security; * This class is the common superclass of all security exceptions. All * exceptions in java.security extend this class with the exception (no * pun intended) of AccessControlException and - * CertificateException which extend SecurityException - * and ProviderException which extens RuntimeException. - * and InvalidParamterException which extends - * IllegalArgumentException. + * CertificateException (which extend + * SecurityException), ProviderException + * (RuntimeException), and InvalidParamterException + * (IllegalArgumentException). * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @status updated to 1.4 */ public class GeneralSecurityException extends Exception { /** - * This method initializes a new instance of GeneralSecurityException - * with no descriptive error message. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 894798122053539237L; + + /** + * Create a new instance with no descriptive error message. */ public GeneralSecurityException() { - super(); } /** - * This method initializes a new instance of GeneralSecurityException - * with a descriptive error message. + * Create a new instance with a descriptive error message. * - * @param msg The descriptive error message. + * @param msg the descriptive error message */ public GeneralSecurityException(String msg) { diff --git a/libjava/java/security/Guard.java b/libjava/java/security/Guard.java index f0bc9f281d4c..2654ba70c04d 100644 --- a/libjava/java/security/Guard.java +++ b/libjava/java/security/Guard.java @@ -1,5 +1,5 @@ /* Guard.java -- Check access to a guarded object - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,21 +41,20 @@ package java.security; * This interface specifies a mechanism for querying whether or not * access is allowed to a guarded object. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @see GuardedObject + * @since 1.1 + * @status updated to 1.4 */ public interface Guard { /** * This method tests whether or not access is allowed to the specified - * guarded object. Access is allowed if this method returns silently. If + * guarded object. Access is allowed if this method returns silently. If * access is denied, an exception is generated. * - * @param obj The Object to test - * - * @exception SecurityException If access to the object is denied. + * @param obj the Object to test + * @throws SecurityException if access to the object is denied */ - public abstract void checkGuard(Object obj) throws SecurityException; - -} + void checkGuard(Object obj); +} // interface Guard diff --git a/libjava/java/security/GuardedObject.java b/libjava/java/security/GuardedObject.java index 2aa13e12a634..f07d81142e46 100644 --- a/libjava/java/security/GuardedObject.java +++ b/libjava/java/security/GuardedObject.java @@ -1,5 +1,5 @@ /* GuardedObject.java -- An object protected by a Guard - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,38 +38,50 @@ exception statement from your version. */ package java.security; import java.io.Serializable; +import java.io.IOException; +import java.io.ObjectOutputStream; /** * This class is an object that is guarded by a Guard object. - * The object that is being guarded is retrieved by a call to the only + * The object that is being guarded is retrieved by a call to the only * method in this class - getObject. That method returns the - * guarded Object after first checking with the + * guarded Object after first checking with the * Guard. If the Guard disallows access, an * exception will be thrown. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @since 1.1 + * @status updated to 1.4 */ public class GuardedObject implements Serializable { /** - * This is the Guard that is protecting the object. + * Compatible with JDK 1.1+. */ - private Guard guard; + private static final long serialVersionUID = -5240450096227834308L; + + /** + * This is the Guard that is protecting the object. + * + * @serial the guard + */ + private final Guard guard; /** * This is the object that is being guarded. + * + * @serial the protected object */ - private Object object; + private final Object object; /** * This method initializes a new instance of GuardedObject * that protects the specified Object using the specified - * Guard + * Guard. A null guard means there are no restrictions on + * accessing the object. * - * @param object The Object to guard - * @param guard The Guard that is protecting the object. + * @param object the Object to guard + * @param guard the Guard that is protecting the object */ public GuardedObject(Object object, Guard guard) { @@ -78,18 +90,31 @@ public class GuardedObject implements Serializable } /** - * This method first call the checkGuard method on the - * Guard object protecting the guarded object. If the + * This method first call the checkGuard method on the + * Guard object protecting the guarded object. If the * Guard disallows access, an exception is thrown, otherwise * the Object is returned. * * @return The object being guarded - * - * @exception SecurityException If the Guard disallows access to the object. + * @throws SecurityException if access is denied */ - public Object getObject() throws SecurityException + public Object getObject() { - guard.checkGuard(object); - return (object); + if (guard != null) + guard.checkGuard(object); + return object; } -} + + /** + * Ensures that serialization is legal, by checking the guard. + * + * @param s the stream to write to + * @throws IOException if the underlying stream fails + */ + private void writeObject(ObjectOutputStream s) throws IOException + { + if (guard != null) + guard.checkGuard(object); + s.defaultWriteObject(); + } +} // class GuardedObject diff --git a/libjava/java/security/InvalidAlgorithmParameterException.java b/libjava/java/security/InvalidAlgorithmParameterException.java index a3b041a67aa3..40f953079bef 100644 --- a/libjava/java/security/InvalidAlgorithmParameterException.java +++ b/libjava/java/security/InvalidAlgorithmParameterException.java @@ -1,5 +1,6 @@ -/* InvalidAlgorithmParameterException.java - Copyright (C) 2000 Free Software Foundation, Inc. +/* InvalidAlgorithmParameterException.java -- an invalid parameter to a + security algorithm + Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,23 +39,33 @@ exception statement from your version. */ package java.security; /** + * Thrown for an invalid security algorithm parameter. + * * @author Warren Levy - * @date February 2, 2000. + * @since 1.2 + * @status updated to 1.4 */ - -/** - * Written using on-line Java Platform 1.2 API Specification. - * Status: Believed complete and correct. - */ - -// JDK1.2 -public class InvalidAlgorithmParameterException extends GeneralSecurityException +public class InvalidAlgorithmParameterException + extends GeneralSecurityException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 2864672297499471472L; + + /** + * Construct an exception with no message. + */ public InvalidAlgorithmParameterException() { super(); } + /** + * Construct an exception with a message. + * + * @param msg the message + */ public InvalidAlgorithmParameterException(String msg) { super(msg); diff --git a/libjava/java/security/InvalidKeyException.java b/libjava/java/security/InvalidKeyException.java index bcf1ee1ba8fd..373e8625a680 100644 --- a/libjava/java/security/InvalidKeyException.java +++ b/libjava/java/security/InvalidKeyException.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 Free Software Foundation +/* InvalidKeyException -- thrown for an invalid key + Copyright (C) 2000, 2002 Free Software Foundation This file is part of GNU Classpath. @@ -37,22 +38,30 @@ exception statement from your version. */ package java.security; /** + * Thrown for an invalid key. + * * @author Warren Levy - * @date February 1, 2000. + * @status updated to 1.4 */ - -/** - * Written using on-line Java Platform 1.2 API Specification. - * Status: Believed complete and correct. - */ - public class InvalidKeyException extends KeyException { + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 5698479920593359816L; + + /** + * Construct an exception with no message. + */ public InvalidKeyException() { - super(); } + /** + * Construct an exception with a message. + * + * @param msg the message + */ public InvalidKeyException(String msg) { super(msg); diff --git a/libjava/java/security/InvalidParameterException.java b/libjava/java/security/InvalidParameterException.java index 5747722629ac..220899197fa8 100644 --- a/libjava/java/security/InvalidParameterException.java +++ b/libjava/java/security/InvalidParameterException.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 Free Software Foundation +/* InvalidParameterException.java -- an invalid parameter in the JCA/JCE engine + Copyright (C) 2000, 2002 Free Software Foundation This file is part of GNU Classpath. @@ -37,22 +38,31 @@ exception statement from your version. */ package java.security; /** + * Thrown when an invalid parameter is passed to a method of the JCA/JCE + * engine classes. + * * @author Warren Levy - * @date February 1, 2000. + * @status updated to 1.4 */ - -/** - * Written using on-line Java Platform 1.2 API Specification. - * Status: Believed complete and correct. - */ - public class InvalidParameterException extends IllegalArgumentException { + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -857968536935667808L; + + /** + * Construct an exception with no message. + */ public InvalidParameterException() { - super(); } + /** + * Construct an exception with a message. + * + * @param msg the message + */ public InvalidParameterException(String msg) { super(msg); diff --git a/libjava/java/security/Key.java b/libjava/java/security/Key.java index b63b7b3383e2..ff23a05e2089 100644 --- a/libjava/java/security/Key.java +++ b/libjava/java/security/Key.java @@ -1,5 +1,5 @@ /* Key.java -- A abstract representation of a digital key - Copyright (C) 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,28 +43,36 @@ import java.io.Serializable; * This interfaces models the base characteristics that all keys must * have. These are: a key algorithm, an encoded form, and a format used * to encode the key. Specific key types inherit from this interface. - *

          * Note that since this interface extends Serializable, all - * keys may be serialized. + * keys may be serialized. Keys are generally obtained through key generators, + * including {@link KeyFactory}. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @see PublicKey + * @see PrivateKey + * @see KeyPair + * @see KeyPairGenerator + * @see KeyFactory + * @see KeySpec + * @see Identity + * @see Signer + * @since 1.1 + * @status updated to 1.4 */ public interface Key extends Serializable { - /** + /** * The verion identifier used for serialization. */ - public static final long serialVersionUID = 6603384152749567654L; + long serialVersionUID = 6603384152749567654L; /** * This method returns the name of the algorithm for this key. This is a * String such as "RSA". * - * @return The name of the algorithm in use + * @return the name of the algorithm in use */ - public abstract String getAlgorithm(); + String getAlgorithm(); /** * This method returns the name of the encoding format for this key. This @@ -72,15 +80,15 @@ public interface Key extends Serializable * "X.509" or "PKCS#8". This method returns null if this key * does not have an encoding format. * - * @return The name of the encoding format for this key, or null if there is no such format. + * @return the name of the encoding format for this key, or null */ - public abstract String getFormat(); + String getFormat(); /** * This method returns the encoded form of the key. If this key does not - * support encoding, this method returns null + * support encoding, this method returns null. * - * @return The encoded form of the key, or null if no encoded form is available. + * @return the encoded form of the key, or null */ - public abstract byte[] getEncoded(); -} + byte[] getEncoded(); +} // interface Key diff --git a/libjava/java/security/KeyException.java b/libjava/java/security/KeyException.java index fbc7c699ab2e..3b7d3886e151 100644 --- a/libjava/java/security/KeyException.java +++ b/libjava/java/security/KeyException.java @@ -1,5 +1,5 @@ /* KeyException.java -- Thrown when there is a problem with a key - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,26 +40,30 @@ package java.security; /** * This exception is thrown when there is a problem with a key. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @see Key + * @status updated to 1.4 */ public class KeyException extends GeneralSecurityException { + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -7483676942812432108L; + /** * This method initializes a new instance of KeyException * with no descriptive message. */ public KeyException() { - super(); } /** * This method initializes a new instance of KeyException * with a descriptive message. * - * @param msg The descriptive message. + * @param msg the descriptive message */ public KeyException(String msg) { diff --git a/libjava/java/security/KeyManagementException.java b/libjava/java/security/KeyManagementException.java index ef50e32585f7..52c2786294f4 100644 --- a/libjava/java/security/KeyManagementException.java +++ b/libjava/java/security/KeyManagementException.java @@ -1,5 +1,5 @@ -/* KeyManagementException.java -- What it says - Copyright (C) 1998 Free Software Foundation, Inc. +/* KeyManagementException.java -- an exception in key management + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,29 +38,31 @@ exception statement from your version. */ package java.security; /** - * This exception is thrown whenever a problem related to the management of - * security keys is encountered. - * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * This exception is thrown whenever a problem related to the management of + * security keys is encountered. + * + * @author Aaron M. Renn + * @see Key + * @status updated to 1.4 */ public class KeyManagementException extends KeyException { /** - * This method initializes a new instance of KeyManagementException - * with no descriptive error message. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 947674216157062695L; + + /** + * Create a new instance with no descriptive error message. */ public KeyManagementException() { - super(); } /** - * This method initializes a new instance of KeyManagementException - * with a descriptive error message. + * Create a new instance with a descriptive error message. * - * @param msg The descriptive error message + * @param msg the descriptive error message */ public KeyManagementException(String msg) { diff --git a/libjava/java/security/KeyStoreException.java b/libjava/java/security/KeyStoreException.java index 39755a07cd37..369587a59847 100644 --- a/libjava/java/security/KeyStoreException.java +++ b/libjava/java/security/KeyStoreException.java @@ -1,5 +1,5 @@ /* KeyStoreException.java -- Indicates a problem with the key store - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,26 +40,28 @@ package java.security; /** * Indicates a problem with the key store. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @since 1.2 + * @status updated to 1.4 */ public class KeyStoreException extends GeneralSecurityException { /** - * This method initializes a new KeyStoreException with no - * detailed error message. + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = -1119353179322377262L; + + /** + * Create a new instance detailed error message. */ public KeyStoreException() { - super(); } /** - * This method initializes a new KeyStoreException with a - * detailed error message. + * Create a new instance with a detailed error message. * - * @param msg The descriptive error message. + * @param msg the descriptive error message */ public KeyStoreException(String msg) { diff --git a/libjava/java/security/MessageDigest.java b/libjava/java/security/MessageDigest.java index 006555d43a19..be9dfd0896ba 100644 --- a/libjava/java/security/MessageDigest.java +++ b/libjava/java/security/MessageDigest.java @@ -170,7 +170,7 @@ public abstract class MessageDigest extends MessageDigestSpi */ public void update(byte[]input, int offset, int len) { - engineUpdate(input, 0, input.length); + engineUpdate(input, offset, len); } /** diff --git a/libjava/java/security/NoSuchAlgorithmException.java b/libjava/java/security/NoSuchAlgorithmException.java index 41e3a5095052..31e00537a50e 100644 --- a/libjava/java/security/NoSuchAlgorithmException.java +++ b/libjava/java/security/NoSuchAlgorithmException.java @@ -1,5 +1,5 @@ -/* NoSuchAlgorithmException.java -- What it says - Copyright (C) 1998 Free Software Foundation, Inc. +/* NoSuchAlgorithmException.java -- an algorithm was not available + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,26 +41,27 @@ package java.security; * This exception is thrown when the requested security algorithm is * not available * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @status updated to 1.4 */ public class NoSuchAlgorithmException extends GeneralSecurityException { /** - * This method initializes a new instance of NoSuchAlgorithmException - * with no descriptive error message. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -7443947487218346562L; + + /** + * Create a new instance with no descriptive error message. */ public NoSuchAlgorithmException() { - super(); } /** - * This method initializes a new instance of NoSuchAlgorithmException - * with a descriptive error message. + * Create a new instance with a descriptive error message. * - * @param msg The descriptive error message + * @param msg the descriptive error message */ public NoSuchAlgorithmException(String msg) { diff --git a/libjava/java/security/NoSuchProviderException.java b/libjava/java/security/NoSuchProviderException.java index 130cf644b1fe..546b2dc6190b 100644 --- a/libjava/java/security/NoSuchProviderException.java +++ b/libjava/java/security/NoSuchProviderException.java @@ -1,5 +1,5 @@ -/* NoSuchProviderException.java -- What it says - Copyright (C) 1998 Free Software Foundation, Inc. +/* NoSuchProviderException.java -- thrown when a provider is not found + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,26 +41,27 @@ package java.security; * This exception is thrown when the requested security provider is * not available. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @status updated to 1.4 */ public class NoSuchProviderException extends GeneralSecurityException { /** - * This method initializes a new instance of NoSuchProviderException - * with no descriptive error message. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 8488111756688534474L; + + /** + * Create a new instance with no descriptive error message. */ public NoSuchProviderException() { - super(); } /** - * This method initializes a new instance of NoSuchProviderException - * with a descriptive error message. + * Create a new instance with a descriptive error message. * - * @param msg The descriptive error message. + * @param msg the descriptive error message */ public NoSuchProviderException(String msg) { diff --git a/libjava/java/security/Permission.java b/libjava/java/security/Permission.java index 8235e21a9849..58702da2c0c2 100644 --- a/libjava/java/security/Permission.java +++ b/libjava/java/security/Permission.java @@ -1,5 +1,5 @@ /* Permission.java -- The superclass for all permission objects - Copyright (C) 1998, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,7 +41,7 @@ import java.io.Serializable; /** * This class is the abstract superclass of all classes that implement - * the concept of a permission. A permission consists of a permission name + * the concept of a permission. A permission consists of a permission name * and optionally a list of actions that relate to the permission. The * actual meaning of the name of the permission is defined only in the * context of a subclass. It may name a resource to which access permissions @@ -51,115 +51,137 @@ import java.io.Serializable; * actions associated with them. That is, you either have the permission * or you don't. * - * The most important method in this class is implies. This + *

          The most important method in this class is implies. This * checks whether if one has this permission, then the specified * permission is also implied. As a conceptual example, consider the * permissions "Read All Files" and "Read File foo". The permission * "Read All Files" implies that the caller has permission to read the * file foo. * - * Permission's are not dynamic objects. Once created, a - * Permission's name and action list cannot be changed. + *

          Permission's must be immutable - do not change their + * state after creation. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @see Permissions + * @see PermissionCollection + * @since 1.1 + * @status updated to 1.4 */ public abstract class Permission implements Guard, Serializable { /** - * This is the name assigned to this permission object. + * Compatible with JDK 1.1+. */ - private String name; // Taken from the serializable form information + private static final long serialVersionUID = -5636570222231596674L; /** - * This method initializes a new instance of Permission to - * have the specified name. + * This is the name assigned to this permission object. + * + * @serial the name of the permission + */ + private String name; + + /** + * Create an instance with the specified name. + * + * @param name the permission name */ public Permission(String name) { this.name = name; } - /** - * This method returns the name of this Permission - * - * @return The name of this Permission - */ - public final String getName() - { - return (name); - } - - /** - * This method returns the list of actions for this Permission - * as a String. - * - * @return The action list for this Permission. - */ - public abstract String getActions(); - /** * This method implements the Guard interface for this class. - * It calls the checkPermission method in + * It calls the checkPermission method in * SecurityManager with this Permission as its * argument. This method returns silently if the security check succeeds * or throws an exception if it fails. * - * @param obj The Object being guarded - ignored by this class - * - * @exception SecurityException If the security check fails + * @param obj the Object being guarded - ignored by this class + * @throws SecurityException if the security check fails + * @see GuardedObject + * @see SecurityManager#checkPermission(Permission) */ - public void checkGuard(Object obj) throws SecurityException + public void checkGuard(Object obj) { SecurityManager sm = System.getSecurityManager(); if (sm != null) sm.checkPermission(this); } - /** - * Check to see if this object equals OBJ. - */ - public abstract boolean equals (Object obj); - /** * This method tests whether this Permission implies that the * specified Permission is also granted. * - * @param perm The Permission to test against - * - * @return true if the specified Permission is implied by this one, false otherwise. + * @param perm the Permission to test against + * @return true if perm is implied by this */ public abstract boolean implies(Permission perm); /** - * This method returns a hash code for this Permission. + * Check to see if this object equals obj. Use implies, rather + * than equals, when making access control decisions. * - * @return A hash value. + * @param obj the object to compare to + */ + public abstract boolean equals(Object obj); + + /** + * This method returns a hash code for this Permission. It + * must satisfy the contract of Object.hashCode: it must be + * the same for all objects that equals considers to be the same. + * + * @return a hash value */ public abstract int hashCode(); /** - * This method returns a String representation of this - * Permission object. + * Get the name of this Permission. * - * @return This object as a String. + * @return the name */ - public String toString() + public final String getName() { - return ("'\"" + getClass().getName() + "\" \"" + getName() + - "\"" + " \"" + getActions() + "\")'"); + return name; } + /** + * This method returns the list of actions for this Permission + * as a String. The string should be in canonical order, for + * example, both new FilePermission(f, "write,read") and + * new FilePermission(f, "read,write") have the action list + * "read,write". + * + * @return the action list for this Permission + */ + public abstract String getActions(); + /** * This method returns an empty PermissionCollection object * that can store permissions of this type, or null if no - * such collection is defined. + * such collection is defined. Subclasses must override this to provide + * an appropriate collection when one is needed to accurately calculate + * implies. * - * @return A new PermissionCollection + * @return a new PermissionCollection */ public PermissionCollection newPermissionCollection() { return null; } -} + + /** + * This method returns a String representation of this + * Permission object. This is in the format: + * '(' + getClass().getName() + ' ' + getName() + ' ' + getActions + * + ')'. + * + * @return this object as a String + */ + public String toString() + { + return '(' + getClass().getName() + ' ' + getName() + ' ' + + getActions() + ')'; + } +} // class Permission diff --git a/libjava/java/security/PermissionCollection.java b/libjava/java/security/PermissionCollection.java index f4638bfa1395..703767ed9a9b 100644 --- a/libjava/java/security/PermissionCollection.java +++ b/libjava/java/security/PermissionCollection.java @@ -1,5 +1,5 @@ /* PermissionCollection.java -- A collection of permission objects - Copyright (C) 1998, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,74 +40,87 @@ package java.security; import java.io.Serializable; import java.util.Enumeration; - /** - * This class models a group of Java permissions. It has convenient - * methods for determining whether or not a given permission is implied - * by any of the permissions in this collection. - *

          - * Some care must be taken in storing permissions. First, a collection of - * the appropriate type must be created. This is done by calling the - * newPermissionCollection method on an object of the - * permission class you wish to add to the collection. If this method - * returns null, any type of PermissionCollection - * can be used to store permissions of that type. However, if a - * PermissionCollection collection object is returned, that - * type must be used. - *

          - * The PermissionCollection's returned - * by the newPermissionCollection instance in a subclass of - * Permission is a homogeneous collection. It only will - * hold permissions of one specified type - instances of the class that - * created it. Not all PermissionCollection subclasses - * have to hold permissions of only one type however. For example, - * the Permissions class holds permissions of many types. - *

          - * Since the newPermissionCollection in Permission - * itself returns null, by default a permission can be stored - * in any type of collection unless it overrides that method to create its - * own collection type. - * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) - */ -public abstract class PermissionCollection - extends Object - implements Serializable +/** + * This class models a group of Java permissions. It has convenient + * methods for determining whether or not a given permission is implied + * by any of the permissions in this collection. + * + *

          Some care must be taken in storing permissions. First, a collection of + * the appropriate type must be created. This is done by calling the + * newPermissionCollection method on an object of the + * permission class you wish to add to the collection. If this method + * returns null, any type of PermissionCollection + * can be used to store permissions of that type. However, if a + * PermissionCollection collection object is returned, that + * type must be used. + * + *

          A PermissionCollection returned by the + * newPermissionCollection method in a subclass of + * Permission is a homogeneous collection. It only will + * hold permissions of one specified type - instances of the class that + * created it. Not all PermissionCollection subclasses + * have to hold permissions of only one type however. For example, + * the Permissions class holds permissions of many types. + * + *

          Since the newPermissionCollection in Permission + * itself returns null, by default a permission can be stored + * in any type of collection unless it overrides that method to create its + * own collection type. + * + * @author Aaron M. Renn + * @author Eric Blake + * @see Permission + * @see Permissions + * @since 1.1 + * @status updated to 1.4 + */ +public abstract class PermissionCollection implements Serializable { - private static final String linesep = null; - - static - { - String linesep = System.getProperty("line.separator"); - if (linesep == null); - linesep = "\n"; - } + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -6727011328946861783L; /** * Indicates whether or not this collection is read only. + * + * @serial if the collection is read-only */ private boolean readOnly; /** - * This method initializes a new instance of PermissionCollection. - * This is provided only as a default constructor and does nothing in this - * class. + * Create a new collection. */ public PermissionCollection() { } /** - * This method tests whether or not this PermissionCollection - * object is read only. + * This method adds a new Permission object to the collection. * - * @return true if this collection is read only, false otherwise + * @param perm the Permission to add + * + * @throws SecurityException if the collection is marked read only + * @throws IllegalArgumentException if perm is of the wrong type */ - public boolean isReadOnly() - { - return (readOnly); - } + public abstract void add(Permission perm); + + /** + * This method tests whether the specified Permission object is + * implied by this collection of Permission objects. + * + * @param perm the Permission object to test + * @return true if the collection implies perm + */ + public abstract boolean implies(Permission perm); + + /** + * This method returns an Enumeration of all the objects in + * this collection. + * + * @return an Enumeration of this collection's objects + */ + public abstract Enumeration elements(); /** * This method sets this PermissionCollection object to be @@ -119,57 +132,36 @@ public abstract class PermissionCollection readOnly = true; } - /** - * This method adds a new Permission object to the collection. - * - * @param perm The Permission to add. - * - * @exception SecurityException If the collection is marked read only. - * @exception IllegalArgumentException If a permission of the specified type cannot be added - */ - public abstract void - add(Permission perm) throws SecurityException, IllegalArgumentException; - /** - * This method returns an Enumeration of all the objects in - * this collection. + * This method tests whether or not this PermissionCollection + * object is read only. * - * @return An Enumeration of this collection's objects. + * @return true if this collection is read only */ - public abstract Enumeration elements(); - - /** - * This method tests whether the specified Permission object is - * implied by this collection of Permission objects. - * - * @param perm The Permission object to test. - * - * @return true if the specified Permission is implied by this collection, false otherwise. - */ - public abstract boolean implies(Permission perm); + public boolean isReadOnly() + { + return readOnly; + } /** * This method returns a String representation of this - * collection. It will print the class name and has code in the same - * manner as Object.toString() then print a listing of all - * the Permission objects contained. + * collection. It is formed by: + * 

          +   * super.toString()" (\n"
+   *   // enumerate all permissions, one per line
+   * ")\n"
+   *
          * - * @return A String representing this object. + * @return a String representing this object */ public String toString() { - StringBuffer sb = new StringBuffer(""); + StringBuffer sb = new StringBuffer(super.toString()); - sb.append(super.toString() + " (" + linesep); + sb.append(" (\n"); Enumeration e = elements(); while (e.hasMoreElements()) - { - Object obj = e.nextElement(); - if (obj instanceof Permission) - sb.append(((Permission) obj).toString() + linesep); - } - - sb.append(")" + linesep); - return (sb.toString()); + sb.append(' ').append(e.nextElement()).append('\n'); + return sb.append(")\n").toString(); } -} +} // class PermissionCollection diff --git a/libjava/java/security/Permissions.java b/libjava/java/security/Permissions.java index 9356c10cfb57..11343f4784be 100644 --- a/libjava/java/security/Permissions.java +++ b/libjava/java/security/Permissions.java @@ -1,5 +1,5 @@ -/* Permissions.java -- A collection of permission collections - Copyright (C) 1998, 2001 Free Software Foundation, Inc. +/* Permissions.java -- a collection of permission collections + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,32 +43,40 @@ import java.util.Enumeration; import java.util.NoSuchElementException; /** - * This class is a heterogeneous collection of permissions. It is + * This class is a heterogeneous collection of permissions. It is * organized as a collection of PermissionCollection's stored * in a hashtable. Each individual PermissionCollection - * contains permissions of a single type. If a specific type of + * contains permissions of a single type. If a specific type of * Permission does not provide a collection type to use * via its newPermissionCollection method, then a default * collection type which stores its permissions in a hash table will be * used. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @author Eric Blake + * @since 1.1 */ -public final class Permissions - extends PermissionCollection +public final class Permissions extends PermissionCollection implements Serializable { + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 4858622370623524688L; + /** * Holds instances of AllPermission. + * + * @serial the permission collection for AllPermission */ private PermissionCollection allPermission; /** * This is the Hashtable that contains our collections. + * + * @serial maps Class to PermissionCollection */ - Hashtable perms = new Hashtable(); + private final Hashtable perms = new Hashtable(); /** * This method initializes a new instance of Permissions. @@ -82,51 +90,38 @@ public final class Permissions * will be stored in a PermissionCollection of the appropriate * type, as determined by calling newPermissionCollection on * the specified permission (if an appropriate collection does not already - * exist). If this object does not specify a particular type of collection, - * a default collection which stores in permissions in a hash table will + * exist). If this object does not specify a particular type of collection, + * a default collection, which stores in permissions in a hash table, will * be used. * - * @param perm The Permission object to be added to this collection. - * - * @exception SecurityException If this collection is marked as read only. - * @exception IllegalArgumentException If the specified Permission cannot be added to this collection + * @param perm the Permission to add + * @throws SecurityException if this collection is marked as read only */ public void add(Permission perm) - throws SecurityException, IllegalArgumentException { if (isReadOnly()) throw new SecurityException("PermissionCollection is read only"); - if (perm instanceof AllPermission) { - if (allPermission == null) - { - allPermission = new - DefaultPermissionCollection("java.security.AllPermission"); - - perms.put("java.security.AllPermission", allPermission); - } + if (allPermission == null) + { + allPermission = perm.newPermissionCollection(); + allPermission.add(perm); + perms.put(perm.getClass(), allPermission); + } } else { - Object obj = perms.get(perm.getClass().getName()); - if (obj != null) - { - if (!(obj instanceof PermissionCollection)) - throw new RuntimeException("Internal error in Permissions"); - - ((PermissionCollection) obj).add(perm); - } - else - { - PermissionCollection pc = perm.newPermissionCollection(); - if (pc == null) - pc = new DefaultPermissionCollection(perm.getClass().getName()); - - pc.add(perm); - - perms.put(perm.getClass().getName(), pc); - } + PermissionCollection pc + = (PermissionCollection) perms.get(perm.getClass()); + if (pc == null) + { + pc = perm.newPermissionCollection(); + if (pc == null) + pc = new PermissionsHash(); + perms.put(perm.getClass(), pc); + } + pc.add(perm); } } @@ -134,23 +129,16 @@ public final class Permissions * This method tests whether or not the specified Permission * is implied by this PermissionCollection. * - * @param perm The Permission to test. - * - * @return true if the specified permission is implied by this PermissionCollection, or false otherwise. + * @param perm the Permission to test + * @return true if the specified permission is implied by this */ public boolean implies(Permission perm) { if (allPermission != null) - return (true); - - Object obj = perms.get(perm.getClass().getName()); - if (obj == null) - return (false); - - if (!(obj instanceof PermissionCollection)) - return (false); - - return (((PermissionCollection) obj).implies(perm)); + return true; + PermissionCollection pc + = (PermissionCollection) perms.get(perm.getClass()); + return pc == null ? false : pc.implies(perm); } /** @@ -158,7 +146,7 @@ public final class Permissions * list of all Permission objects contained in this * collection. * - * @return An Enumeration of this collection's elements. + * @return an Enumeration of this collection's elements */ public Enumeration elements() { @@ -169,102 +157,87 @@ public final class Permissions public boolean hasMoreElements() { - if (sub_enum == null) - if (main_enum == null) - return (false); - else - { - if (!main_enum.hasMoreElements()) - return (false); - else - { - try - { - PermissionCollection pc = - (PermissionCollection) main_enum.nextElement(); - sub_enum = pc.elements(); - } - catch (NoSuchElementException e) - { - return (false); - } - } - } - else if (!sub_enum.hasMoreElements()) - { - sub_enum = null; - return (hasMoreElements()); - } - - return (true); + if (sub_enum == null) + { + if (main_enum == null) + return false; + if (! main_enum.hasMoreElements()) + { + main_enum = null; + return false; + } + PermissionCollection pc = + (PermissionCollection) main_enum.nextElement(); + sub_enum = pc.elements(); + } + if (! sub_enum.hasMoreElements()) + { + sub_enum = null; + return hasMoreElements(); + } + return true; } - public Object nextElement() throws NoSuchElementException + public Object nextElement() { - if (!hasMoreElements()) - throw new NoSuchElementException(); - - return (sub_enum.nextElement()); + if (! hasMoreElements()) + throw new NoSuchElementException(); + return sub_enum.nextElement(); } }; } - - static class DefaultPermissionCollection extends PermissionCollection - implements Serializable +} // class Permissions + +/** + * Implements the permission collection for all permissions without one of + * their own, and obeys serialization of JDK. + * + * @author Eric Blake + */ +class PermissionsHash extends PermissionCollection +{ + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -8491988220802933440L; + + /** + * Hashtable where we store permissions. + * + * @serial the stored permissions, both as key and value + */ + private final Hashtable perms = new Hashtable(); + + /** + * Add a permission. We don't need to check for read-only, as this + * collection is never exposed outside of Permissions, which has already + * done that check. + * + * @param perm the permission to add + */ + public void add(Permission perm) { - - // Type of Permission we can store - private Class permcls; - - // Hashtable where we store permissions. - private Hashtable perms = new Hashtable(); - - DefaultPermissionCollection(String permtype) throws IllegalArgumentException - { - try - { - permcls = Class.forName(permtype); - } - catch(ClassNotFoundException e) - { - throw new IllegalArgumentException(e.getMessage()); - } - } - - public void add(Permission perm) - throws SecurityException, IllegalArgumentException - { - if (isReadOnly()) - throw new SecurityException("PermissionCollection is read only"); - - if (!permcls.isInstance(perm)) - throw new IllegalArgumentException("Wrong permission type: " + - perm.getClass().getName()); - - if (perms.get(perm.getName()) != null) - throw new IllegalArgumentException("Duplicate permission: " + - perm.getName()); - - perms.put(perm.getName(), perm); - } - - public boolean implies(Permission perm) - { - Object obj = perms.get(perm.getName()); - if (obj == null) - return(false); - - if (!(obj instanceof Permission)) - return(false); - - Permission p = (Permission)obj; - - return(p.implies(perm)); - } - - public Enumeration elements() - { - return(perms.elements()); - } + perms.put(perm, perm); } -} + + /** + * Returns true if perm is in the collection. + * + * @param perm the permission to check + * @return true if it is implied + */ + public boolean implies(Permission perm) + { + return perms.get(perm) != null; + } + + /** + * Return the elements. + * + * @return the elements + */ + public Enumeration elements() + { + return perms.elements(); + } +} // class Permissions diff --git a/libjava/java/security/Policy.java b/libjava/java/security/Policy.java index 3b9995cfc1e3..126c084f6fa9 100644 --- a/libjava/java/security/Policy.java +++ b/libjava/java/security/Policy.java @@ -85,9 +85,23 @@ public abstract class Policy // FIXME: The class name of the Policy provider should really be sourced // from the "java.security" configuration file. For now, just hard-code // a stub implementation. - static private Policy currentPolicy - = new gnu.java.security.provider.DefaultPolicy(); - + static private Policy currentPolicy = null; + static + { + String pp = System.getProperty ("policy.provider"); + if (pp != null) + try + { + currentPolicy = (Policy)Class.forName(pp).newInstance(); + } + catch (Exception _) + { + currentPolicy = null; + } + if (currentPolicy == null) + currentPolicy = new gnu.java.security.provider.DefaultPolicy(); + } + /** Constructs a new Policy class. */ diff --git a/libjava/java/security/Principal.java b/libjava/java/security/Principal.java index 5dc4102fdafa..2ac69b2c5633 100644 --- a/libjava/java/security/Principal.java +++ b/libjava/java/security/Principal.java @@ -1,5 +1,5 @@ /* Principal.java -- A security entity - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,48 +35,51 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.security; /** - * This interface models an entity (such as a user or a certificate authority) - * for the purposes of applying the Java security model. - * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * This interface models an entity (such as a user or a certificate authority) + * for the purposes of applying the Java security model. + * + * @author Aaron M. Renn + * @see X509Certificate + * @since 1.1 + * @status updated to 1.4 */ public interface Principal { - /** - * This method returns a String that names this - * Principal. - * - * @return The name of this Principal. - */ - public abstract String getName(); - /** * This method tests another Principal object for equality * with this one. - * - * @param obj The Object (which is a Principal) to test for equality against. * - * @return true if the specified Principal is equal to this one, false otherwise. + * @param obj the Object to test for equality + * @return true if the specified Principal is equal */ - public abstract boolean equals(Object obj); - - /** - * This method returns a hash code value for this Principal. - * - * @return A hash value - */ - public abstract int hashCode(); + boolean equals(Object obj); /** * This method returns a String representation of this * Principal. * - * @return This Principal represented as a String. + * @return this Principal represented as a String */ - public abstract String toString(); -} + String toString(); + + /** + * This method returns a hash code value for this Principal. + * Remember the contract of hashCode - two objects which compare as + * equals() must have the same hashCode(). + * + * @return a hash value + */ + int hashCode(); + + /** + * This method returns a String that names this + * Principal. + * + * @return the name of this Principal + */ + String getName(); +} // interface Principal diff --git a/libjava/java/security/PrivateKey.java b/libjava/java/security/PrivateKey.java index e296ac8dbbba..feae3f916934 100644 --- a/libjava/java/security/PrivateKey.java +++ b/libjava/java/security/PrivateKey.java @@ -1,5 +1,5 @@ -/* PrivateKey.java -- "Super-interface" for all private keys - Copyright (C) 1998, 2001 Free Software Foundation, Inc. +/* PrivateKey.java -- tagging interface for all private keys + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,13 +39,24 @@ exception statement from your version. */ package java.security; /** - * This interface specified no methods. In simply provides a common - * super-interface for all algorithm specific private key values. - * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * This interface specified no methods. In simply provides a common + * super-interface for all algorithm specific private key values. + * + * @author Aaron M. Renn + * @see Key + * @see PublicKey + * @see Certificate + * @see Signature#initVerify(PublicKey) + * @see DSAPrivateKey + * @see RSAPrivateKey + * @see RSAPrivateCrtKey + * @since 1.1 + * @status updated to 1.4 */ public interface PrivateKey extends Key { -} + /** + * The verion identifier used for serialization. + */ + long serialVersionUID = 6034044314589513430L; +} // interface PrivateKey diff --git a/libjava/java/security/PrivilegedAction.java b/libjava/java/security/PrivilegedAction.java index e3959024d83d..108c7aeb506a 100644 --- a/libjava/java/security/PrivilegedAction.java +++ b/libjava/java/security/PrivilegedAction.java @@ -1,5 +1,5 @@ /* PrivilegedAction.java -- Perform a privileged action - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,14 +38,16 @@ exception statement from your version. */ package java.security; /** - * This interface specifes a single run method that - * executes a privileged operation. This method is called by + * This interface specifes a single run method that + * executes a privileged operation. This method is called by * AccessController.doPrivileged() after that method * activiates the required privileges. * - * @version 0.0 - * * @author Aaron M. Renn (arenn@urbanophile.com) + * @see AccessController + * @see PrivilegedExceptionAction + * @since 1.1 + * @status updated to 1.4 */ public interface PrivilegedAction { @@ -55,6 +57,8 @@ public interface PrivilegedAction * AccessController.doPrivileged(). * * @return obj An implementation dependent return value + * @see AccessController#doPrivileged(PrivilegedAction) + * @see AccessController#doPrivileged(PrivilegedAction, AccessControlContext) */ - public abstract Object run(); -} + Object run(); +} // interface PrivilegedAction diff --git a/libjava/java/security/PrivilegedActionException.java b/libjava/java/security/PrivilegedActionException.java index 270bcebc6334..633a872cfe55 100644 --- a/libjava/java/security/PrivilegedActionException.java +++ b/libjava/java/security/PrivilegedActionException.java @@ -1,6 +1,5 @@ -/* PrivilegedActionException.java -- An exception occurred in a - privileged action. - Copyright (C) 1998 Free Software Foundation, Inc. +/* PrivilegedActionException.java -- wrap an exception in a privileged action + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,76 +37,73 @@ exception statement from your version. */ package java.security; -import java.io.PrintStream; -import java.io.PrintWriter; - /** * This exception is thrown when an exception is thrown during a - * privileged action being performed with the - * AccessController.doPrivileged() method. It wrappers the + * privileged action being performed with the + * AccessController.doPrivileged() method. It wraps the * actual exception thrown in the privileged code. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @author Eric Blake + * @see PrivilegedExceptionAction + * @see AccessController#doPrivileged(PrivilegedExceptionAction) + * @see AccessController#doPrivileged(PrivilegedExceptionAction, AccessControlContext) + * @status updated to 1.4 */ public class PrivilegedActionException extends Exception { - /** - * This is the actual exception that occurred + * Compatible with JDK 1.1+. */ - private Exception e; + private static final long serialVersionUID = 4724086851538908602L; /** - * This method initializes a new instance of PrivilegedActionException - * that wrappers the specified Exception. + * This is the actual exception that occurred. * - * @param e The Exception to wrapper + * @serial the wrapped exception + */ + private Exception exception; + + /** + * Create a new instance that wraps the specified Exception. + * + * @param e the Exception to wrap */ public PrivilegedActionException(Exception e) { - this.e = e; + super(e); + exception = e; } /** - * This method returns the underlying Exception that caused - * this exception to be raised. + * Get the underlying Exception that caused this one. This + * is a legacy method, the preferred way is {@link #getCause()}. * - * @return The wrappered Exception. + * @return the cause */ public Exception getException() { - return (e); + return exception; } /** - * This method prints the stack trace of the wrappered exception. - */ - public void printStackTrace() - { - e.printStackTrace(); - } - - /** - * This method prints the stack trace of the wrappered exception to the - * specified PrintStream. + * Gets the cause of this exception. * - * @param ps The PrintStream to print the stack trace to. + * @return the cause + * @since 1.4 */ - public void printStackTrace(PrintStream ps) + public Throwable getCause() { - e.printStackTrace(ps); + return exception; } /** - * This method prints the stack trace of the wrappered exception to the - * specified PrintWriter. + * Convert this to a String. * - * @param pw The PrintWriter to print the stack trace to. + * @return the string representation */ - public void printStackTrace(PrintWriter pw) + public String toString() { - e.printStackTrace(pw); + return super.toString(); } } diff --git a/libjava/java/security/PrivilegedExceptionAction.java b/libjava/java/security/PrivilegedExceptionAction.java index 8a15e5431a9b..b376c6c44574 100644 --- a/libjava/java/security/PrivilegedExceptionAction.java +++ b/libjava/java/security/PrivilegedExceptionAction.java @@ -1,5 +1,5 @@ /* PrivilegedExceptionAction.java -- Perform a privileged operation - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,15 +38,15 @@ exception statement from your version. */ package java.security; /** - * This interface defines a method that is called by + * This interface defines a method that is called by * AccessController.doPrivileged() in order to perform a * privileged operation with higher privileges enabled. This interface * differs from PrivilegedAction in that the run * method in this interface may throw a checked exception. * - * @version 0.0 - * * @author Aaron M. Renn (arenn@urbanophile.com) + * @since 1.1 + * @status updated to 1.4 */ public interface PrivilegedExceptionAction { @@ -55,9 +55,11 @@ public interface PrivilegedExceptionAction * successfully complete. It is called when a section of code invokes * AccessController.doPrivileged(). * - * @return obj An implementation defined return value. - * - * @exception Exception An implementation specific exception. + * @return obj An implementation defined return value + * @throws Exception An implementation specific exception + * @see AccessController#doPrivileged(PrivilegedExceptionAction) + * @see AccessController#doPrivileged(PrivilegedExceptionAction, + * AccessControlContext) */ - public abstract Object run() throws Exception; -} + Object run() throws Exception; +} // interface PrivilegedExceptionAction diff --git a/libjava/java/security/ProtectionDomain.java b/libjava/java/security/ProtectionDomain.java index f94d996586c1..35d6d73a7d8f 100644 --- a/libjava/java/security/ProtectionDomain.java +++ b/libjava/java/security/ProtectionDomain.java @@ -132,12 +132,14 @@ public class ProtectionDomain public String toString() { StringBuffer sb = new StringBuffer(""); - - sb.append(super.toString() + " (" + linesep); - sb.append(code_source.toString()); - sb.append(perms.toString()); - sb.append(")" + linesep); - + sb.append("ProtectionDomain (" + linesep); + if (code_source == null) + sb.append("CodeSource:null" + linesep); + else + sb.append(code_source + linesep); + sb.append(perms); + sb.append(linesep + ")" + linesep); + return sb.toString(); } } diff --git a/libjava/java/security/ProviderException.java b/libjava/java/security/ProviderException.java index ea077c58edc5..eac3eb064c89 100644 --- a/libjava/java/security/ProviderException.java +++ b/libjava/java/security/ProviderException.java @@ -1,5 +1,5 @@ /* ProviderException.java -- Generic security provider runtime exception - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,26 +41,27 @@ package java.security; * This exception indicates that a runtime problem was encounterd with * a security provider. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @status updated to 1.4 */ public class ProviderException extends RuntimeException { /** - * This method initializes a new instance of ProviderException - * with no descriptive error message. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 5256023526693665674L; + + /** + * Create an instance with no descriptive error message. */ public ProviderException() { - super(); } /** - * This method initializes a new instance of ProviderException - * with a descriptive error message. + * Create an instance with a descriptive error message. * - * @param msg The descriptive error message. + * @param msg the descriptive error message */ public ProviderException(String msg) { diff --git a/libjava/java/security/PublicKey.java b/libjava/java/security/PublicKey.java index e17c513cfd12..de4a5762383c 100644 --- a/libjava/java/security/PublicKey.java +++ b/libjava/java/security/PublicKey.java @@ -1,5 +1,5 @@ -/* PublicKey.java -- "Super-interface" for all public keys - Copyright (C) 1998, 2001 Free Software Foundation, Inc. +/* PublicKey.java -- tagging interface for all public keys + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,10 +41,20 @@ package java.security; * This interface specified no methods. In simply provides a common * super-interface for all algorithm specific public key values. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @see Key + * @see PrivateKey + * @see Certificate + * @see Signature#initVerify(PublicKey) + * @see DSAPublicKey + * @see RSAPublicKey + * @since 1.1 + * @status updated to 1.4 */ public interface PublicKey extends Key { -} + /** + * The verion identifier used for serialization. + */ + long serialVersionUID = 7187392471159151072L; +} // interface PublicKey diff --git a/libjava/java/security/SecureClassLoader.java b/libjava/java/security/SecureClassLoader.java index d4ba77b57217..9a4e672f70a1 100644 --- a/libjava/java/security/SecureClassLoader.java +++ b/libjava/java/security/SecureClassLoader.java @@ -51,12 +51,16 @@ public class SecureClassLoader extends ClassLoader protected SecureClassLoader(ClassLoader parent) { super(parent); - // FIXME: What else? + SecurityManager sm = System.getSecurityManager(); + if(sm != null) + sm.checkCreateClassLoader(); } protected SecureClassLoader() { - // FIXME: What do we need to do here? + SecurityManager sm = System.getSecurityManager(); + if(sm != null) + sm.checkCreateClassLoader(); } /** diff --git a/libjava/java/security/SecurityPermission.java b/libjava/java/security/SecurityPermission.java index d6e5bd2597a4..a9982d4c3f8f 100644 --- a/libjava/java/security/SecurityPermission.java +++ b/libjava/java/security/SecurityPermission.java @@ -1,5 +1,5 @@ /* SecurityPermission.java -- Class for named security permissions - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,56 +38,126 @@ exception statement from your version. */ package java.security; /** - * This class provides a mechanism for specified named permissions + * This class provides a mechanism for specified named permissions * related to the Java security framework. These permissions have no - * associated actions list. They are either granted or no granted. - *

          - * The list of valid permission names is: - *

            - *
          • getPolicy - Allows retrieval of the system security policy. - *
          • setPolicy - Allows the security policy to be changed. - *
          • getProperty.<key> - Allows retrieval of the value of the named - * property or all properties if <key> is a '*'. - *
          • setProperty.<key> - Allows changing of the value of the named - * property or all properties if <key> is a '*'. - *
          • insertProvider.<key> - Allows the named provider to be added, - * or any provide if the key is '*'. - *
          • removeProvider.<key> - Allows the named provider to be removed, - * or any provide if the key is '*'. - *
          • setSystemScope - Allows the system identity scope to be set. - *
          • setIdentityPublicKey - Allows the public key of an Identity to be set. - *
          • SetIdentityInfo - Allows the description of an Identity to be set. - *
          • addIdentityCertificate - Allows a certificate to be set for the public - * key of an identity. - *
          • removeIdentityCertificate - Allows a certificate to be removed from the - * public key of an identity. - *
          • clearProviderProperties.<key%gt; - Allows the properties of the - * named provider to be cleared, or all providers if key is '*'. - *
          • putProviderProperty.<key%gt; - Allows the properties of the - * named provider to be changed, or all providers if key is '*'. - *
          • removeProviderProperty.<key%gt; - Allows the properties of the - * named provider to be deleted, or all providers if key is '*'. - *
          • getSignerPrivateKey - Allows the retrieval of the private key for - * a signer. - *
          • setSignerKeyPair - Allows the public and private key of a Signer to - * be changed. - *
          - *

          - * There is some degree of security risk in granting any of these permissions. - * Some of them can completely compromise system security. Please exercise - * extreme caution in granting these permissions. + * associated actions list. They are either granted or not granted. * - * @version 0.0 + *

          The list of valid permission names is:
          + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
          Permission NamePermission AllowsRisks + *
          createAccessControlContextAllows creation of an AccessControlContextThe new control context can have a rogue DomainCombiner, leading + * to a privacy leak
          getDomainCombinerGet a DomainCombiner from an AccessControlContextAccess to a DomainCombiner can lead to a privacy leak
          getPolicyAllows retrieval of the system security policyMalicious code can use information from the policy to better plan + * an attack
          setPolicyAllows the security policy to be changedMalicious code can give itself any permission it wants
          getProperty.keyRetrieve the property specified by the keyMalicious code can use information from the property to better plan + * an attack
          setProperty.keyAllows changing of the value of all properties implied by keyMalicious code can insert rogue classes to steal keys or recreate + * the security policy with whatever permissions it desires
          insertProvider.keyAllows the named provider to be addedMalicious code can insert rogue providers that steal data
          removeProvider.keyAllows the named provider to be removedA missing provider can cripple code that relies on it
          setSystemScopeAllows the system identity scope to be setMalicious code can add certificates not available in the original + * identity scope, to gain more permissions
          setIdentityPublicKeyAllows the public key of an Identity to be setMalicious code can install its own key to gain permissions not + * allowed by the original identity scope
          SetIdentityInfoAllows the description of an Identity to be setMalicious code can spoof users into trusting a fake identity
          addIdentityCertificateAllows a certificate to be set for the public key of an identityThe public key can become trusted to a wider audience than originally + * intended
          removeIdentityCertificateAllows removal of a certificate from an identity's public keyThe public key can become less trusted than it should be
          printIdentityView the name of the identity and scope, and whether they are + * trustedThe scope may include a filename, which provides an entry point for + * further security breaches
          clearProviderProperties.keyAllows the properties of the named provider to be clearedThis can disable parts of the program which depend on finding the + * provider
          putProviderProperty.keyAllows the properties of the named provider to be changedMalicious code can replace the implementation of a provider
          removeProviderProperty.keyAllows the properties of the named provider to be deletedThis can disable parts of the program which depend on finding the + * provider
          getSignerPrivateKeyAllows the retrieval of the private key for a signerAnyone that can access the private key can claim to be the + * Signer
          setSignerKeyPairAllows the public and private key of a Signer to be changedThe replacement might be a weaker encryption, or the attacker + * can use knowledge of the replaced key to decrypt an entire + * communication session
          + * + *

          There is some degree of security risk in granting any of these + * permissions. Some of them can completely compromise system security. + * Please exercise extreme caution in granting these permissions. * * @author Aaron M. Renn (arenn@urbanophile.com) + * @see Permission + * @see SecurityManager + * @since 1.1 + * @status updated to 1.4 */ public final class SecurityPermission extends BasicPermission { /** - * This method initializes a new instance of SecurityPermission - * to have the specified name. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 5236109936224050470L; + + /** + * Create a new instance with the specified name. * - * @param name The name to assign to this permission. + * @param name the name to assign to this permission */ public SecurityPermission(String name) { @@ -95,15 +165,14 @@ public final class SecurityPermission extends BasicPermission } /** - * This method initializes a new instance of SecurityPermission - * to have the specified name. The actions parameter is ignored in this - * class. + * Create a new instance with the specified name. As SecurityPermission + * carries no actions, the second parameter is ignored. * - * @param name The name to assign to this permission. - * @param actions The action list for this permission - ignored. + * @param name the name to assign to this permission + * @param actions ignored */ public SecurityPermission(String name, String actions) { - super(name, actions); + super(name); } -} +} // class SecurityPermission diff --git a/libjava/java/security/SignatureException.java b/libjava/java/security/SignatureException.java index 7b48cb579b21..8762b0683ccb 100644 --- a/libjava/java/security/SignatureException.java +++ b/libjava/java/security/SignatureException.java @@ -1,5 +1,5 @@ /* SignatureException.java -- Generic error in signature - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,24 +41,27 @@ package java.security; * This exception is thrown when a problem is encountered with a * digital signature. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @status updated to 1.4 */ public class SignatureException extends GeneralSecurityException { /** - * This method initializes a new instance of SignatureException - * with no descriptive error message. + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 7509989324975124438L; + + /** + * Create an instance with no descriptive error message. */ public SignatureException() { - super(); } /** - * This method initializes a new instance of SignatureException - * with a descriptive error message. + * Create an instance with a descriptive error message. + * + * @param msg the message */ public SignatureException(String msg) { diff --git a/libjava/java/security/UnrecoverableKeyException.java b/libjava/java/security/UnrecoverableKeyException.java index 539c04f8a0b5..3e93153ad7d2 100644 --- a/libjava/java/security/UnrecoverableKeyException.java +++ b/libjava/java/security/UnrecoverableKeyException.java @@ -1,5 +1,5 @@ /* UnrecoverableKeyException.java -- Cannot recover a key from the key store - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,26 +41,28 @@ package java.security; * This exception is thrown when a key cannot be recovered from the key * store. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @since 1.2 + * @status updated to 1.4 */ public class UnrecoverableKeyException extends GeneralSecurityException { /** - * This method initializes a new instance of UnrecoverableKeyException - * with no descriptive error message. + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 7275063078190151277L; + + /** + * Create an instance with no descriptive error message. */ public UnrecoverableKeyException() { - super(); } /** - * This method initializes a new instance of UnrecoverableKeyException - * with a descriptive error message. + * Create an instance with a descriptive error message. * - * @param msg The descriptive error message. + * @param msg the descriptive error message */ public UnrecoverableKeyException(String msg) { diff --git a/libjava/java/security/UnresolvedPermission.java b/libjava/java/security/UnresolvedPermission.java index d7c74a3b68e6..954b562c7735 100644 --- a/libjava/java/security/UnresolvedPermission.java +++ b/libjava/java/security/UnresolvedPermission.java @@ -1,5 +1,5 @@ -/* UnresolvedPermission.java -- Placeholder for unresolved permissions. - Copyright (C) 1998, 2001 Free Software Foundation, Inc. +/* UnresolvedPermission.java -- Placeholder for unresolved permissions + Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,162 +38,266 @@ exception statement from your version. */ package java.security; import java.io.Serializable; -// All uses of Certificate in this file refer to this class. +// All uses of Certificate in this file refer to the one in the listed +// package, not this one. import java.security.cert.Certificate; +import java.util.Arrays; +import java.util.Hashtable; +import java.util.Vector; +import java.util.Enumeration; +import java.util.NoSuchElementException; /** * This class is used to hold instances of all permissions that cannot - * be resolved to available permission classes when the security + * be resolved to available permission classes when the security * Policy object is instantiated. This may happen when the * necessary security class has not yet been downloaded from the network. - *

          - * Instances of this class are re-resolved when AccessController - * check is done. At that time, a scan is made of all existing - * UnresolvedPermission objects and they are converted to - * objects of the appropriate permission type if the class for that type - * is then available. * - * @version 0.0 + *

          Instances of this class are re-resolved when + * AccessController check is done. At that time, a scan is + * made of all existing UnresolvedPermission objects and they + * are converted to objects of the appropriate permission type if the class + * for that type is then available. * * @author Aaron M. Renn (arenn@urbanophile.com) + * @see Permission + * @see Permissions + * @see PermissionCollection + * @see Policy + * @since 1.1 + * @status updated to 1.4 */ -public final class UnresolvedPermission - extends Permission - implements Serializable +public final class UnresolvedPermission extends Permission { + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -4821973115467008846L; /** - * The list of actions associated with this permission object + * The list of actions associated with this permission object. + * + * @serial the permission actions */ - private String actions; + private final String actions; /** - * The list of Certificates associated with this object + * The list of Certificates associated with this object. */ - private Certificate[] certs; + private final transient Certificate[] certs; /** * The name of the class this object should be resolved to. + * + * @serial the fully-qualified classname of the resolved type */ - private String type; + // Package visible for use by UnresolvedPermissionCollection. + final String type; /** - * This method initializes a new instance of UnresolvedPermission - * with all the information necessary to resolve it to an instance of the - * proper class at a future time. + * The name of the permission. * - * @param type The name of the desired class this permission should be resolved to - * @param name The name of this permission - * @param actions The action list for this permission - * @param certs The list of certificates this permission's class was signed with + * @serial the permission name + */ + private final String name; + + /** + * Create a new instance with all the information necessary to resolve it + * to an instance of the proper class at a future time. + * + * @param type the fully-qualified name of the class of this permission + * @param name the name of this permission + * @param actions the action list for this permission + * @param certs the list of certificates that sign this permission */ public UnresolvedPermission(String type, String name, String actions, - Certificate[] certs) + Certificate[] certs) { super(name); - + this.name = name; this.type = type; this.actions = actions; this.certs = certs; } - /** - * This method returns the list of actions associated with this - * permission. - * - * @return The action list - */ - public String getActions() - { - return (actions); - } - /** * This method returns false always to indicate that this - * permission does not imply the specified permission. An + * permission does not imply the specified permission. An * UnresolvedPermission never grants any permissions. * - * @param perm The Permission object to test against - ignored by this class - * - * @return false to indicate this permission does not imply the specified permission. + * @param perm the Permission object to test + * @return false; until a permission is resolved, it implies nothing */ public boolean implies(Permission perm) { - return (false); + return false; } /** * This method tests this permission for equality against the specified - * Object. This will be true if and only if the following - * conditions are met: - *

          - *

            - *
          • The specified Object is an instance of - * UnresolvedPermission, or a subclass. + * Object. This will be true if and only if the following + * conditions are met:
              + *
            • The specified Object is an UnresolvedPermission
              • *
            • The specified permission has the same type (i.e., desired class name) - * as this permission. - *
            • The specified permission has the same name as this one. - *
            • The specified permissoin has the same action list as this one. - *
            • The specified permission has the same certificate list as this one. + * as this permission.
              • + *
            • The specified permission has the same name as this one.
              • + *
            • The specified permissoin has the same action list as this one.
              • + *
            • The specified permission has the same certificate list as this + * one.
              • *
            * - * @param obj The Object to test for equality - * - * @return true if the specified object is equal to this one, false otherwise. + * @param obj the Object to test for equality + * @return true if the specified object is equal to this one */ public boolean equals(Object obj) { - if (!(obj instanceof UnresolvedPermission)) + if (! (obj instanceof UnresolvedPermission)) return (false); - UnresolvedPermission up = (UnresolvedPermission) obj; - - if (!getName().equals(up.getName())) - return (false); - - if (!getActions().equals(up.getActions())) - return (false); - - if (!type.equals(up.type)) - return (false); - - if (!certs.equals(up.certs)) - return (false); - - return (true); + return up.name.equals(name) && up.actions.equals(actions) + && up.type.equals(type) && Arrays.equals(up.certs, certs); } /** - * Returns a hash code value for this object. + * Returns a hash code value for this object. Following the lead of + * Permission, this returns the hashcode of the permission name. * * @return A hash value */ public int hashCode() { - return (System.identityHashCode(this)); + return name.hashCode(); + } + + /** + * This method returns the list of actions associated with this + * permission. + * + * @return the action list + */ + public String getActions() + { + return actions; } /** * This method returns a String representation of this * class. The format is: '(unresolved "ClassName "name" "actions")' * - * @return A String representation of this object + * @return String representation of this object */ public String toString() { - return "(unresolved " + type + " " + getName() + " " + getActions() + ")"; + return "(unresolved " + type + ' ' + name + ' ' + actions + ')'; } /** * This class returns a PermissionCollection object that can - * be used to store instances of UnresolvedPermission. If - * null is returned, the caller is free to use any desired - * PermissionCollection. + * be used to store instances of UnresolvedPermission. * - * @return A new PermissionCollection. + * @return a new PermissionCollection */ public PermissionCollection newPermissionCollection() { - return (null); + return new UnresolvedPermissionCollection(); } -} +} // class UnresolvedPermission + +/** + * Implements the permission collection for unresolved permissions, and + * obeys serialization of JDK. + * + * @author Eric Blake + */ +class UnresolvedPermissionCollection extends PermissionCollection +{ + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -7176153071733132400L; + + /** + * Hashtable where we store permissions. + * + * @serial map of typename to a Vector of permissions (you'd think Sun + * would document this better!) + */ + private final Hashtable permissions = new Hashtable(); + + /** + * Add a permission. + * + * @param perm the permission to add + * @throws IllegalArgumentException if perm is not an UnresolvedPermission + * @throws SecurityException if the collection is read-only + */ + public void add(Permission perm) + { + if (isReadOnly()) + throw new SecurityException(); + if (! (perm instanceof UnresolvedPermission)) + throw new IllegalArgumentException(); + UnresolvedPermission up = (UnresolvedPermission) perm; + Vector v = (Vector) permissions.get(up.type); + if (v == null) + { + v = new Vector(); + permissions.put(up.type, v); + } + v.add(up); + } + + /** + * Returns true if perm is implied by the collection. + * + * @param perm the permission to check + * @return false; unresolved permissions imply nothing + */ + public boolean implies(Permission perm) + { + return false; + } + + /** + * Return the elements. + * + * @return the elements + */ + public Enumeration elements() + { + return new Enumeration() + { + Enumeration main_enum = permissions.elements(); + Enumeration sub_enum; + + public boolean hasMoreElements() + { + if (sub_enum == null) + { + if (main_enum == null) + return false; + if (! main_enum.hasMoreElements()) + { + main_enum = null; + return false; + } + Vector v = (Vector) main_enum.nextElement(); + sub_enum = v.elements(); + } + if (! sub_enum.hasMoreElements()) + { + sub_enum = null; + return hasMoreElements(); + } + return true; + } + + public Object nextElement() + { + if (! hasMoreElements()) + throw new NoSuchElementException(); + return sub_enum.nextElement(); + } + }; + } +} // class UnresolvedPermissionCollection diff --git a/libjava/java/security/acl/AclNotFoundException.java b/libjava/java/security/acl/AclNotFoundException.java index 4a234b98708b..a843fac1761e 100644 --- a/libjava/java/security/acl/AclNotFoundException.java +++ b/libjava/java/security/acl/AclNotFoundException.java @@ -1,5 +1,5 @@ -/* AclNotFoundException.java -- What it says - Copyright (C) 1998 Free Software Foundation, Inc. +/* AclNotFoundException.java -- thrown when an ACL is not found + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,17 +41,20 @@ package java.security.acl; * This exception is thrown when a requested access control list (ACL) is * not found. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @status updated to 1.4 */ public class AclNotFoundException extends Exception { + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = 5684295034092681791L; + /** * Initializes a new instance of this class with no descriptive message */ public AclNotFoundException() { - super(); } } diff --git a/libjava/java/security/acl/LastOwnerException.java b/libjava/java/security/acl/LastOwnerException.java index 6eb0ace40359..be2815192fbf 100644 --- a/libjava/java/security/acl/LastOwnerException.java +++ b/libjava/java/security/acl/LastOwnerException.java @@ -1,5 +1,5 @@ /* LastOwnerException.java -- User attempted to delete last ACL owner - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,18 +41,22 @@ package java.security.acl; * This exception is thrown when an attempt is made to delete the last owner * of an access control list (ACL) * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @see Owner#deleteOwner(java.security.Principal, java.security.Principal) + * @status updated to 1.4 */ -public class LastOwnerException extends java.lang.Exception +public class LastOwnerException extends Exception { + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -5141997548211140359L; + /** * Initialize a new instance of LastOwnerException that does * not have a log message. */ public LastOwnerException() { - super(); } } diff --git a/libjava/java/security/acl/NotOwnerException.java b/libjava/java/security/acl/NotOwnerException.java index b17ac651b770..8b2739d9cc47 100644 --- a/libjava/java/security/acl/NotOwnerException.java +++ b/libjava/java/security/acl/NotOwnerException.java @@ -1,5 +1,5 @@ /* NotOwnerException.java -- Attempt to modify an unowned ACL - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,12 +42,15 @@ package java.security.acl; * the caller to be the owner of the access control list (ACL) when the caller * is in fact not the owner of the ACL. * - * @version 0.0 - * - * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Aaron M. Renn + * @status updated to 1.4 */ -public class NotOwnerException extends java.lang.Exception +public class NotOwnerException extends Exception { + /** + * Compatible with JDK 1.1+. + */ + private static final long serialVersionUID = -5555597911163362399L; /** * Initializes a new instance of NotOwnerException that does @@ -55,6 +58,5 @@ public class NotOwnerException extends java.lang.Exception */ public NotOwnerException() { - super(); } } diff --git a/libjava/java/security/cert/CRLException.java b/libjava/java/security/cert/CRLException.java index 7aee1fb7e1fd..be20d1b6c5b4 100644 --- a/libjava/java/security/cert/CRLException.java +++ b/libjava/java/security/cert/CRLException.java @@ -1,5 +1,5 @@ -/* CRLException.java --- Certificate Revocation List Exception - Copyright (C) 1999 Free Software Foundation, Inc. +/* CRLException.java -- Certificate Revocation List Exception + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -37,34 +37,37 @@ exception statement from your version. */ package java.security.cert; + import java.security.GeneralSecurityException; /** - Exception for a Certificate Revocation List. - - @since JDK 1.2 - - @author Mark Benvenuto + * Exception for a Certificate Revocation List. + * + * @author Mark Benvenuto + * @since 1.2 + * @status updated to 1.4 */ public class CRLException extends GeneralSecurityException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = -6694728944094197147L; /** - Constructs an CRLExceptionwithout a message string. - */ + * Constructs an CRLExceptionwithout a message string. + */ public CRLException() { - super(); } /** - Constructs an CRLException with a message string. - - @param msg A message to display with exception - */ + * Constructs an CRLException with a message string. + * + * @param msg a message to display with exception + */ public CRLException(String msg) { - super( msg ); + super(msg); } - } diff --git a/libjava/java/security/cert/CertPath.java b/libjava/java/security/cert/CertPath.java new file mode 100644 index 000000000000..53f42e752dee --- /dev/null +++ b/libjava/java/security/cert/CertPath.java @@ -0,0 +1,252 @@ +/* CertPath.java -- a sequence of certificates + Copyright (C) 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package java.security.cert; + +import java.io.ByteArrayInputStream; +import java.io.NotSerializableException; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.util.Iterator; +import java.util.List; + +/** + * This class represents an immutable sequence, or path, of security + * certificates. The path type must match the type of each certificate in the + * path, or in other words, for all instances of cert in a certpath object, + * cert.getType().equals(certpath.getType()) will return true. + * + *

            Since this class is immutable, it is thread-safe. During serialization, + * the path is consolidated into a {@link CertPathRep}, which preserves the + * data regardless of the underlying implementation of the path. + * + * @author Eric Blake + * @since 1.4 + * @status updated to 1.4 + */ +public abstract class CertPath implements Serializable +{ + /** + * The serialized representation of a path. + * + * @author Eric Blake + */ + protected static class CertPathRep implements Serializable + { + /** + * Compatible with JDK 1.4+. + */ + private static final long serialVersionUID = 3015633072427920915L; + + /** + * The certificate type. + * + * @serial the type of the certificate path + */ + private final String type; + + /** + * The encoded form of the path. + * + * @serial the encoded form + */ + private final byte[] data; + + /** + * Create the new serial representation. + * + * @param type the path type + * @param data the encoded path data + */ + protected CertPathRep(String type, byte[] data) + { + this.type = type; + this.data = data; + } + + /** + * Decode the data into an actual {@link CertPath} upon deserialization. + * + * @return the replacement object + * @throws ObjectStreamException if replacement fails + */ + protected Object readResolve() throws ObjectStreamException + { + try + { + return CertificateFactory.getInstance(type) + .generateCertPath(new ByteArrayInputStream(data)); + } + catch (CertificateException e) + { + throw (ObjectStreamException) + new NotSerializableException("java.security.cert.CertPath: " + + type).initCause(e); + } + } + } // class CertPathRep + + /** + * Compatible with JDK 1.4+. + */ + private static final long serialVersionUID = 6068470306649138683L; + + /** + * The path type. + * + * @serial the type of all certificates in this path + */ + private final String type; + + /** + * Create a certificate path with the given type. Most code should use + * {@link CertificateFactory} to create CertPaths. + * + * @param type the type of the path + */ + protected CertPath(String type) + { + this.type = type; + } + + /** + * Get the (non-null) type of all certificates in the path. + * + * @return the path certificate type + */ + public String getType() + { + return type; + } + + /** + * Get an immutable iterator over the path encodings (all String names), + * starting with the default encoding. The iterator will throw an + * UnsupportedOperationException if an attempt is made to + * remove items from the list. + * + * @return the iterator of supported encodings in the path + */ + public abstract Iterator getEncodings(); + + /** + * Compares this path to another for semantic equality. To be equal, both + * must be instances of CertPath, with the same type, and identical + * certificate lists. Overriding classes must not change this behavior. + * + * @param o the object to compare to + * @return true if the two are equal + */ + public boolean equals(Object o) + { + if (! (o instanceof CertPath)) + return false; + CertPath cp = (CertPath) o; + return type.equals(cp.type) + && getCertificates().equals(cp.getCertificates()); + } + + /** + * Returns the hashcode of this certificate path. This is defined as:
            + * 31 * getType().hashCode() + getCertificates().hashCode(). + * + * @return the hashcode + */ + public int hashCode() + { + return 31 * type.hashCode() + getCertificates().hashCode(); + } + + public String toString() + { + List l = getCertificates(); + int size = l.size(); + int i = 0; + StringBuffer result = new StringBuffer(type); + result.append(" Cert Path: length = ").append(size).append(".\n[\n"); + while (--size >= 0) + result.append(l.get(i++)).append('\n'); + return result.append("\n]").toString(); + } + + /** + * Returns the encoded form of this path, via the default encoding. + * + * @return the encoded form + * @throws CertificateEncodingException if encoding fails + */ + public abstract byte[] getEncoded() throws CertificateEncodingException; + + /** + * Returns the encoded form of this path, via the specified encoding. + * + * @param encoding the encoding to use + * @return the encoded form + * @throws CertificateEncodingException if encoding fails or does not exist + */ + public abstract byte[] getEncoded(String encoding) + throws CertificateEncodingException; + + /** + * Returns the immutable, thread-safe list of certificates in this path. + * + * @return the list of certificates, non-null but possibly empty + */ + public abstract List getCertificates(); + + /** + * Serializes the path in its encoded form, to ensure reserialization with + * the appropriate factory object without worrying about list implementation. + * The result will always be an instance of {@link CertPathRep}. + * + * @return the replacement object + * @throws ObjectStreamException if the replacement creation fails + */ + protected Object writeReplace() throws ObjectStreamException + { + try + { + return new CertPathRep(type, getEncoded()); + } + catch (CertificateEncodingException e) + { + throw (ObjectStreamException) + new NotSerializableException("java.security.cert.CertPath: " + + type).initCause(e); + } + } +} // class CertPath diff --git a/libjava/java/security/cert/CertPathBuilderException.java b/libjava/java/security/cert/CertPathBuilderException.java new file mode 100644 index 000000000000..7cfdb79e536d --- /dev/null +++ b/libjava/java/security/cert/CertPathBuilderException.java @@ -0,0 +1,159 @@ +/* CertPathBuilderException.java -- wraps an exception during certificate + path building + Copyright (C) 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package java.security.cert; + +import java.io.PrintStream; +import java.io.PrintWriter; +import java.security.GeneralSecurityException; + +/** + * Indicates a problem while using a CertPathBuilder, wrapping + * the lower exception. This class is not thread-safe. + * + * @author Eric Blake + * @see CertPathBuilder + * @since 1.4 + * @status updated to 1.4 +*/ +public class CertPathBuilderException extends GeneralSecurityException +{ + /** + * Compatible with JDK 1.4+. + */ + private static final long serialVersionUID = 5316471420178794402L; + + /** + * Create an exception without a message. The cause may be initialized. + */ + public CertPathBuilderException() + { + } + + /** + * Create an exception with a message. The cause may be initialized. + * + * @param msg a message to display with exception + */ + public CertPathBuilderException(String msg) + { + super(msg); + } + + /** + * Create an exception with a cause. The message will be + * cause == null ? null : cause.toString(). + * + * @param cause the cause + */ + public CertPathBuilderException(Throwable cause) + { + this(cause == null ? null : cause.toString(), cause); + } + + /** + * Create an exception with a cause and a message. + * + * @param msg the message + * @param cause the cause + */ + public CertPathBuilderException(String msg, Throwable cause) + { + super(msg); + initCause(cause); + } + + /** + * Get the detail message. + * + * @return the detail message + */ + public String getMessage() + { + return super.getMessage(); + } + + /** + * Get the cause, null if unknown. + * + * @return the cause + */ + public Throwable getCause() + { + return super.getCause(); + } + + /** + * Convert this to a string, including its cause. + * + * @return the string conversion + */ + public String toString() + { + return super.toString(); + } + + /** + * Print the stack trace to System.err. + */ + public void printStackTrace() + { + super.printStackTrace(); + } + + /** + * Print the stack trace to a stream. + * + * @param stream the stream + */ + public void printStackTrace(PrintStream stream) + { + super.printStackTrace(stream); + } + + /** + * Print the stack trace to a stream. + * + * @param stream the stream + */ + public void printStackTrace(PrintWriter stream) + { + super.printStackTrace(stream); + } +} diff --git a/libjava/java/security/cert/CertPathValidatorException.java b/libjava/java/security/cert/CertPathValidatorException.java new file mode 100644 index 000000000000..e7b40b8d3d66 --- /dev/null +++ b/libjava/java/security/cert/CertPathValidatorException.java @@ -0,0 +1,226 @@ +/* CertPathValidatorException.java -- wraps an exception during validation + of a CertPath + Copyright (C) 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package java.security.cert; + +import java.io.PrintStream; +import java.io.PrintWriter; +import java.security.GeneralSecurityException; + +/** + * Indicates a problem while validating a certification path. In addition, + * it can store the path an index in that path that caused the problem. This + * class is not thread-safe. + * + * @author Eric Blake + * @see CertPathValidator + * @since 1.4 + * @status updated to 1.4 +*/ +public class CertPathValidatorException extends GeneralSecurityException +{ + /** + * Compatible with JDK 1.4+. + */ + private static final long serialVersionUID = -3083180014971893139L; + + /** + * The index of the certificate path that failed, or -1. + * + * @serial the failed index + */ + private final int index; + + /** + * The CertPath that failed. + * + * @serial the object being validated at time of failure + */ + private final CertPath certPath; + + /** + * Create an exception without a message. The cause may be initialized. The + * index is set to -1 and the failed CertPath object to null. + */ + public CertPathValidatorException() + { + this((String) null); + } + + /** + * Create an exception with a message. The cause may be initialized. The + * index is set to -1 and the failed CertPath object to null. + * + * @param msg a message to display with exception + */ + public CertPathValidatorException(String msg) + { + super(msg); + index = -1; + certPath = null; + } + + /** + * Create an exception with a cause. The message will be + * cause == null ? null : cause.toString(). The index is set + * to -1 and the failed CertPath object to null. + * + * @param cause the cause + */ + public CertPathValidatorException(Throwable cause) + { + this(cause == null ? null : cause.toString(), cause, null, -1); + } + + /** + * Create an exception with a cause and a message. The index is set to -1 + * and the failed CertPath object to null. + * + * @param msg the message + * @param cause the cause + */ + public CertPathValidatorException(String msg, Throwable cause) + { + this(msg, cause, null, -1); + } + + /** + * Create an exception with a cause, message, failed object, and index of + * failure in that CertPath. + * + * @param msg the message + * @param cause the cause + * @param certPath the path that was being validated, or null + * @param index the index of the path, or -1 + * @throws IndexOutOfBoundsException if index is < -1 or + * > certPath.getCertificates().size() + * @throws IllegalArgumentException if certPath is null but index != -1 + */ + public CertPathValidatorException(String msg, Throwable cause, + CertPath certPath, int index) + { + super(msg); + initCause(cause); + if (index < -1 || (certPath != null + && index >= certPath.getCertificates().size())) + throw new IndexOutOfBoundsException(); + if ((certPath == null) != (index == -1)) + throw new IllegalArgumentException(); + this.certPath = certPath; + this.index = index; + } + + /** + * Get the detail message. + * + * @return the detail message + */ + public String getMessage() + { + return super.getMessage(); + } + + /** + * Get the certificate path that had the failure, or null. + * + * @return the culprit path + */ + public CertPath getCertPath() + { + return certPath; + } + + /** + * Get the index that failed, or -1. + * + * @return the colprit index + */ + public int getIndex() + { + return index; + } + + /** + * Get the cause, null if unknown. + * + * @return the cause + */ + public Throwable getCause() + { + return super.getCause(); + } + + /** + * Convert this to a string, including its cause. + * + * @return the string conversion + */ + public String toString() + { + return super.toString(); + } + + /** + * Print the stack trace to System.err. + */ + public void printStackTrace() + { + super.printStackTrace(); + } + + /** + * Print the stack trace to a stream. + * + * @param stream the stream + */ + public void printStackTrace(PrintStream stream) + { + super.printStackTrace(stream); + } + + /** + * Print the stack trace to a stream. + * + * @param stream the stream + */ + public void printStackTrace(PrintWriter stream) + { + super.printStackTrace(stream); + } +} diff --git a/libjava/java/security/cert/CertStoreException.java b/libjava/java/security/cert/CertStoreException.java new file mode 100644 index 000000000000..7d7bd148e9a3 --- /dev/null +++ b/libjava/java/security/cert/CertStoreException.java @@ -0,0 +1,159 @@ +/* CertStoreException.java -- wraps an exception during certificate storage + Copyright (C) 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath 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 for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package java.security.cert; + +import java.io.PrintStream; +import java.io.PrintWriter; +import java.security.GeneralSecurityException; + +/** + * Indicates a problem while retrieving certificates and CRLs from + * CertStore, wrapping the lower exception. This class is not + * thread-safe. + * + * @author Eric Blake + * @see CertStore + * @since 1.4 + * @status updated to 1.4 +*/ +public class CertStoreException extends GeneralSecurityException +{ + /** + * Compatible with JDK 1.4+. + */ + private static final long serialVersionUID = 2395296107471573245L; + + /** + * Create an exception without a message. The cause may be initialized. + */ + public CertStoreException() + { + } + + /** + * Create an exception with a message. The cause may be initialized. + * + * @param msg a message to display with exception + */ + public CertStoreException(String msg) + { + super(msg); + } + + /** + * Create an exception with a cause. The message will be + * cause == null ? null : cause.toString(). + * + * @param cause the cause + */ + public CertStoreException(Throwable cause) + { + this(cause == null ? null : cause.toString(), cause); + } + + /** + * Create an exception with a cause and a message. + * + * @param msg the message + * @param cause the cause + */ + public CertStoreException(String msg, Throwable cause) + { + super(msg); + initCause(cause); + } + + /** + * Get the detail message. + * + * @return the detail message + */ + public String getMessage() + { + return super.getMessage(); + } + + /** + * Get the cause, null if unknown. + * + * @return the cause + */ + public Throwable getCause() + { + return super.getCause(); + } + + /** + * Convert this to a string, including its cause. + * + * @return the string conversion + */ + public String toString() + { + return super.toString(); + } + + /** + * Print the stack trace to System.err. + */ + public void printStackTrace() + { + super.printStackTrace(); + } + + /** + * Print the stack trace to a stream. + * + * @param stream the stream + */ + public void printStackTrace(PrintStream stream) + { + super.printStackTrace(stream); + } + + /** + * Print the stack trace to a stream. + * + * @param stream the stream + */ + public void printStackTrace(PrintWriter stream) + { + super.printStackTrace(stream); + } +} diff --git a/libjava/java/security/cert/CertificateEncodingException.java b/libjava/java/security/cert/CertificateEncodingException.java index e74852e49ade..a7730098f7bb 100644 --- a/libjava/java/security/cert/CertificateEncodingException.java +++ b/libjava/java/security/cert/CertificateEncodingException.java @@ -1,5 +1,5 @@ -/* CertificateEncodingException.java --- Certificate Encoding Exception - Copyright (C) 1999 Free Software Foundation, Inc. +/* CertificateEncodingException.java -- Certificate Encoding Exception + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -39,31 +39,33 @@ exception statement from your version. */ package java.security.cert; /** - Exception for a Certificate Encoding. - - @since JDK 1.2 - - @author Mark Benvenuto -*/ + * Exception for a Certificate Encoding. + * + * @author Mark Benvenuto + * @since 1.2 + * @status updated to 1.4 + */ public class CertificateEncodingException extends CertificateException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 6219492851589449162L; /** - Constructs an CertificateEncodingException without a message string. - */ + * Constructs an exception without a message string. + */ public CertificateEncodingException() { - super(); } /** - Constructs an CertificateEncodingException with a message string. - - @param msg A message to display with exception - */ + * Constructs an exception with a message string. + * + * @param msg A message to display with exception + */ public CertificateEncodingException(String msg) { - super( msg ); + super(msg); } - } diff --git a/libjava/java/security/cert/CertificateException.java b/libjava/java/security/cert/CertificateException.java index a3647ca33a09..d833834a13a9 100644 --- a/libjava/java/security/cert/CertificateException.java +++ b/libjava/java/security/cert/CertificateException.java @@ -1,5 +1,5 @@ -/* CertificateException.java --- Certificate Exception - Copyright (C) 1999 Free Software Foundation, Inc. +/* CertificateException.java -- Certificate Exception + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -37,34 +37,38 @@ exception statement from your version. */ package java.security.cert; + import java.security.GeneralSecurityException; /** - Exception for a Certificate. - - @since JDK 1.2 - - @author Mark Benvenuto -*/ + * Exception for a Certificate. + * + * @author Mark Benvenuto + * @see Certificate + * @since 1.2 + * @status updated to 1.4 + */ public class CertificateException extends GeneralSecurityException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 3192535253797119798L; /** - Constructs an CertificateException without a message string. - */ + * Constructs an exception without a message string. + */ public CertificateException() { - super(); } /** - Constructs an CertificateException with a message string. - - @param msg A message to display with exception - */ + * Constructs an exception with a message string. + * + * @param msg a message to display with exception + */ public CertificateException(String msg) { - super( msg ); + super(msg); } - } diff --git a/libjava/java/security/cert/CertificateExpiredException.java b/libjava/java/security/cert/CertificateExpiredException.java index d3f322a09415..6d23508656c9 100644 --- a/libjava/java/security/cert/CertificateExpiredException.java +++ b/libjava/java/security/cert/CertificateExpiredException.java @@ -1,5 +1,5 @@ /* CertificateExpiredException.java --- Certificate Expired Exception - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -39,31 +39,33 @@ exception statement from your version. */ package java.security.cert; /** - Exception for a Certificate Expiring. - - @since JDK 1.2 - - @author Mark Benvenuto -*/ + * Exception for a Certificate Expiring. + * + * @author Mark Benvenuto + * @since 1.2 + * @status updated to 1.4 + */ public class CertificateExpiredException extends CertificateException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 9071001339691533771L; /** - Constructs an CertificateExpiredException without a message string. - */ + * Constructs an exception without a message string. + */ public CertificateExpiredException() { - super(); } /** - Constructs an CertificateExpiredException with a message string. - - @param msg A message to display with exception - */ + * Constructs an exception with a message string. + * + * @param msg a message to display with exception + */ public CertificateExpiredException(String msg) { - super( msg ); + super(msg); } - } diff --git a/libjava/java/security/cert/CertificateFactory.java b/libjava/java/security/cert/CertificateFactory.java index d49d5fb439a2..4318862ec9c9 100644 --- a/libjava/java/security/cert/CertificateFactory.java +++ b/libjava/java/security/cert/CertificateFactory.java @@ -1,5 +1,5 @@ -/* CertificateFactory.java --- Certificate Factory Class - Copyright (C) 1999 Free Software Foundation, Inc. +/* CertificateFactory.java -- Certificate Factory Class + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -52,9 +52,9 @@ import java.util.Collection; java.security.cert.X509Certificate class, and CRLs of the java.security.cert.X509CRL class. - @since JDK 1.2 - @author Mark Benvenuto + @since JDK 1.2 + @status still missing full 1.4 support */ public class CertificateFactory { @@ -267,4 +267,9 @@ public class CertificateFactory return certFacSpi.engineGenerateCRLs( inStream ); } -} + public final CertPath generateCertPath(InputStream inStream) + throws CertificateException + { + throw new CertificateException("not implemented"); + } +} // class CertificateFactory diff --git a/libjava/java/security/cert/CertificateNotYetValidException.java b/libjava/java/security/cert/CertificateNotYetValidException.java index 359fb8cc7b66..d831265a98ae 100644 --- a/libjava/java/security/cert/CertificateNotYetValidException.java +++ b/libjava/java/security/cert/CertificateNotYetValidException.java @@ -1,5 +1,5 @@ -/* CertificateNotYetValidException.java --- Certificate Not Yet Valid Exception - Copyright (C) 1999 Free Software Foundation, Inc. +/* CertificateNotYetValidException.java -- Certificate Not Yet Valid Exception + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -39,31 +39,33 @@ exception statement from your version. */ package java.security.cert; /** - Exception for a Certificate being not yet valid. - - @since JDK 1.2 - - @author Mark Benvenuto + * Exception for a Certificate that is not yet valid. + * + * @author Mark Benvenuto + * @since 1.2 + * @status updated to 1.4 */ public class CertificateNotYetValidException extends CertificateException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 4355919900041064702L; /** - Constructs an CertificateNotYetValidException without a message string. - */ + * Constructs an exception without a message string. + */ public CertificateNotYetValidException() { - super(); } /** - Constructs an CertificateNotYetValidException with a message string. - - @param msg A message to display with exception - */ + * Constructs an exception with a message string. + * + * @param msg A message to display with exception + */ public CertificateNotYetValidException(String msg) { - super( msg ); + super(msg); } - } diff --git a/libjava/java/security/cert/CertificateParsingException.java b/libjava/java/security/cert/CertificateParsingException.java index 8e26acdde30d..adc8935d2a7a 100644 --- a/libjava/java/security/cert/CertificateParsingException.java +++ b/libjava/java/security/cert/CertificateParsingException.java @@ -1,5 +1,5 @@ -/* CertificateParsingException.java --- Certificate Parsing Exception - Copyright (C) 1999 Free Software Foundation, Inc. +/* CertificateParsingException.java -- Certificate Parsing Exception + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -39,31 +39,33 @@ exception statement from your version. */ package java.security.cert; /** - Exception for a Certificate Parsing. - - @since JDK 1.2 - - @author Mark Benvenuto + * Exception for parsing a DER-encoded Certificate. + * + * @author Mark Benvenuto + * @since 1.2 + * @status updated to 1.4 */ public class CertificateParsingException extends CertificateException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = -7989222416793322029L; /** - Constructs an CertificateParsingException without a message string. - */ + * Constructs an exception without a message string. + */ public CertificateParsingException() { - super(); } /** - Constructs an CertificateParsingException with a message string. - - @param msg A message to display with exception - */ + * Constructs an exception with a message string. + * + * @param msg a message to display with exception + */ public CertificateParsingException(String msg) { - super( msg ); + super(msg); } - } diff --git a/libjava/java/security/spec/InvalidKeySpecException.java b/libjava/java/security/spec/InvalidKeySpecException.java index e4ac737bcf46..d64e3f66e90f 100644 --- a/libjava/java/security/spec/InvalidKeySpecException.java +++ b/libjava/java/security/spec/InvalidKeySpecException.java @@ -1,5 +1,5 @@ -/* InvalidKeySpecException.java --- Invalid KeySpec Exception - Copyright (C) 1999 Free Software Foundation, Inc. +/* InvalidKeySpecException.java -- invalid KeySpec Exception + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -37,34 +37,38 @@ exception statement from your version. */ package java.security.spec; + import java.security.GeneralSecurityException; /** - Exception for an invalid key specification. - - @since JDK 1.2 - - @author Mark Benvenuto -*/ -public class InvalidKeySpecException extends GeneralSecurityException + * Exception for an invalid key specification. + * + * @author Mark Benvenuto + * @see KeySpec + * @since 1.2 + * @status updated to 1.4 + */ +public class InvalidKeySpecException extends GeneralSecurityException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = 3546139293998810778L; /** - Constructs an InvalidKeySpecException without a message string. - */ - public InvalidKeySpecException() + * Constructs an InvalidKeySpecException without a message string. + */ + public InvalidKeySpecException() { - super(); } /** - Constructs an InvalidKeySpecException with a message string. - - @param msg A message to display with exception - */ + * Constructs an InvalidKeySpecException with a message string. + * + * @param msg a message to display with exception + */ public InvalidKeySpecException(String msg) { - super( msg ); + super(msg); } - } diff --git a/libjava/java/security/spec/InvalidParameterSpecException.java b/libjava/java/security/spec/InvalidParameterSpecException.java index 63331e23e72a..7b8aca602701 100644 --- a/libjava/java/security/spec/InvalidParameterSpecException.java +++ b/libjava/java/security/spec/InvalidParameterSpecException.java @@ -1,5 +1,5 @@ -/* InvalidParameterSpecException.java --- Invalid ParameterSpec Exception - Copyright (C) 1999 Free Software Foundation, Inc. +/* InvalidParameterSpecException.java --- invalid ParameterSpec Exception + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -37,34 +37,40 @@ exception statement from your version. */ package java.security.spec; + import java.security.GeneralSecurityException; /** - Exception for an invalid algorithm specification. - - @since JDK 1.2 - - @author Mark Benvenuto + * Exception for an invalid algorithm specification. + * + * @author Mark Benvenuto + * @see AlogorithmParameters + * @see AlogorithmParameterSpec + * @see DSAParameterSpec + * @since 1.2 + * @status updated to 1.4 */ public class InvalidParameterSpecException extends GeneralSecurityException { + /** + * Compatible with JDK 1.2+. + */ + private static final long serialVersionUID = -970468769593399342L; /** - Constructs an InvalidParameterSpecException without a message string. - */ + * Constructs an InvalidParameterSpecException without a message string. + */ public InvalidParameterSpecException() { - super(); } /** - Constructs an InvalidParameterSpecException with a message string. - - @param msg A message to display with exception - */ - public InvalidParameterSpecException(String msg) + * Constructs an InvalidParameterSpecException with a message string. + * + * @param msg a message to display with exception + */ + public InvalidParameterSpecException(String msg) { - super( msg ); + super(msg); } - }