procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath 0.92

Browse source 
2006-08-14  Mark Wielaard  <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.

From-SVN: r116139
This commit is contained in:
Mark Wielaard 2006-08-14 23:12:35 +00:00
parent abab460491
commit ac1ed908de
1294 changed files with 99479 additions and 35933 deletions
Download patch file Download diff file Expand all files Collapse all files

66
libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
View file

@ -37,6 +37,7 @@ exception statement from your version. */
package gnu.java.security.pkcs;
import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.ber.BER;
import gnu.java.security.ber.BEREncodingException;
@ -52,9 +53,7 @@ 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;
@ -62,7 +61,6 @@ 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;
@ -174,21 +172,22 @@ public class PKCS7SignedData
if (!val.isConstructed())
throw new BEREncodingException("malformed SignedData");
log.finest("SignedData: " + val);
if (Configuration.DEBUG)
log.fine("SignedData: " + val);
val = ber.read();
if (val.getTag() != BER.INTEGER)
throw new BEREncodingException("expecting Version");
version = (BigInteger) val.getValue();
log.finest(" Version: " + version);
if (Configuration.DEBUG)
log.fine(" Version: " + version);
digestAlgorithms = new HashSet();
val = ber.read();
if (!val.isConstructed())
throw new BEREncodingException("malformed DigestAlgorithmIdentifiers");
log.finest(" DigestAlgorithmIdentifiers: " + val);
if (Configuration.DEBUG)
log.fine(" DigestAlgorithmIdentifiers: " + val);
int count = 0;
DERValue val2 = ber.read();
while (val2 != BER.END_OF_SEQUENCE &&
@ -196,14 +195,14 @@ public class PKCS7SignedData
{
if (!val2.isConstructed())
throw new BEREncodingException("malformed AlgorithmIdentifier");
log.finest(" AlgorithmIdentifier: " + val2);
if (Configuration.DEBUG)
log.fine(" 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());
if (Configuration.DEBUG)
log.fine(" digestAlgorithmIdentifiers OID: " + val2.getValue());
List algId = new ArrayList(2);
algId.add(val2.getValue());
val2 = ber.read();
@ -224,23 +223,27 @@ public class PKCS7SignedData
else
algId.add(null);
log.finest(" digestAlgorithmIdentifiers params: ");
log.finest(Util.dumpString((byte[]) algId.get(1),
" digestAlgorithmIdentifiers params: "));
if (Configuration.DEBUG)
{
log.fine(" digestAlgorithmIdentifiers params: ");
log.fine(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);
if (Configuration.DEBUG)
log.fine(" 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 (Configuration.DEBUG)
log.fine(" ContentType OID: " + contentType);
if (BERValue.isIndefinite(val)
|| (val.getLength() > 0 && val.getLength() > val2.getEncodedLength()))
{
@ -252,17 +255,18 @@ public class PKCS7SignedData
val2 = ber.read();
}
}
log.finest(" Content: ");
log.finest(Util.dumpString(content, " Content: "));
if (Configuration.DEBUG)
{
log.fine(" Content: ");
log.fine(Util.dumpString(content, " Content: "));
}
val = ber.read();
if (val.getTag() == 0)
{
if (!val.isConstructed())
throw new BEREncodingException("malformed ExtendedCertificatesAndCertificates");
log.finest(" ExtendedCertificatesAndCertificates: " + val);
if (Configuration.DEBUG)
log.fine(" ExtendedCertificatesAndCertificates: " + val);
count = 0;
val2 = ber.read();
List certs = new LinkedList();
@ -271,7 +275,8 @@ public class PKCS7SignedData
{
Certificate cert =
x509.generateCertificate(new ByteArrayInputStream(val2.getEncoded()));
log.finest(" Certificate: " + cert);
if (Configuration.DEBUG)
log.fine(" Certificate: " + cert);
certs.add(cert);
count += val2.getEncodedLength();
ber.skip(val2.getLength());
@ -286,8 +291,8 @@ public class PKCS7SignedData
{
if (!val.isConstructed())
throw new BEREncodingException("malformed CertificateRevocationLists");
log.finest(" CertificateRevocationLists: " + val);
if (Configuration.DEBUG)
log.fine(" CertificateRevocationLists: " + val);
count = 0;
val2 = ber.read();
List crls = new LinkedList();
@ -295,7 +300,8 @@ public class PKCS7SignedData
(val.getLength() > 0 && val.getLength() > count))
{
CRL crl = x509.generateCRL(new ByteArrayInputStream(val2.getEncoded()));
log.finest(" CRL: " + crl);
if (Configuration.DEBUG)
log.fine(" CRL: " + crl);
crls.add(crl);
count += val2.getEncodedLength();
ber.skip(val2.getLength());
@ -309,8 +315,8 @@ public class PKCS7SignedData
signerInfos = new HashSet();
if (!val.isConstructed())
throw new BEREncodingException("malformed SignerInfos");
log.finest(" SignerInfos: " + val);
if (Configuration.DEBUG)
log.fine(" SignerInfos: " + val);
// FIXME read this more carefully.
// Since we are just reading a file (probably) we just read until we

79
libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
View file

@ -37,6 +37,7 @@ exception statement from your version. */
package gnu.java.security.pkcs;
import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.ber.BER;
import gnu.java.security.ber.BEREncodingException;
@ -50,7 +51,6 @@ import gnu.java.security.util.Util;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.logging.Logger;
@ -101,7 +101,8 @@ public class SignerInfo
public SignerInfo(BERReader ber) throws IOException
{
DERValue val = ber.read();
log.finest("SignerInfo: " + val);
if (Configuration.DEBUG)
log.fine("SignerInfo: " + val);
if (!val.isConstructed())
throw new BEREncodingException("malformed SignerInfo");
@ -110,13 +111,13 @@ public class SignerInfo
throw new BEREncodingException("malformed Version");
version = (BigInteger) val.getValue();
log.finest(" Version: " + version);
log.fine(" Version: " + version);
val = ber.read();
if (!val.isConstructed())
throw new BEREncodingException("malformed IssuerAndSerialNumber");
log.finest(" IssuerAndSerialNumber: " + val);
if (Configuration.DEBUG)
log.fine(" IssuerAndSerialNumber: " + val);
val = ber.read();
if (!val.isConstructed())
@ -124,20 +125,22 @@ public class SignerInfo
issuer = new X500Principal(val.getEncoded());
ber.skip(val.getLength());
log.finest(" Issuer: " + issuer);
if (Configuration.DEBUG)
log.fine(" Issuer: " + issuer);
val = ber.read();
if (val.getTag() != BER.INTEGER)
throw new BEREncodingException("malformed SerialNumber");
serialNumber = (BigInteger) val.getValue();
log.finest(" SerialNumber: " + serialNumber);
if (Configuration.DEBUG)
log.fine(" SerialNumber: " + serialNumber);
val = ber.read();
if (!val.isConstructed())
throw new BEREncodingException("malformed DigestAlgorithmIdentifier");
log.finest(" DigestAlgorithmIdentifier: " + val);
if (Configuration.DEBUG)
log.fine(" DigestAlgorithmIdentifier: " + val);
int count = 0;
DERValue val2 = ber.read();
@ -145,7 +148,8 @@ public class SignerInfo
throw new BEREncodingException("malformed AlgorithmIdentifier");
digestAlgorithmId = (OID) val2.getValue();
log.finest(" digestAlgorithm OID: " + digestAlgorithmId);
if (Configuration.DEBUG)
log.fine(" digestAlgorithm OID: " + digestAlgorithmId);
if (BERValue.isIndefinite(val))
{
@ -170,10 +174,12 @@ public class SignerInfo
else
digestAlgorithmParams = null;
log.finest(" digestAlgorithm params: ");
log.finest(Util.dumpString(digestAlgorithmParams,
" digestAlgorithm params: "));
if (Configuration.DEBUG)
{
log.fine(" digestAlgorithm params: ");
log.fine(Util.dumpString(digestAlgorithmParams,
" digestAlgorithm params: "));
}
val = ber.read();
if (val.getTag() == 0)
{
@ -187,21 +193,24 @@ public class SignerInfo
else
authenticatedAttributes = null;
log.finest(" AuthenticatedAttributes: ");
log.finest(Util.dumpString(authenticatedAttributes,
" AuthenticatedAttributes: "));
if (Configuration.DEBUG)
{
log.fine(" AuthenticatedAttributes: ");
log.fine(Util.dumpString(authenticatedAttributes,
" AuthenticatedAttributes: "));
}
if (!val.isConstructed())
throw new BEREncodingException("malformed DigestEncryptionAlgorithmIdentifier");
log.finest(" DigestEncryptionAlgorithmIdentifier: " + val);
if (Configuration.DEBUG)
log.fine(" DigestEncryptionAlgorithmIdentifier: " + val);
count = 0;
val2 = ber.read();
if (val2.getTag() != BER.OBJECT_IDENTIFIER)
throw new BEREncodingException("malformed AlgorithmIdentifier");
digestEncryptionAlgorithmId = (OID) val2.getValue();
log.finest(" digestEncryptionAlgorithm OID: " + digestEncryptionAlgorithmId);
if (Configuration.DEBUG)
log.fine(" digestEncryptionAlgorithm OID: " + digestEncryptionAlgorithmId);
if (BERValue.isIndefinite(val))
{
@ -226,27 +235,33 @@ public class SignerInfo
else
digestEncryptionAlgorithmParams = null;
log.finest(" digestEncryptionAlgorithm params: ");
log.finest(Util.dumpString(digestEncryptionAlgorithmParams,
" digestEncryptionAlgorithm params: "));
if (Configuration.DEBUG)
{
log.fine(" digestEncryptionAlgorithm params: ");
log.fine(Util.dumpString(digestEncryptionAlgorithmParams,
" digestEncryptionAlgorithm params: "));
}
val = ber.read();
if (val.getTag() != BER.OCTET_STRING)
throw new BEREncodingException("malformed EncryptedDigest");
encryptedDigest = (byte[]) val.getValue();
log.finest(" EncryptedDigest: ");
log.finest(Util.dumpString(encryptedDigest, " EncryptedDigest: "));
if (Configuration.DEBUG)
{
log.fine(" EncryptedDigest: ");
log.fine(Util.dumpString(encryptedDigest, " EncryptedDigest: "));
}
if (ber.peek() == 1)
unauthenticatedAttributes = ber.read().getEncoded();
else
unauthenticatedAttributes = null;
log.finest(" UnauthenticatedAttributes: ");
log.finest(Util.dumpString(unauthenticatedAttributes,
" UnauthenticatedAttributes: "));
if (Configuration.DEBUG)
{
log.fine(" UnauthenticatedAttributes: ");
log.fine(Util.dumpString(unauthenticatedAttributes,
" UnauthenticatedAttributes: "));
}
if (ber.peek() == 0)
ber.read();
}