
2005-02-17 Andrew John Hughes <gnu_andrew@member.fsf.org> Michael Koch <konqueror@gmx.de> * gnu/java/net/protocol/http/Cookie.java, gnu/java/net/protocol/http/HTTPConnection.java, gnu/java/net/protocol/http/HTTPDateFormat.java, gnu/java/net/protocol/http/Request.java, gnu/java/nio/PipeImpl.java, gnu/java/rmi/dgc/DGCImpl.java, gnu/java/rmi/server/ConnectionRunnerPool.java, gnu/java/rmi/server/UnicastConnectionManager.java, gnu/java/security/der/DERWriter.java, gnu/java/security/pkcs/SignerInfo.java, gnu/java/security/provider/EncodedKeyFactory.java, gnu/java/security/provider/GnuDHPublicKey.java, gnu/java/security/provider/GnuDSAPrivateKey.java, gnu/java/security/provider/GnuDSAPublicKey.java, gnu/java/security/provider/PKIXCertPathValidatorImpl.java, gnu/java/security/x509/X500DistinguishedName.java, gnu/java/security/x509/X509CRL.java, gnu/java/security/x509/X509CRLEntry.java, gnu/java/security/x509/X509Certificate.java, gnu/java/security/x509/ext/AuthorityKeyIdentifier.java, gnu/java/security/x509/ext/CertificatePolicies.java, gnu/java/security/x509/ext/PolicyConstraint.java, gnu/xml/dom/Consumer.java, gnu/xml/dom/DomCharacterData.java, gnu/xml/dom/DomDocument.java, gnu/xml/dom/DomDocumentBuilder.java, gnu/xml/dom/DomIterator.java, gnu/xml/dom/DomNode.java, gnu/xml/dom/DomXPathExpression.java, gnu/xml/dom/DomXPathResult.java, gnu/xml/dom/JAXPFactory.java, gnu/xml/pipeline/CallFilter.java, gnu/xml/pipeline/DomConsumer.java, gnu/xml/pipeline/LinkFilter.java, gnu/xml/pipeline/NSFilter.java, gnu/xml/pipeline/TeeConsumer.java, gnu/xml/pipeline/ValidationConsumer.java, gnu/xml/pipeline/WellFormednessFilter.java, gnu/xml/pipeline/XIncludeFilter.java, gnu/xml/pipeline/XsltFilter.java, gnu/xml/transform/ApplyImportsNode.java, gnu/xml/transform/Bindings.java, gnu/xml/transform/DocumentFunction.java, gnu/xml/transform/FormatNumberFunction.java, gnu/xml/transform/NodeNumberNode.java, gnu/xml/transform/NumberNode.java, gnu/xml/transform/Stylesheet.java, gnu/xml/transform/SystemPropertyFunction.java, gnu/xml/transform/Template.java, gnu/xml/transform/TemplatesImpl.java, gnu/xml/transform/TransformerImpl.java, gnu/xml/transform/ValueOfNode.java, gnu/xml/transform/XSLURIResolver.java, gnu/xml/util/DoParse.java, gnu/xml/util/Resolver.java, gnu/xml/xpath/Expr.java, gnu/xml/xpath/FunctionCall.java, gnu/xml/xpath/RelationalExpr.java, gnu/xml/xpath/Selector.java, gnu/xml/xpath/XPathParser.java: Reworked import statements, fixed modifier order and some little formatting issues. Co-Authored-By: Michael Koch <konqueror@gmx.de> From-SVN: r95177
280 lines
7.9 KiB
Java
280 lines
7.9 KiB
Java
/* X509CRLEntry.java -- an entry in a X.509 CRL.
|
|
Copyright (C) 2003, 2004 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.security.x509;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.math.BigInteger;
|
|
|
|
import java.security.cert.CRLException;
|
|
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.Iterator;
|
|
import java.util.Set;
|
|
|
|
import gnu.java.security.OID;
|
|
import gnu.java.security.der.*;
|
|
import gnu.java.security.x509.ext.*;
|
|
|
|
/**
|
|
* A single entry in a X.509 certificate revocation list.
|
|
*
|
|
* @see X509CRL
|
|
* @author Casey Marshall
|
|
*/
|
|
class X509CRLEntry extends java.security.cert.X509CRLEntry
|
|
implements GnuPKIExtension
|
|
{
|
|
|
|
// Constants and fields.
|
|
// ------------------------------------------------------------------------
|
|
|
|
private static final boolean DEBUG = false;
|
|
private static void debug(String msg)
|
|
{
|
|
if (DEBUG)
|
|
{
|
|
System.err.print(">> X509CRLEntry: ");
|
|
System.err.println(msg);
|
|
}
|
|
}
|
|
|
|
/** The DER encoded form of this CRL entry. */
|
|
private byte[] encoded;
|
|
|
|
/** The revoked certificate's serial number. */
|
|
private BigInteger serialNo;
|
|
|
|
/** The date the certificate was revoked. */
|
|
private Date revocationDate;
|
|
|
|
/** The CRL entry extensions. */
|
|
private HashMap extensions;
|
|
|
|
// Constructor.
|
|
// ------------------------------------------------------------------------
|
|
|
|
/**
|
|
* Create a new X.509 certificate revocation list entry from the given
|
|
* input stream and CRL version number.
|
|
*
|
|
* @param version The CRL version.
|
|
* @param encoded The stream of DER bytes.
|
|
* @throws CRLException If the ASN.1 structure is invalid.
|
|
* @throws IOException If the bytes cannot be read.
|
|
*/
|
|
X509CRLEntry(int version, DERReader encoded)
|
|
throws CRLException, IOException
|
|
{
|
|
super();
|
|
extensions = new HashMap();
|
|
try
|
|
{
|
|
parse(version, encoded);
|
|
}
|
|
catch (IOException ioe)
|
|
{
|
|
throw ioe;
|
|
}
|
|
catch (Exception x)
|
|
{
|
|
throw new CRLException(x.toString());
|
|
}
|
|
}
|
|
|
|
// X509CRLEntry methods.
|
|
// ------------------------------------------------------------------------
|
|
|
|
public boolean equals(Object o)
|
|
{
|
|
if (!(o instanceof X509CRLEntry))
|
|
return false;
|
|
return ((X509CRLEntry) o).getSerialNumber().equals(serialNo) &&
|
|
((X509CRLEntry) o).getRevocationDate().equals(revocationDate);
|
|
}
|
|
|
|
public int hashCode()
|
|
{
|
|
return serialNo.hashCode();
|
|
}
|
|
|
|
public byte[] getEncoded() throws CRLException
|
|
{
|
|
return (byte[]) encoded.clone();
|
|
}
|
|
|
|
public BigInteger getSerialNumber()
|
|
{
|
|
return serialNo;
|
|
}
|
|
|
|
public Date getRevocationDate()
|
|
{
|
|
return (Date) revocationDate.clone();
|
|
}
|
|
|
|
public boolean hasExtensions()
|
|
{
|
|
return ! extensions.isEmpty();
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
return "X509CRLEntry serial=" + serialNo + " revocation date="
|
|
+ revocationDate + " ext=" + extensions;
|
|
}
|
|
|
|
// X509Extension methods.
|
|
// -------------------------------------------------------------------------
|
|
|
|
public boolean hasUnsupportedCriticalExtension()
|
|
{
|
|
for (Iterator it = extensions.values().iterator(); it.hasNext(); )
|
|
{
|
|
Extension e = (Extension) it.next();
|
|
if (e.isCritical() && !e.isSupported())
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
public Set getCriticalExtensionOIDs()
|
|
{
|
|
HashSet s = new HashSet();
|
|
for (Iterator it = extensions.values().iterator(); it.hasNext(); )
|
|
{
|
|
Extension e = (Extension) it.next();
|
|
if (e.isCritical())
|
|
s.add(e.getOid().toString());
|
|
}
|
|
return Collections.unmodifiableSet(s);
|
|
}
|
|
|
|
public Set getNonCriticalExtensionOIDs()
|
|
{
|
|
HashSet s = new HashSet();
|
|
for (Iterator it = extensions.values().iterator(); it.hasNext(); )
|
|
{
|
|
Extension e = (Extension) it.next();
|
|
if (!e.isCritical())
|
|
s.add(e.getOid().toString());
|
|
}
|
|
return Collections.unmodifiableSet(s);
|
|
}
|
|
|
|
public byte[] getExtensionValue(String oid)
|
|
{
|
|
Extension e = getExtension(new OID(oid));
|
|
if (e != null)
|
|
{
|
|
return e.getValue().getEncoded();
|
|
}
|
|
return null;
|
|
}
|
|
|
|
// GnuPKIExtension method.
|
|
// -------------------------------------------------------------------------
|
|
|
|
public Extension getExtension(OID oid)
|
|
{
|
|
return (Extension) extensions.get(oid);
|
|
}
|
|
|
|
public Collection getExtensions()
|
|
{
|
|
return extensions.values();
|
|
}
|
|
|
|
// Own methods.
|
|
// -------------------------------------------------------------------------
|
|
|
|
private void parse(int version, DERReader der) throws Exception
|
|
{
|
|
// RevokedCertificate ::= SEQUENCE {
|
|
DERValue entry = der.read();
|
|
debug("start CRL entry len == " + entry.getLength());
|
|
if (!entry.isConstructed())
|
|
throw new IOException("malformed revokedCertificate");
|
|
encoded = entry.getEncoded();
|
|
int len = 0;
|
|
|
|
debug("encoded entry:\n" + Util.hexDump(encoded, ">>>> "));
|
|
|
|
// userCertificate CertificateSerialNumber,
|
|
DERValue val = der.read();
|
|
serialNo = (BigInteger) val.getValue();
|
|
len += val.getEncodedLength();
|
|
debug("userCertificate == " + serialNo + " current count == " + len);
|
|
|
|
// revocationDate Time,
|
|
val = der.read();
|
|
revocationDate = (Date) val.getValue();
|
|
len += val.getEncodedLength();
|
|
debug("revocationDate == " + revocationDate + " current count == " + len);
|
|
|
|
// crlEntryExtensions Extensions OPTIONAL
|
|
// -- if present MUST be v2
|
|
if (len < entry.getLength())
|
|
{
|
|
if (version < 2)
|
|
throw new IOException("extra data in CRL entry");
|
|
DERValue exts = der.read();
|
|
if (!exts.isConstructed())
|
|
throw new IOException("malformed Extensions");
|
|
debug("start Extensions len == " + exts.getLength());
|
|
len = 0;
|
|
while (len < exts.getLength())
|
|
{
|
|
val = der.read();
|
|
if (!val.isConstructed())
|
|
throw new IOException("malformed Extension");
|
|
debug("start Extension len == " + val.getLength());
|
|
Extension e = new Extension(val.getEncoded());
|
|
extensions.put(e.getOid(), e);
|
|
der.skip(val.getLength());
|
|
len += val.getEncodedLength();
|
|
debug("current count == " + len);
|
|
}
|
|
}
|
|
}
|
|
}
|