4f9533c772
Imported GNU Classpath 0.90
* scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.
* sources.am: Regenerated.
* gcj/javaprims.h: Regenerated.
* Makefile.in: Regenerated.
* gcj/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
* gnu/java/lang/VMInstrumentationImpl.java: New override.
* gnu/java/net/local/LocalSocketImpl.java: Likewise.
* gnu/classpath/jdwp/VMMethod.java: Likewise.
* gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
interface.
* java/lang/Thread.java: Add UncaughtExceptionHandler.
* java/lang/reflect/Method.java: Implements GenericDeclaration and
isSynthetic(),
* java/lang/reflect/Field.java: Likewise.
* java/lang/reflect/Constructor.java
* java/lang/Class.java: Implements Type, GenericDeclaration,
getSimpleName() and getEnclosing*() methods.
* java/lang/Class.h: Add new public methods.
* java/lang/Math.java: Add signum(), ulp() and log10().
* java/lang/natMath.cc (log10): New function.
* java/security/VMSecureRandom.java: New override.
* java/util/logging/Logger.java: Updated to latest classpath
version.
* java/util/logging/LogManager.java: New override.
From-SVN: r113887
479 lines
16 KiB
Java
479 lines
16 KiB
Java
/* PKCS7SignedData.java -- reader/writer for PKCS#7 signedData objects
|
|
Copyright (C) 2004, 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 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.pkcs;
|
|
|
|
import gnu.java.security.OID;
|
|
import gnu.java.security.ber.BER;
|
|
import gnu.java.security.ber.BEREncodingException;
|
|
import gnu.java.security.ber.BERReader;
|
|
import gnu.java.security.ber.BERValue;
|
|
import gnu.java.security.der.DER;
|
|
import gnu.java.security.der.DERValue;
|
|
import gnu.java.security.der.DERWriter;
|
|
import gnu.java.security.util.Util;
|
|
|
|
import java.io.ByteArrayInputStream;
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
|
|
import java.math.BigInteger;
|
|
|
|
import java.security.cert.CRL;
|
|
import java.security.cert.CRLException;
|
|
import java.security.cert.Certificate;
|
|
import java.security.cert.CertificateEncodingException;
|
|
import java.security.cert.CertificateException;
|
|
import java.security.cert.CertificateFactory;
|
|
import java.security.cert.X509CRL;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
import java.util.HashSet;
|
|
import java.util.Iterator;
|
|
import java.util.LinkedList;
|
|
import java.util.List;
|
|
import java.util.Set;
|
|
import java.util.logging.Logger;
|
|
|
|
/**
|
|
* The SignedData object in PKCS #7. This is a read-only implementation of
|
|
* this format, and is used to provide signed Jar file support.
|
|
*
|
|
* @author Casey Marshall (csm@gnu.org)
|
|
*/
|
|
public class PKCS7SignedData
|
|
{
|
|
private static final Logger log = Logger.getLogger(PKCS7SignedData.class.getName());
|
|
|
|
public static final OID PKCS7_SIGNED_DATA = new OID("1.2.840.113549.1.7.2");
|
|
|
|
private BigInteger version;
|
|
private Set digestAlgorithms;
|
|
private OID contentType;
|
|
private byte[] content;
|
|
private Certificate[] certificates;
|
|
private CRL[] crls;
|
|
private Set signerInfos;
|
|
|
|
public PKCS7SignedData(InputStream in)
|
|
throws CRLException, CertificateException, IOException
|
|
{
|
|
this(new BERReader(in));
|
|
}
|
|
|
|
/**
|
|
* Parse an encoded PKCS#7 SignedData object. The ASN.1 format of this
|
|
* object is:
|
|
*
|
|
* <pre>
|
|
* SignedData ::= SEQUENCE {
|
|
* version Version, -- always 1 for PKCS7 v1.5
|
|
* digestAlgorithms DigestAlgorithmIdentifiers,
|
|
* contentInfo ContentInfo,
|
|
* certificates [0] IMPLICIT ExtendedCertificatesAndCertificates OPTIONAL,
|
|
* crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
|
|
* signerInfos SignerInfos }
|
|
*
|
|
* Version ::= INTEGER
|
|
*
|
|
* DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
|
|
*
|
|
* DigestAlgorithmIdentifier ::= AlgorithmIdentifier
|
|
*
|
|
* ContentInfo ::= SEQUENCE {
|
|
* contentType ContentType,
|
|
* content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL }
|
|
*
|
|
* ContentType ::= OBJECT IDENTIFIER
|
|
*
|
|
* ExtendedCertificatesAndCertificates ::=
|
|
* SET OF ExtendedCertificatesAndCertificate
|
|
*
|
|
* ExtendedCertificatesAndCertificate ::= CHOICE {
|
|
* certificate Certificate, -- from X.509
|
|
* extendedCertificate [0] IMPLICIT ExtendedCertificate }
|
|
*
|
|
* CertificateRevocationLists ::= SET OF CertificateRevocationList
|
|
* -- from X.509
|
|
*
|
|
* SignerInfos ::= SET OF SignerInfo
|
|
*
|
|
* SignerInfo ::= SEQUENCE {
|
|
* version Version, -- always 1 for PKCS7 v1.5
|
|
* issuerAndSerialNumber IssuerAndSerialNumber,
|
|
* digestAlgorithm DigestAlgorithmIdentifier,
|
|
* authenticatedAttributes [0] IMPLICIT Attributes OPTIONAL,
|
|
* digestEncryptionAlgorithm DigestEncryptionAlgorithmIdentifier,
|
|
* encryptedDigest EncryptedDigest,
|
|
* unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL }
|
|
*
|
|
* EncryptedDigest ::= OCTET STRING
|
|
* </pre>
|
|
*
|
|
* <p>(Readers who are confused as to why it takes 40 levels of indirection
|
|
* to specify "data with a signature", rest assured that the present author
|
|
* is as confused as you are).</p>
|
|
*/
|
|
public PKCS7SignedData(BERReader ber)
|
|
throws CRLException, CertificateException, IOException
|
|
{
|
|
CertificateFactory x509 = CertificateFactory.getInstance("X509");
|
|
DERValue val = ber.read();
|
|
if (!val.isConstructed())
|
|
throw new BEREncodingException("malformed ContentInfo");
|
|
|
|
val = ber.read();
|
|
if (val.getTag() != BER.OBJECT_IDENTIFIER)
|
|
throw new BEREncodingException("malformed ContentType");
|
|
|
|
if (!PKCS7_SIGNED_DATA.equals(val.getValue()))
|
|
throw new BEREncodingException("content is not SignedData");
|
|
|
|
val = ber.read();
|
|
if (val.getTag() != 0)
|
|
throw new BEREncodingException("malformed Content");
|
|
|
|
val = ber.read();
|
|
if (!val.isConstructed())
|
|
throw new BEREncodingException("malformed SignedData");
|
|
|
|
log.finest("SignedData: " + val);
|
|
|
|
val = ber.read();
|
|
if (val.getTag() != BER.INTEGER)
|
|
throw new BEREncodingException("expecting Version");
|
|
version = (BigInteger) val.getValue();
|
|
|
|
log.finest(" Version: " + version);
|
|
|
|
digestAlgorithms = new HashSet();
|
|
val = ber.read();
|
|
if (!val.isConstructed())
|
|
throw new BEREncodingException("malformed DigestAlgorithmIdentifiers");
|
|
|
|
log.finest(" DigestAlgorithmIdentifiers: " + val);
|
|
int count = 0;
|
|
DERValue val2 = ber.read();
|
|
while (val2 != BER.END_OF_SEQUENCE &&
|
|
(val.getLength() > 0 && val.getLength() > count))
|
|
{
|
|
if (!val2.isConstructed())
|
|
throw new BEREncodingException("malformed AlgorithmIdentifier");
|
|
|
|
log.finest(" AlgorithmIdentifier: " + val2);
|
|
count += val2.getEncodedLength();
|
|
val2 = ber.read();
|
|
if (val2.getTag() != BER.OBJECT_IDENTIFIER)
|
|
throw new BEREncodingException("malformed AlgorithmIdentifier");
|
|
|
|
log.finest(" digestAlgorithmIdentifiers OID: " + val2.getValue());
|
|
List algId = new ArrayList(2);
|
|
algId.add(val2.getValue());
|
|
val2 = ber.read();
|
|
if (val2 != BER.END_OF_SEQUENCE)
|
|
{
|
|
count += val2.getEncodedLength();
|
|
if (val2.getTag() == BER.NULL)
|
|
algId.add(null);
|
|
else
|
|
algId.add(val2.getEncoded());
|
|
|
|
if (val2.isConstructed())
|
|
ber.skip(val2.getLength());
|
|
|
|
if (BERValue.isIndefinite(val))
|
|
val2 = ber.read();
|
|
}
|
|
else
|
|
algId.add(null);
|
|
|
|
log.finest(" digestAlgorithmIdentifiers params: ");
|
|
log.finest(Util.dumpString((byte[]) algId.get(1),
|
|
" digestAlgorithmIdentifiers params: "));
|
|
digestAlgorithms.add(algId);
|
|
}
|
|
|
|
val = ber.read();
|
|
if (!val.isConstructed())
|
|
throw new BEREncodingException("malformed ContentInfo");
|
|
|
|
log.finest(" ContentInfo: " + val);
|
|
val2 = ber.read();
|
|
if (val2.getTag() != BER.OBJECT_IDENTIFIER)
|
|
throw new BEREncodingException("malformed ContentType");
|
|
|
|
contentType = (OID) val2.getValue();
|
|
log.finest(" ContentType OID: " + contentType);
|
|
if (BERValue.isIndefinite(val)
|
|
|| (val.getLength() > 0 && val.getLength() > val2.getEncodedLength()))
|
|
{
|
|
val2 = ber.read();
|
|
if (val2 != BER.END_OF_SEQUENCE)
|
|
{
|
|
content = val2.getEncoded();
|
|
if (BERValue.isIndefinite(val))
|
|
val2 = ber.read();
|
|
}
|
|
}
|
|
|
|
log.finest(" Content: ");
|
|
log.finest(Util.dumpString(content, " Content: "));
|
|
|
|
val = ber.read();
|
|
if (val.getTag() == 0)
|
|
{
|
|
if (!val.isConstructed())
|
|
throw new BEREncodingException("malformed ExtendedCertificatesAndCertificates");
|
|
|
|
log.finest(" ExtendedCertificatesAndCertificates: " + val);
|
|
count = 0;
|
|
val2 = ber.read();
|
|
List certs = new LinkedList();
|
|
while (val2 != BER.END_OF_SEQUENCE &&
|
|
(val.getLength() > 0 && val.getLength() > count))
|
|
{
|
|
Certificate cert =
|
|
x509.generateCertificate(new ByteArrayInputStream(val2.getEncoded()));
|
|
log.finest(" Certificate: " + cert);
|
|
certs.add(cert);
|
|
count += val2.getEncodedLength();
|
|
ber.skip(val2.getLength());
|
|
if (BERValue.isIndefinite(val) || val.getLength() > count)
|
|
val2 = ber.read();
|
|
}
|
|
certificates = (Certificate[]) certs.toArray(new Certificate[certs.size()]);
|
|
val = ber.read();
|
|
}
|
|
|
|
if (val.getTag() == 1)
|
|
{
|
|
if (!val.isConstructed())
|
|
throw new BEREncodingException("malformed CertificateRevocationLists");
|
|
|
|
log.finest(" CertificateRevocationLists: " + val);
|
|
count = 0;
|
|
val2 = ber.read();
|
|
List crls = new LinkedList();
|
|
while (val2 != BER.END_OF_SEQUENCE &&
|
|
(val.getLength() > 0 && val.getLength() > count))
|
|
{
|
|
CRL crl = x509.generateCRL(new ByteArrayInputStream(val2.getEncoded()));
|
|
log.finest(" CRL: " + crl);
|
|
crls.add(crl);
|
|
count += val2.getEncodedLength();
|
|
ber.skip(val2.getLength());
|
|
if (BERValue.isIndefinite(val) || val.getLength() > count)
|
|
val2 = ber.read();
|
|
}
|
|
this.crls = (CRL[]) crls.toArray(new CRL[crls.size()]);
|
|
val = ber.read();
|
|
}
|
|
|
|
signerInfos = new HashSet();
|
|
if (!val.isConstructed())
|
|
throw new BEREncodingException("malformed SignerInfos");
|
|
|
|
log.finest(" SignerInfos: " + val);
|
|
|
|
// FIXME read this more carefully.
|
|
// Since we are just reading a file (probably) we just read until we
|
|
// reach the end.
|
|
while (true)
|
|
{
|
|
int i = ber.peek();
|
|
if (i == 0 || i == -1)
|
|
break;
|
|
signerInfos.add(new SignerInfo(ber));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Constructs a new instance of <code>PKCS7SignedData</code> given a
|
|
* designated set of fields.
|
|
*
|
|
* @param digestAlgorithms the collection of DigestAlgorithm elements. Each
|
|
* DigestAlgorithm is a {@link List} of two elements, the first is an
|
|
* OID while the second is dependent on the value of the OID element.
|
|
* @param data an instance of a PKCS#7 (non-signed) data. In its simplest form
|
|
* such an ASN.1 structure would consist of just the OID of a
|
|
* non-signed PKCS#7 Data.
|
|
* @param certificates the array of Certificates used to authenticate the
|
|
* enclosed (or referenced, in case the content is null) data.
|
|
* @param crls the array of certificate-revocation lists of the used
|
|
* certificates.
|
|
* @param signerInfos a set of {@link SignerInfo} elements, one per signer of
|
|
* the data referenced by this <code>PKCS7SignedData</code>
|
|
* instance.
|
|
*/
|
|
public PKCS7SignedData(Set digestAlgorithms, PKCS7Data data,
|
|
Certificate[] certificates, X509CRL[] crls,
|
|
Set signerInfos)
|
|
{
|
|
super();
|
|
|
|
this.version = BigInteger.ONE;
|
|
this.digestAlgorithms = digestAlgorithms;
|
|
this.contentType = PKCS7_SIGNED_DATA;
|
|
this.content = data == null ? null : data.getEncoded();
|
|
this.certificates = certificates;
|
|
this.crls = crls;
|
|
this.signerInfos = signerInfos;
|
|
}
|
|
|
|
public BigInteger getVersion()
|
|
{
|
|
return version;
|
|
}
|
|
|
|
public Certificate[] getCertificates()
|
|
{
|
|
return (certificates != null ? (Certificate[]) certificates.clone()
|
|
: null);
|
|
}
|
|
|
|
public OID getContentType()
|
|
{
|
|
return contentType;
|
|
}
|
|
|
|
public byte[] getContent()
|
|
{
|
|
return (content != null ? (byte[]) content.clone() : null);
|
|
}
|
|
|
|
public Set getDigestAlgorithms()
|
|
{
|
|
// FIXME copy contents too, they are mutable!!!
|
|
return Collections.unmodifiableSet(digestAlgorithms);
|
|
}
|
|
|
|
public Set getSignerInfos()
|
|
{
|
|
Set copy = new HashSet();
|
|
for (Iterator it = signerInfos.iterator(); it.hasNext(); )
|
|
copy.add(it.next());
|
|
return Collections.unmodifiableSet(copy);
|
|
}
|
|
|
|
/**
|
|
* Writes to the designated output stream the DER encoding of the current
|
|
* contents of this instance.
|
|
*
|
|
* @param out the destination output stream.
|
|
* @throws IOException if an I/O related exception occurs during the process.
|
|
* @throws CRLException if an exception occurs while encoding the certificate
|
|
* revocation lists associated with this instance.
|
|
* @throws CertificateEncodingException if an exception occurs while encoding
|
|
* the certificate chains associated with this instance.
|
|
*/
|
|
public void encode(OutputStream out) throws IOException, CRLException,
|
|
CertificateEncodingException
|
|
{
|
|
DERValue derVersion = new DERValue(DER.INTEGER, version);
|
|
|
|
DERValue derDigestAlgorithms = new DERValue(DER.CONSTRUCTED | DER.SET,
|
|
digestAlgorithms);
|
|
|
|
DERValue derContentType = new DERValue(DER.OBJECT_IDENTIFIER,
|
|
PKCS7Data.PKCS7_DATA);
|
|
ArrayList contentInfo = new ArrayList(2);
|
|
contentInfo.add(derContentType);
|
|
if (content == null)
|
|
contentInfo.add(new DERValue(DER.NULL, null));
|
|
else
|
|
contentInfo.add(content);
|
|
|
|
DERValue derContentInfo = new DERValue(DER.CONSTRUCTED | DER.SEQUENCE,
|
|
contentInfo);
|
|
|
|
ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
|
|
for (int i = 0; i < certificates.length; i++)
|
|
baos.write(certificates[i].getEncoded());
|
|
|
|
baos.flush();
|
|
byte[] b = baos.toByteArray();
|
|
DERValue derExtendedCertificatesAndCertificates =
|
|
new DERValue(DER.CONSTRUCTED | DER.CONTEXT | 0, b.length, b, null);
|
|
|
|
DERValue derCertificateRevocationLists = null;
|
|
if (crls != null && crls.length > 0)
|
|
{
|
|
baos.reset();
|
|
for (int i = 0; i < crls.length; i++)
|
|
baos.write(((X509CRL) crls[i]).getEncoded());
|
|
|
|
baos.flush();
|
|
byte[] b2 = baos.toByteArray();
|
|
derCertificateRevocationLists =
|
|
new DERValue(DER.CONSTRUCTED | DER.CONTEXT | 1, b2.length, b2, null);
|
|
}
|
|
|
|
baos.reset();
|
|
for (Iterator it = signerInfos.iterator(); it.hasNext();)
|
|
{
|
|
SignerInfo signerInfo = (SignerInfo) it.next();
|
|
signerInfo.encode(baos);
|
|
}
|
|
baos.flush();
|
|
byte[] b3 = baos.toByteArray();
|
|
DERValue derSignerInfos = new DERValue(DER.CONSTRUCTED | DER.SET,
|
|
b3.length, b3, null);
|
|
|
|
ArrayList signedData = new ArrayList(6);
|
|
signedData.add(derVersion);
|
|
signedData.add(derDigestAlgorithms);
|
|
signedData.add(derContentInfo);
|
|
signedData.add(derExtendedCertificatesAndCertificates);
|
|
if (derCertificateRevocationLists != null)
|
|
signedData.add(derCertificateRevocationLists);
|
|
|
|
signedData.add(derSignerInfos);
|
|
DERValue derSignedData = new DERValue(DER.CONSTRUCTED | DER.SEQUENCE,
|
|
signedData);
|
|
// now the outer contents
|
|
ArrayList outer = new ArrayList(3);
|
|
outer.add(new DERValue(DER.OBJECT_IDENTIFIER, PKCS7_SIGNED_DATA));
|
|
outer.add(new DERValue(DER.CONTEXT | 0, null));
|
|
outer.add(derSignedData);
|
|
DERValue derOuter = new DERValue(DER.CONSTRUCTED | DER.SEQUENCE, outer);
|
|
|
|
DERWriter.write(out, derOuter);
|
|
}
|
|
}
|