jdk-sandbox: comparison jdk/src/share/classes/java/security/cert/CertificateFactory.java

equal deleted inserted replaced

-:6d0f51c99930
+:882a3948c6e6
 /*
-* Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 import sun.security.jca.*;
 import sun.security.jca.GetInstance.Instance;
 /**
 * This class defines the functionality of a certificate factory, which is
-* used to generate certificate, certification path (<code>CertPath</code>)
+* used to generate certificate, certification path ({@code CertPath})
 * and certificate revocation list (CRL) objects from their encodings.
 *
 * <p>For encodings consisting of multiple certificates, use
-* <code>generateCertificates</code> when you want to
+* {@code generateCertificates} when you want to
 * parse a collection of possibly unrelated certificates. Otherwise,
-* use <code>generateCertPath</code> when you want to generate
+* use {@code generateCertPath} when you want to generate
-* a <code>CertPath</code> (a certificate chain) and subsequently
+* a {@code CertPath} (a certificate chain) and subsequently
-* validate it with a <code>CertPathValidator</code>.
+* validate it with a {@code CertPathValidator}.
 *
 * <p>A certificate factory for X.509 must return certificates that are an
-* instance of <code>java.security.cert.X509Certificate</code>, and CRLs
+* instance of {@code java.security.cert.X509Certificate}, and CRLs
-* that are an instance of <code>java.security.cert.X509CRL</code>.
+* that are an instance of {@code java.security.cert.X509CRL}.
 *
 * <p>The following example reads a file with Base64 encoded certificates,
 * which are each bounded at the beginning by -----BEGIN CERTIFICATE-----, and
 * bounded at the end by -----END CERTIFICATE-----. We convert the
-* <code>FileInputStream</code> (which does not support <code>mark</code>
+* {@code FileInputStream} (which does not support {@code mark}
-* and <code>reset</code>) to a <code>BufferedInputStream</code> (which
+* and {@code reset}) to a {@code BufferedInputStream} (which
 * supports those methods), so that each call to
-* <code>generateCertificate</code> consumes only one certificate, and the
+* {@code generateCertificate} consumes only one certificate, and the
 * read position of the input stream is positioned to the next certificate in
 * the file:<p>
 *
 * <pre>{@code
 * FileInputStream fis = new FileInputStream(filename);
 *    System.out.println(cert);
 * }
 * </pre>
 *
 * <p> Every implementation of the Java platform is required to support the
-* following standard <code>CertificateFactory</code> type:
+* following standard {@code CertificateFactory} type:
 * <ul>
-* <li><tt>X.509</tt></li>
+* <li>{@code X.509}</li>
 * </ul>
-* and the following standard <code>CertPath</code> encodings:
+* and the following standard {@code CertPath} encodings:
 * <ul>
-* <li><tt>PKCS7</tt></li>
+* <li>{@code PKCS7}</li>
-* <li><tt>PkiPath</tt></li>
+* <li>{@code PkiPath}</li>
 * </ul>
 * The type and encodings are described in the <a href=
 * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertificateFactory">
 * CertificateFactory section</a> and the <a href=
 * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathEncodings">
 *
 * @exception CertificateException if a CertificateFactorySpi
 *          implementation for the specified algorithm is not available
 *          from the specified Provider object.
 *
-* @exception IllegalArgumentException if the <code>provider</code> is
+* @exception IllegalArgumentException if the {@code provider} is
 *          null.
 *
 * @see java.security.Provider
 *
 * @since 1.4
 return this.type;
 }
 /**
 * Generates a certificate object and initializes it with
-* the data read from the input stream <code>inStream</code>.
+* the data read from the input stream {@code inStream}.
 *
 * <p>In order to take advantage of the specialized certificate format
 * supported by this certificate factory,
 * the returned certificate object can be typecast to the corresponding
 * certificate class. For example, if this certificate
 * factory implements X.509 certificates, the returned certificate object
-* can be typecast to the <code>X509Certificate</code> class.
+* can be typecast to the {@code X509Certificate} class.
 *
 * <p>In the case of a certificate factory for X.509 certificates, the
-* certificate provided in <code>inStream</code> must be DER-encoded and
+* certificate provided in {@code inStream} must be DER-encoded and
 * may be supplied in binary or printable (Base64) encoding. If the
 * certificate is provided in Base64 encoding, it must be bounded at
 * the beginning by -----BEGIN CERTIFICATE-----, and must be bounded at
 * the end by -----END CERTIFICATE-----.
 *
 * method consumes one certificate and the read position of the
 * input stream is positioned to the next available byte after
 * the inherent end-of-certificate marker. If the data in the input stream
 * does not contain an inherent end-of-certificate marker (other
 * than EOF) and there is trailing data after the certificate is parsed, a
-* <code>CertificateException</code> is thrown.
+* {@code CertificateException} is thrown.
 *
 * @param inStream an input stream with the certificate data.
 *
 * @return a certificate object initialized with the data
 * from the input stream.
 {
 return certFacSpi.engineGenerateCertificate(inStream);
 }
 /**
-* Returns an iteration of the <code>CertPath</code> encodings supported
+* Returns an iteration of the {@code CertPath} encodings supported
 * by this certificate factory, with the default encoding first. See
 * the CertPath Encodings section in the <a href=
 * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathEncodings">
 * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
 * for information about standard encoding names and their formats.
 * <p>
-* Attempts to modify the returned <code>Iterator</code> via its
+* Attempts to modify the returned {@code Iterator} via its
-* <code>remove</code> method result in an
+* {@code remove} method result in an
-* <code>UnsupportedOperationException</code>.
+* {@code UnsupportedOperationException}.
 *
-* @return an <code>Iterator</code> over the names of the supported
+* @return an {@code Iterator} over the names of the supported
-*         <code>CertPath</code> encodings (as <code>String</code>s)
+*         {@code CertPath} encodings (as {@code String}s)
 * @since 1.4
 */
 public final Iterator<String> getCertPathEncodings() {
 return(certFacSpi.engineGetCertPathEncodings());
 }
 /**
-* Generates a <code>CertPath</code> object and initializes it with
+* Generates a {@code CertPath} object and initializes it with
-* the data read from the <code>InputStream</code> inStream. The data
+* the data read from the {@code InputStream} inStream. The data
 * is assumed to be in the default encoding. The name of the default
-* encoding is the first element of the <code>Iterator</code> returned by
+* encoding is the first element of the {@code Iterator} returned by
 * the {@link #getCertPathEncodings getCertPathEncodings} method.
 *
-* @param inStream an <code>InputStream</code> containing the data
+* @param inStream an {@code InputStream} containing the data
-* @return a <code>CertPath</code> initialized with the data from the
+* @return a {@code CertPath} initialized with the data from the
-*   <code>InputStream</code>
+*   {@code InputStream}
 * @exception CertificateException if an exception occurs while decoding
 * @since 1.4
 */
 public final CertPath generateCertPath(InputStream inStream)
 throws CertificateException
 {
 return(certFacSpi.engineGenerateCertPath(inStream));
 }
 /**
-* Generates a <code>CertPath</code> object and initializes it with
+* Generates a {@code CertPath} object and initializes it with
-* the data read from the <code>InputStream</code> inStream. The data
+* the data read from the {@code InputStream} inStream. The data
 * is assumed to be in the specified encoding. See
 * the CertPath Encodings section in the <a href=
 * "{@docRoot}/../technotes/guides/security/StandardNames.html#CertPathEncodings">
 * Java Cryptography Architecture Standard Algorithm Name Documentation</a>
 * for information about standard encoding names and their formats.
 *
-* @param inStream an <code>InputStream</code> containing the data
+* @param inStream an {@code InputStream} containing the data
 * @param encoding the encoding used for the data
-* @return a <code>CertPath</code> initialized with the data from the
+* @return a {@code CertPath} initialized with the data from the
-*   <code>InputStream</code>
+*   {@code InputStream}
 * @exception CertificateException if an exception occurs while decoding or
 *   the encoding requested is not supported
 * @since 1.4
 */
 public final CertPath generateCertPath(InputStream inStream,
 {
 return(certFacSpi.engineGenerateCertPath(inStream, encoding));
 }
 /**
-* Generates a <code>CertPath</code> object and initializes it with
+* Generates a {@code CertPath} object and initializes it with
-* a <code>List</code> of <code>Certificate</code>s.
+* a {@code List} of {@code Certificate}s.
 * <p>
 * The certificates supplied must be of a type supported by the
-* <code>CertificateFactory</code>. They will be copied out of the supplied
+* {@code CertificateFactory}. They will be copied out of the supplied
-* <code>List</code> object.
+* {@code List} object.
 *
-* @param certificates a <code>List</code> of <code>Certificate</code>s
+* @param certificates a {@code List} of {@code Certificate}s
-* @return a <code>CertPath</code> initialized with the supplied list of
+* @return a {@code CertPath} initialized with the supplied list of
 *   certificates
 * @exception CertificateException if an exception occurs
 * @since 1.4
 */
 public final CertPath
 return(certFacSpi.engineGenerateCertPath(certificates));
 }
 /**
 * Returns a (possibly empty) collection view of the certificates read
-* from the given input stream <code>inStream</code>.
+* from the given input stream {@code inStream}.
 *
 * <p>In order to take advantage of the specialized certificate format
 * supported by this certificate factory, each element in
 * the returned collection view can be typecast to the corresponding
 * certificate class. For example, if this certificate
 * factory implements X.509 certificates, the elements in the returned
-* collection can be typecast to the <code>X509Certificate</code> class.
+* collection can be typecast to the {@code X509Certificate} class.
 *
 * <p>In the case of a certificate factory for X.509 certificates,
-* <code>inStream</code> may contain a sequence of DER-encoded certificates
+* {@code inStream} may contain a sequence of DER-encoded certificates
 * in the formats described for
 * {@link #generateCertificate(java.io.InputStream) generateCertificate}.
-* In addition, <code>inStream</code> may contain a PKCS#7 certificate
+* In addition, {@code inStream} may contain a PKCS#7 certificate
 * chain. This is a PKCS#7 <i>SignedData</i> object, with the only
 * significant field being <i>certificates</i>. In particular, the
 * signature and the contents are ignored. This format allows multiple
 * certificates to be downloaded at once. If no certificates are present,
 * an empty collection is returned.
 return certFacSpi.engineGenerateCertificates(inStream);
 }
 /**
 * Generates a certificate revocation list (CRL) object and initializes it
-* with the data read from the input stream <code>inStream</code>.
+* with the data read from the input stream {@code inStream}.
 *
 * <p>In order to take advantage of the specialized CRL format
 * supported by this certificate factory,
 * the returned CRL object can be typecast to the corresponding
 * CRL class. For example, if this certificate
 * factory implements X.509 CRLs, the returned CRL object
-* can be typecast to the <code>X509CRL</code> class.
+* can be typecast to the {@code X509CRL} class.
 *
 * <p>Note that if the given input stream does not support
 * {@link java.io.InputStream#mark(int) mark} and
 * {@link java.io.InputStream#reset() reset}, this method will
 * consume the entire input stream. Otherwise, each call to this
 * method consumes one CRL and the read position of the input stream
 * is positioned to the next available byte after the inherent
 * end-of-CRL marker. If the data in the
 * input stream does not contain an inherent end-of-CRL marker (other
 * than EOF) and there is trailing data after the CRL is parsed, a
-* <code>CRLException</code> is thrown.
+* {@code CRLException} is thrown.
 *
 * @param inStream an input stream with the CRL data.
 *
 * @return a CRL object initialized with the data
 * from the input stream.
 return certFacSpi.engineGenerateCRL(inStream);
 }
 /**
 * Returns a (possibly empty) collection view of the CRLs read
-* from the given input stream <code>inStream</code>.
+* from the given input stream {@code inStream}.
 *
 * <p>In order to take advantage of the specialized CRL format
 * supported by this certificate factory, each element in
 * the returned collection view can be typecast to the corresponding
 * CRL class. For example, if this certificate
 * factory implements X.509 CRLs, the elements in the returned
-* collection can be typecast to the <code>X509CRL</code> class.
+* collection can be typecast to the {@code X509CRL} class.
 *
 * <p>In the case of a certificate factory for X.509 CRLs,
-* <code>inStream</code> may contain a sequence of DER-encoded CRLs.
+* {@code inStream} may contain a sequence of DER-encoded CRLs.
-* In addition, <code>inStream</code> may contain a PKCS#7 CRL
+* In addition, {@code inStream} may contain a PKCS#7 CRL
 * set. This is a PKCS#7 <i>SignedData</i> object, with the only
 * significant field being <i>crls</i>. In particular, the
 * signature and the contents are ignored. This format allows multiple
 * CRLs to be downloaded at once. If no CRLs are present,
 * an empty collection is returned.

changeset 18551	882a3948c6e6
parent 18156	edb590d448c5
child 21334	c60dfce46a77