[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cleanups
Kaffe CVS
cvs-commits at kaffe.org
Tue Mar 8 13:42:40 PST 2005
PatchSet 5501
Date: 2005/03/08 21:05:55
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: cleanups
2005-03-08 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
2005-03-02 Michael Koch <konqueror at gmx.de>
* gnu/java/security/OID.java,
gnu/java/security/der/DERReader.java,
gnu/java/security/provider/CollectionCertStoreImpl.java,
gnu/java/security/provider/DSAParameterGenerator.java,
gnu/java/security/provider/DefaultPolicy.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/GnuRSAPrivateKey.java,
gnu/java/security/provider/GnuRSAPublicKey.java,
gnu/java/security/provider/PKIXCertPathValidatorImpl.java,
gnu/java/security/provider/RSA.java,
gnu/java/security/provider/SHA1PRNG.java,
gnu/java/security/provider/SHA1withRSA.java,
gnu/java/security/provider/X509CertificateFactory.java,
gnu/java/security/x509/GnuPKIExtension.java,
gnu/java/security/x509/X500DistinguishedName.java,
gnu/java/security/x509/X509CRL.java,
gnu/java/security/x509/X509CRLEntry.java,
gnu/java/security/x509/X509CertPath.java,
gnu/java/security/x509/X509CertSelectorImpl.java,
gnu/java/security/x509/X509Certificate.java,
gnu/java/security/x509/ext/AuthorityKeyIdentifier.java,
gnu/java/security/x509/ext/BasicConstraints.java,
gnu/java/security/x509/ext/CRLNumber.java,
gnu/java/security/x509/ext/CertificatePolicies.java,
gnu/java/security/x509/ext/ExtendedKeyUsage.java,
gnu/java/security/x509/ext/Extension.java,
gnu/java/security/x509/ext/GeneralNames.java,
gnu/java/security/x509/ext/IssuerAlternativeNames.java,
gnu/java/security/x509/ext/KeyUsage.java,
gnu/java/security/x509/ext/PolicyConstraint.java,
gnu/java/security/x509/ext/PolicyMappings.java,
gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java,
gnu/java/security/x509/ext/ReasonCode.java,
gnu/java/security/x509/ext/SubjectAlternativeNames.java,
gnu/java/security/x509/ext/SubjectKeyIdentifier.java:
Reworked import statments to match our style.
Members:
ChangeLog:1.3675->1.3676
libraries/javalib/gnu/java/security/OID.java:1.3->1.4
libraries/javalib/gnu/java/security/der/DERReader.java:1.5->1.6
libraries/javalib/gnu/java/security/provider/CollectionCertStoreImpl.java:1.1->1.2
libraries/javalib/gnu/java/security/provider/DSAParameterGenerator.java:1.1->1.2
libraries/javalib/gnu/java/security/provider/DefaultPolicy.java:1.3->1.4
libraries/javalib/gnu/java/security/provider/EncodedKeyFactory.java:1.2->1.3
libraries/javalib/gnu/java/security/provider/GnuDHPublicKey.java:1.2->1.3
libraries/javalib/gnu/java/security/provider/GnuDSAPrivateKey.java:1.2->1.3
libraries/javalib/gnu/java/security/provider/GnuDSAPublicKey.java:1.2->1.3
libraries/javalib/gnu/java/security/provider/GnuRSAPrivateKey.java:1.1->1.2
libraries/javalib/gnu/java/security/provider/GnuRSAPublicKey.java:1.1->1.2
libraries/javalib/gnu/java/security/provider/PKIXCertPathValidatorImpl.java:1.2->1.3
libraries/javalib/gnu/java/security/provider/RSA.java:1.1->1.2
libraries/javalib/gnu/java/security/provider/SHA1PRNG.java:1.2->1.3
libraries/javalib/gnu/java/security/provider/SHA1withRSA.java:1.1->1.2
libraries/javalib/gnu/java/security/provider/X509CertificateFactory.java:1.2->1.3
libraries/javalib/gnu/java/security/x509/GnuPKIExtension.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java:1.6->1.7
libraries/javalib/gnu/java/security/x509/X509CRL.java:1.4->1.5
libraries/javalib/gnu/java/security/x509/X509CRLEntry.java:1.3->1.4
libraries/javalib/gnu/java/security/x509/X509CertPath.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/X509CertSelectorImpl.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/X509Certificate.java:1.4->1.5
libraries/javalib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java:1.2->1.3
libraries/javalib/gnu/java/security/x509/ext/BasicConstraints.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/CRLNumber.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/CertificatePolicies.java:1.2->1.3
libraries/javalib/gnu/java/security/x509/ext/ExtendedKeyUsage.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/Extension.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/GeneralNames.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/IssuerAlternativeNames.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/KeyUsage.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/PolicyConstraint.java:1.2->1.3
libraries/javalib/gnu/java/security/x509/ext/PolicyMappings.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/ReasonCode.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/SubjectAlternativeNames.java:1.1->1.2
libraries/javalib/gnu/java/security/x509/ext/SubjectKeyIdentifier.java:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3675 kaffe/ChangeLog:1.3676
--- kaffe/ChangeLog:1.3675 Tue Mar 8 21:03:32 2005
+++ kaffe/ChangeLog Tue Mar 8 21:05:55 2005
@@ -4,6 +4,52 @@
2005-03-02 Michael Koch <konqueror at gmx.de>
+ * gnu/java/security/OID.java,
+ gnu/java/security/der/DERReader.java,
+ gnu/java/security/provider/CollectionCertStoreImpl.java,
+ gnu/java/security/provider/DSAParameterGenerator.java,
+ gnu/java/security/provider/DefaultPolicy.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/GnuRSAPrivateKey.java,
+ gnu/java/security/provider/GnuRSAPublicKey.java,
+ gnu/java/security/provider/PKIXCertPathValidatorImpl.java,
+ gnu/java/security/provider/RSA.java,
+ gnu/java/security/provider/SHA1PRNG.java,
+ gnu/java/security/provider/SHA1withRSA.java,
+ gnu/java/security/provider/X509CertificateFactory.java,
+ gnu/java/security/x509/GnuPKIExtension.java,
+ gnu/java/security/x509/X500DistinguishedName.java,
+ gnu/java/security/x509/X509CRL.java,
+ gnu/java/security/x509/X509CRLEntry.java,
+ gnu/java/security/x509/X509CertPath.java,
+ gnu/java/security/x509/X509CertSelectorImpl.java,
+ gnu/java/security/x509/X509Certificate.java,
+ gnu/java/security/x509/ext/AuthorityKeyIdentifier.java,
+ gnu/java/security/x509/ext/BasicConstraints.java,
+ gnu/java/security/x509/ext/CRLNumber.java,
+ gnu/java/security/x509/ext/CertificatePolicies.java,
+ gnu/java/security/x509/ext/ExtendedKeyUsage.java,
+ gnu/java/security/x509/ext/Extension.java,
+ gnu/java/security/x509/ext/GeneralNames.java,
+ gnu/java/security/x509/ext/IssuerAlternativeNames.java,
+ gnu/java/security/x509/ext/KeyUsage.java,
+ gnu/java/security/x509/ext/PolicyConstraint.java,
+ gnu/java/security/x509/ext/PolicyMappings.java,
+ gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java,
+ gnu/java/security/x509/ext/ReasonCode.java,
+ gnu/java/security/x509/ext/SubjectAlternativeNames.java,
+ gnu/java/security/x509/ext/SubjectKeyIdentifier.java:
+ Reworked import statments to match our style.
+
+2005-03-08 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
+ 2005-03-02 Michael Koch <konqueror at gmx.de>
+
* gnu/java/awt/Buffers.java,
gnu/java/awt/ComponentDataBlitOp.java,
gnu/java/awt/EmbeddedWindowSupport.java,
Index: kaffe/libraries/javalib/gnu/java/security/OID.java
diff -u kaffe/libraries/javalib/gnu/java/security/OID.java:1.3 kaffe/libraries/javalib/gnu/java/security/OID.java:1.4
--- kaffe/libraries/javalib/gnu/java/security/OID.java:1.3 Fri Oct 15 10:41:46 2004
+++ kaffe/libraries/javalib/gnu/java/security/OID.java Tue Mar 8 21:06:01 2005
@@ -41,8 +41,8 @@
import gnu.java.security.der.DEREncodingException;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.StringTokenizer;
/**
Index: kaffe/libraries/javalib/gnu/java/security/der/DERReader.java
diff -u kaffe/libraries/javalib/gnu/java/security/der/DERReader.java:1.5 kaffe/libraries/javalib/gnu/java/security/der/DERReader.java:1.6
--- kaffe/libraries/javalib/gnu/java/security/der/DERReader.java:1.5 Thu Nov 11 00:32:41 2004
+++ kaffe/libraries/javalib/gnu/java/security/der/DERReader.java Tue Mar 8 21:06:03 2005
@@ -38,20 +38,18 @@
package gnu.java.security.der;
+import gnu.java.security.OID;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
-import java.io.InputStream;
import java.io.IOException;
-
+import java.io.InputStream;
import java.math.BigInteger;
-
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
-
-import gnu.java.security.OID;
/**
* This class decodes DER sequences into Java objects. The methods of
Index: kaffe/libraries/javalib/gnu/java/security/provider/CollectionCertStoreImpl.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/CollectionCertStoreImpl.java:1.1 kaffe/libraries/javalib/gnu/java/security/provider/CollectionCertStoreImpl.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/provider/CollectionCertStoreImpl.java:1.1 Wed Nov 10 22:48:21 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/CollectionCertStoreImpl.java Tue Mar 8 21:06:03 2005
@@ -39,15 +39,14 @@
package gnu.java.security.provider;
import java.security.InvalidAlgorithmParameterException;
-import java.security.cert.Certificate;
-import java.security.cert.CertSelector;
import java.security.cert.CRL;
import java.security.cert.CRLSelector;
+import java.security.cert.CertSelector;
import java.security.cert.CertStoreException;
import java.security.cert.CertStoreParameters;
import java.security.cert.CertStoreSpi;
+import java.security.cert.Certificate;
import java.security.cert.CollectionCertStoreParameters;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
Index: kaffe/libraries/javalib/gnu/java/security/provider/DSAParameterGenerator.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/DSAParameterGenerator.java:1.1 kaffe/libraries/javalib/gnu/java/security/provider/DSAParameterGenerator.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/provider/DSAParameterGenerator.java:1.1 Sat Sep 25 16:39:58 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/DSAParameterGenerator.java Tue Mar 8 21:06:03 2005
@@ -38,9 +38,11 @@
package gnu.java.security.provider;
+import gnu.java.security.util.Prime;
+
import java.math.BigInteger;
-import java.security.AlgorithmParameters;
import java.security.AlgorithmParameterGeneratorSpi;
+import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -48,8 +50,6 @@
import java.security.spec.DSAParameterSpec;
import java.security.spec.InvalidParameterSpecException;
import java.util.Random;
-
-import gnu.java.security.util.Prime;
public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi
{
Index: kaffe/libraries/javalib/gnu/java/security/provider/DefaultPolicy.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/DefaultPolicy.java:1.3 kaffe/libraries/javalib/gnu/java/security/provider/DefaultPolicy.java:1.4
--- kaffe/libraries/javalib/gnu/java/security/provider/DefaultPolicy.java:1.3 Sat Sep 25 16:39:58 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/DefaultPolicy.java Tue Mar 8 21:06:03 2005
@@ -1,4 +1,4 @@
-/* DefaultPolicy.java
+/* DefaultPolicy.java --
Copyright (C) 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -37,7 +37,12 @@
package gnu.java.security.provider;
-import java.security.*;
+import java.security.AllPermission;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Policy;
/**
* This is just a stub policy implementation which grants all permissions
Index: kaffe/libraries/javalib/gnu/java/security/provider/EncodedKeyFactory.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/EncodedKeyFactory.java:1.2 kaffe/libraries/javalib/gnu/java/security/provider/EncodedKeyFactory.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/provider/EncodedKeyFactory.java:1.2 Mon Feb 14 20:49:32 2005
+++ kaffe/libraries/javalib/gnu/java/security/provider/EncodedKeyFactory.java Tue Mar 8 21:06:03 2005
@@ -44,9 +44,7 @@
import gnu.java.security.der.DERValue;
import java.io.IOException;
-
import java.math.BigInteger;
-
import java.security.AlgorithmParameters;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -54,10 +52,9 @@
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.PublicKey;
-
import java.security.spec.DSAParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
import java.security.spec.InvalidKeySpecException;
+import java.security.spec.InvalidParameterSpecException;
import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.RSAPrivateCrtKeySpec;
Index: kaffe/libraries/javalib/gnu/java/security/provider/GnuDHPublicKey.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/GnuDHPublicKey.java:1.2 kaffe/libraries/javalib/gnu/java/security/provider/GnuDHPublicKey.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/provider/GnuDHPublicKey.java:1.2 Mon Feb 14 20:49:32 2005
+++ kaffe/libraries/javalib/gnu/java/security/provider/GnuDHPublicKey.java Tue Mar 8 21:06:03 2005
@@ -38,17 +38,16 @@
package gnu.java.security.provider;
-import java.math.BigInteger;
+import gnu.java.security.OID;
+import gnu.java.security.der.BitString;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERValue;
+import java.math.BigInteger;
import java.util.ArrayList;
import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHParameterSpec;
-
-import gnu.java.security.OID;
-import gnu.java.security.der.BitString;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERValue;
public class GnuDHPublicKey implements DHPublicKey
{
Index: kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPrivateKey.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPrivateKey.java:1.2 kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPrivateKey.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPrivateKey.java:1.2 Thu Nov 11 01:19:18 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPrivateKey.java Tue Mar 8 21:06:03 2005
@@ -45,13 +45,10 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-
import java.math.BigInteger;
-
-import java.security.interfaces.DSAPrivateKey;
import java.security.interfaces.DSAParams;
+import java.security.interfaces.DSAPrivateKey;
import java.security.spec.DSAParameterSpec;
-
import java.util.ArrayList;
public class GnuDSAPrivateKey implements DSAPrivateKey
Index: kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPublicKey.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPublicKey.java:1.2 kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPublicKey.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPublicKey.java:1.2 Thu Nov 11 01:19:18 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/GnuDSAPublicKey.java Tue Mar 8 21:06:03 2005
@@ -46,13 +46,10 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-
import java.math.BigInteger;
-
-import java.security.interfaces.DSAPublicKey;
import java.security.interfaces.DSAParams;
+import java.security.interfaces.DSAPublicKey;
import java.security.spec.DSAParameterSpec;
-
import java.util.ArrayList;
public class GnuDSAPublicKey implements DSAPublicKey
Index: kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPrivateKey.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPrivateKey.java:1.1 kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPrivateKey.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPrivateKey.java:1.1 Wed Nov 10 22:48:21 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPrivateKey.java Tue Mar 8 21:06:03 2005
@@ -38,16 +38,14 @@
package gnu.java.security.provider;
-import java.math.BigInteger;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERValue;
+import java.math.BigInteger;
import java.security.interfaces.RSAPrivateCrtKey;
import java.security.spec.RSAPrivateCrtKeySpec;
-
import java.util.ArrayList;
-
-import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERValue;
class GnuRSAPrivateKey implements RSAPrivateCrtKey
{
Index: kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPublicKey.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPublicKey.java:1.1 kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPublicKey.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPublicKey.java:1.1 Wed Nov 10 22:48:21 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/GnuRSAPublicKey.java Tue Mar 8 21:06:03 2005
@@ -38,15 +38,15 @@
package gnu.java.security.provider;
-import java.math.BigInteger;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.ArrayList;
-
import gnu.java.security.OID;
import gnu.java.security.der.BitString;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERValue;
+
+import java.math.BigInteger;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.RSAPublicKeySpec;
+import java.util.ArrayList;
class GnuRSAPublicKey implements RSAPublicKey
{
Index: kaffe/libraries/javalib/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/PKIXCertPathValidatorImpl.java:1.2 kaffe/libraries/javalib/gnu/java/security/provider/PKIXCertPathValidatorImpl.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/provider/PKIXCertPathValidatorImpl.java:1.2 Mon Feb 14 20:49:32 2005
+++ kaffe/libraries/javalib/gnu/java/security/provider/PKIXCertPathValidatorImpl.java Tue Mar 8 21:06:04 2005
@@ -41,8 +41,8 @@
import gnu.java.security.OID;
import gnu.java.security.x509.GnuPKIExtension;
import gnu.java.security.x509.PolicyNodeImpl;
-import gnu.java.security.x509.X509CertSelectorImpl;
import gnu.java.security.x509.X509CRLSelectorImpl;
+import gnu.java.security.x509.X509CertSelectorImpl;
import gnu.java.security.x509.ext.BasicConstraints;
import gnu.java.security.x509.ext.CertificatePolicies;
import gnu.java.security.x509.ext.Extension;
@@ -50,12 +50,10 @@
import gnu.java.security.x509.ext.PolicyConstraint;
import java.io.IOException;
-
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.PublicKey;
-
-import java.security.cert.CertificateException;
+import java.security.cert.CRL;
import java.security.cert.CertPath;
import java.security.cert.CertPathParameters;
import java.security.cert.CertPathValidatorException;
@@ -63,16 +61,15 @@
import java.security.cert.CertPathValidatorSpi;
import java.security.cert.CertStore;
import java.security.cert.CertStoreException;
-import java.security.cert.CRL;
+import java.security.cert.CertificateException;
import java.security.cert.PKIXCertPathChecker;
import java.security.cert.PKIXCertPathValidatorResult;
import java.security.cert.PKIXParameters;
import java.security.cert.TrustAnchor;
-import java.security.cert.X509Certificate;
import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
import java.security.interfaces.DSAParams;
import java.security.interfaces.DSAPublicKey;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
Index: kaffe/libraries/javalib/gnu/java/security/provider/RSA.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/RSA.java:1.1 kaffe/libraries/javalib/gnu/java/security/provider/RSA.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/provider/RSA.java:1.1 Wed Nov 10 22:48:21 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/RSA.java Tue Mar 8 21:06:04 2005
@@ -38,11 +38,15 @@
package gnu.java.security.provider;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.der.DERWriter;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-
import java.math.BigInteger;
-
import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.security.PrivateKey;
@@ -52,14 +56,7 @@
import java.security.SignatureSpi;
import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
-
import java.util.ArrayList;
-
-import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
-import gnu.java.security.der.DERWriter;
public abstract class RSA extends SignatureSpi implements Cloneable
{
Index: kaffe/libraries/javalib/gnu/java/security/provider/SHA1PRNG.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/SHA1PRNG.java:1.2 kaffe/libraries/javalib/gnu/java/security/provider/SHA1PRNG.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/provider/SHA1PRNG.java:1.2 Wed Feb 23 19:02:39 2005
+++ kaffe/libraries/javalib/gnu/java/security/provider/SHA1PRNG.java Tue Mar 8 21:06:04 2005
@@ -38,11 +38,11 @@
package gnu.java.security.provider;
-import java.util.Random;
-import java.security.SecureRandomSpi;
+import java.io.Serializable;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.io.Serializable;
+import java.security.SecureRandomSpi;
+import java.util.Random;
public class SHA1PRNG extends SecureRandomSpi implements Serializable
{
Index: kaffe/libraries/javalib/gnu/java/security/provider/SHA1withRSA.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/SHA1withRSA.java:1.1 kaffe/libraries/javalib/gnu/java/security/provider/SHA1withRSA.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/provider/SHA1withRSA.java:1.1 Wed Nov 10 22:48:21 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/SHA1withRSA.java Tue Mar 8 21:06:04 2005
@@ -38,10 +38,10 @@
package gnu.java.security.provider;
+import gnu.java.security.OID;
+
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-
-import gnu.java.security.OID;
public class SHA1withRSA extends RSA
{
Index: kaffe/libraries/javalib/gnu/java/security/provider/X509CertificateFactory.java
diff -u kaffe/libraries/javalib/gnu/java/security/provider/X509CertificateFactory.java:1.2 kaffe/libraries/javalib/gnu/java/security/provider/X509CertificateFactory.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/provider/X509CertificateFactory.java:1.2 Wed Nov 10 22:46:24 2004
+++ kaffe/libraries/javalib/gnu/java/security/provider/X509CertificateFactory.java Tue Mar 8 21:06:04 2005
@@ -38,28 +38,26 @@
package gnu.java.security.provider;
+import gnu.java.io.Base64InputStream;
+import gnu.java.security.x509.X509CRL;
+import gnu.java.security.x509.X509CertPath;
+import gnu.java.security.x509.X509Certificate;
+
import java.io.BufferedInputStream;
import java.io.EOFException;
-import java.io.InputStream;
import java.io.IOException;
-
+import java.io.InputStream;
+import java.security.cert.CRL;
+import java.security.cert.CRLException;
+import java.security.cert.CertPath;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactorySpi;
-import java.security.cert.CertPath;
-import java.security.cert.CRL;
-import java.security.cert.CRLException;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-
-import gnu.java.io.Base64InputStream;
-import gnu.java.security.x509.X509Certificate;
-import gnu.java.security.x509.X509CertPath;
-import gnu.java.security.x509.X509CRL;
public class X509CertificateFactory extends CertificateFactorySpi
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/GnuPKIExtension.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/GnuPKIExtension.java:1.1 kaffe/libraries/javalib/gnu/java/security/x509/GnuPKIExtension.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/x509/GnuPKIExtension.java:1.1 Wed Nov 10 22:48:22 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/GnuPKIExtension.java Tue Mar 8 21:06:04 2005
@@ -38,11 +38,11 @@
package gnu.java.security.x509;
-import java.security.cert.X509Extension;
-import java.util.Collection;
-
import gnu.java.security.OID;
import gnu.java.security.x509.ext.Extension;
+
+import java.security.cert.X509Extension;
+import java.util.Collection;
public interface GnuPKIExtension extends X509Extension
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java:1.6 kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java:1.7
--- kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java:1.6 Mon Feb 14 20:49:33 2005
+++ kaffe/libraries/javalib/gnu/java/security/x509/X500DistinguishedName.java Tue Mar 8 21:06:04 2005
@@ -38,14 +38,17 @@
package gnu.java.security.x509;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+
import java.io.EOFException;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
-
import java.security.Principal;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -55,11 +58,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
-import gnu.java.security.OID;
public class X500DistinguishedName implements Principal
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/X509CRL.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/X509CRL.java:1.4 kaffe/libraries/javalib/gnu/java/security/x509/X509CRL.java:1.5
--- kaffe/libraries/javalib/gnu/java/security/x509/X509CRL.java:1.4 Mon Feb 14 20:49:33 2005
+++ kaffe/libraries/javalib/gnu/java/security/x509/X509CRL.java Tue Mar 8 21:06:04 2005
@@ -45,23 +45,23 @@
import gnu.java.security.der.DERValue;
import gnu.java.security.x509.ext.Extension;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.math.BigInteger;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
-import java.security.PublicKey;
import java.security.Principal;
+import java.security.PublicKey;
import java.security.Signature;
import java.security.SignatureException;
-import java.security.cert.Certificate;
import java.security.cert.CRLException;
+import java.security.cert.Certificate;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
-import java.util.HashSet;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
Index: kaffe/libraries/javalib/gnu/java/security/x509/X509CRLEntry.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/X509CRLEntry.java:1.3 kaffe/libraries/javalib/gnu/java/security/x509/X509CRLEntry.java:1.4
--- kaffe/libraries/javalib/gnu/java/security/x509/X509CRLEntry.java:1.3 Mon Feb 14 20:49:33 2005
+++ kaffe/libraries/javalib/gnu/java/security/x509/X509CRLEntry.java Tue Mar 8 21:06:04 2005
@@ -38,12 +38,14 @@
package gnu.java.security.x509;
-import java.io.IOException;
+import gnu.java.security.OID;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.x509.ext.Extension;
+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;
@@ -51,10 +53,6 @@
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.
Index: kaffe/libraries/javalib/gnu/java/security/x509/X509CertPath.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/X509CertPath.java:1.1 kaffe/libraries/javalib/gnu/java/security/x509/X509CertPath.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/x509/X509CertPath.java:1.1 Wed Nov 10 22:48:22 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/X509CertPath.java Tue Mar 8 21:06:04 2005
@@ -38,30 +38,27 @@
package gnu.java.security.x509;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DEREncodingException;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
import java.io.IOException;
-
+import java.io.InputStream;
import java.math.BigInteger;
-
+import java.security.cert.CertPath;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
-import java.security.cert.CertPath;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-
-import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DEREncodingException;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
/**
* A certificate path (or certificate chain) of X509Certificates.
Index: kaffe/libraries/javalib/gnu/java/security/x509/X509CertSelectorImpl.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/X509CertSelectorImpl.java:1.1 kaffe/libraries/javalib/gnu/java/security/x509/X509CertSelectorImpl.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/x509/X509CertSelectorImpl.java:1.1 Wed Nov 10 22:48:22 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/X509CertSelectorImpl.java Tue Mar 8 21:06:04 2005
@@ -39,12 +39,10 @@
package gnu.java.security.x509;
import java.io.IOException;
-
import java.security.Principal;
-import java.security.cert.Certificate;
import java.security.cert.CertSelector;
+import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
-
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
Index: kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java:1.4 kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java:1.5
--- kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java:1.4 Mon Feb 14 20:49:33 2005
+++ kaffe/libraries/javalib/gnu/java/security/x509/X509Certificate.java Tue Mar 8 21:06:04 2005
@@ -38,14 +38,24 @@
package gnu.java.security.x509;
-import java.io.InputStream;
+import gnu.java.security.OID;
+import gnu.java.security.der.BitString;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.x509.ext.BasicConstraints;
+import gnu.java.security.x509.ext.ExtendedKeyUsage;
+import gnu.java.security.x509.ext.Extension;
+import gnu.java.security.x509.ext.IssuerAlternativeNames;
+import gnu.java.security.x509.ext.KeyUsage;
+import gnu.java.security.x509.ext.SubjectAlternativeNames;
+
import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.io.Serializable;
import java.io.StringWriter;
-
import java.math.BigInteger;
-
import java.security.AlgorithmParameters;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
@@ -55,20 +65,17 @@
import java.security.PublicKey;
import java.security.Signature;
import java.security.SignatureException;
-
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateExpiredException;
import java.security.cert.CertificateNotYetValidException;
import java.security.cert.CertificateParsingException;
-
import java.security.interfaces.DSAParams;
import java.security.interfaces.DSAPublicKey;
import java.security.spec.DSAParameterSpec;
import java.security.spec.X509EncodedKeySpec;
-
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@@ -80,10 +87,6 @@
import java.util.Set;
import javax.security.auth.x500.X500Principal;
-
-import gnu.java.security.OID;
-import gnu.java.security.der.*;
-import gnu.java.security.x509.ext.*;
/**
* An implementation of X.509 certificates.
Index: kaffe/libraries/javalib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java:1.2 kaffe/libraries/javalib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java:1.2 Mon Feb 14 20:49:33 2005
+++ kaffe/libraries/javalib/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java Tue Mar 8 21:06:05 2005
@@ -38,14 +38,14 @@
package gnu.java.security.x509.ext;
-import java.io.IOException;
-import java.math.BigInteger;
-
import gnu.java.security.OID;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue;
import gnu.java.security.x509.Util;
+
+import java.io.IOException;
+import java.math.BigInteger;
public class AuthorityKeyIdentifier extends Extension.Value
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/ext/BasicConstraints.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/ext/BasicConstraints.java:1.1 kaffe/libraries/javalib/gnu/java/security/x509/ext/BasicConstraints.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/x509/ext/BasicConstraints.java:1.1 Wed Nov 10 22:52:25 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/ext/BasicConstraints.java Tue Mar 8 21:06:05 2005
@@ -38,15 +38,15 @@
package gnu.java.security.x509.ext;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
import gnu.java.security.OID;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
public class BasicConstraints extends Extension.Value
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/ext/CRLNumber.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/ext/CRLNumber.java:1.1 kaffe/libraries/javalib/gnu/java/security/x509/ext/CRLNumber.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/x509/ext/CRLNumber.java:1.1 Wed Nov 10 22:52:25 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/ext/CRLNumber.java Tue Mar 8 21:06:05 2005
@@ -38,13 +38,13 @@
package gnu.java.security.x509.ext;
-import java.io.IOException;
-import java.math.BigInteger;
-
import gnu.java.security.OID;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue;
+
+import java.io.IOException;
+import java.math.BigInteger;
public class CRLNumber extends Extension.Value
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/ext/CertificatePolicies.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/ext/CertificatePolicies.java:1.2 kaffe/libraries/javalib/gnu/java/security/x509/ext/CertificatePolicies.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/x509/ext/CertificatePolicies.java:1.2 Mon Feb 14 20:49:33 2005
+++ kaffe/libraries/javalib/gnu/java/security/x509/ext/CertificatePolicies.java Tue Mar 8 21:06:05 2005
@@ -38,9 +38,13 @@
package gnu.java.security.x509.ext;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+
import java.io.IOException;
import java.security.cert.PolicyQualifierInfo;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -48,11 +52,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
-import gnu.java.security.OID;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
-import gnu.java.security.der.DERValue;
public class CertificatePolicies extends Extension.Value
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/ext/ExtendedKeyUsage.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/ext/ExtendedKeyUsage.java:1.1 kaffe/libraries/javalib/gnu/java/security/x509/ext/ExtendedKeyUsage.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/x509/ext/ExtendedKeyUsage.java:1.1 Wed Nov 10 22:52:25 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/ext/ExtendedKeyUsage.java Tue Mar 8 21:06:05 2005
@@ -38,15 +38,15 @@
package gnu.java.security.x509.ext;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
import gnu.java.security.OID;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
public class ExtendedKeyUsage extends Extension.Value
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/ext/Extension.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/ext/Extension.java:1.1 kaffe/libraries/javalib/gnu/java/security/x509/ext/Extension.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/x509/ext/Extension.java:1.1 Wed Nov 10 22:52:25 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/ext/Extension.java Tue Mar 8 21:06:05 2005
@@ -38,16 +38,16 @@
package gnu.java.security.x509.ext;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
import gnu.java.security.OID;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue;
import gnu.java.security.x509.Util;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
public class Extension
{
Index: kaffe/libraries/javalib/gnu/java/security/x509/ext/GeneralNames.java
diff -u kaffe/libraries/javalib/gnu/java/security/x509/ext/GeneralNames.java:1.1 kaffe/libraries/javalib/gnu/java/security/x509/ext/GeneralNames.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/x509/ext/GeneralNames.java:1.1 Wed Nov 10 22:52:25 2004
+++ kaffe/libraries/javalib/gnu/java/security/x509/ext/GeneralNames.java Tue Mar 8 21:06:05 2005
@@ -1,4 +1,4 @@
-/* GeneralNames.java -- the GeneralNames object.
+/* GeneralNames.java -- the GeneralNames object
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,21 +38,19 @@
package gnu.java.security.x509.ext;
-import java.io.IOException;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.x509.X500DistinguishedName;
+import java.io.IOException;
import java.net.InetAddress;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-
-import gnu.java.security.OID;
-import gnu.java.security.x509.X500DistinguishedName;
-import gnu.java.security.der.DER;
-import gnu.java.security.der.DERReader;
*** Patch too long, truncated ***
More information about the kaffe
mailing list