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/Certificate.java | 84 ++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 39 deletions(-) (limited to 'libjava/java/security/Certificate.java') diff --git a/libjava/java/security/Certificate.java b/libjava/java/security/Certificate.java index 624980fdb83..f37d919a733 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 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 + */ + 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. * - * @param KeyException If there is a problem with the certificate data - * @param IOException If an error occurs reading from the stream. + * @return the encoding format being used + * @deprecated this entire interface is deprecated */ - public abstract void - decode(InputStream in) throws KeyException, IOException; + 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 -- cgit v1.2.3