diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2002-05-24 11:57:40 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-05-24 12:57:40 +0100 |
| commit | d2f108e266cd19172d664d433e772420e88d1504 (patch) | |
| tree | 187144ec8bafd5099db53104f17f94e9a6db61c3 /libjava/java/security/spec | |
| parent | 4fbecd29448860f20975d7aceecc14e843ef0eec (diff) | |
| download | gcc-d2f108e266cd19172d664d433e772420e88d1504.zip gcc-d2f108e266cd19172d664d433e772420e88d1504.tar.gz gcc-d2f108e266cd19172d664d433e772420e88d1504.tar.bz2 | |
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: New file from classpath.
From-SVN: r53837
Diffstat (limited to 'libjava/java/security/spec')
| -rw-r--r-- | libjava/java/security/spec/InvalidKeySpecException.java | 44 | ||||
| -rw-r--r-- | libjava/java/security/spec/InvalidParameterSpecException.java | 42 |
2 files changed, 48 insertions, 38 deletions
diff --git a/libjava/java/security/spec/InvalidKeySpecException.java b/libjava/java/security/spec/InvalidKeySpecException.java index e4ac737..d64e3f6 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 63331e2..7b8aca6 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); } - } |