From d2f108e266cd19172d664d433e772420e88d1504 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Fri, 24 May 2002 11:57:40 +0000 Subject: 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 --- libjava/java/security/Key.java | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'libjava/java/security/Key.java') diff --git a/libjava/java/security/Key.java b/libjava/java/security/Key.java index b63b7b3..ff23a05 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 -- cgit v1.1