13 files changed, 48 insertions, 56 deletions
diff --git a/libjava/javax/security/auth/login/NullConfiguration.java b/libjava/javax/security/auth/login/NullConfiguration.java
index e1c99037f96..011f9a63a4f 100644
--- a/libjava/javax/security/auth/login/NullConfiguration.java
+++ b/libjava/javax/security/auth/login/NullConfiguration.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package javax.security.auth.login;
 
-import javax.security.auth.AuthPermission;
-
 final class NullConfiguration extends Configuration
 {
 
diff --git a/libjava/javax/security/auth/x500/X500Principal.java b/libjava/javax/security/auth/x500/X500Principal.java
index 201a195cbca..2b016a67978 100644
--- a/libjava/javax/security/auth/x500/X500Principal.java
+++ b/libjava/javax/security/auth/x500/X500Principal.java
@@ -39,9 +39,7 @@ exception statement from your version. */
 package javax.security.auth.x500;
 
 import gnu.java.security.OID;
-import gnu.java.security.der.BitString;
 import gnu.java.security.der.DER;
-import gnu.java.security.der.DEREncodingException;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
@@ -59,7 +57,6 @@ import java.io.StringReader;
 import java.security.Principal;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -68,7 +65,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 
 public final class X500Principal implements Principal, Serializable
 {
diff --git a/libjava/javax/security/cert/X509Certificate.java b/libjava/javax/security/cert/X509Certificate.java
index 2bf0b4e94b0..f22573f402b 100644
--- a/libjava/javax/security/cert/X509Certificate.java
+++ b/libjava/javax/security/cert/X509Certificate.java
@@ -40,11 +40,9 @@ package javax.security.cert;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.IOException;
 
 import java.math.BigInteger;
 
-import java.security.NoSuchAlgorithmException;
 import java.security.Principal;
 import java.security.cert.CertificateFactory;
 
diff --git a/libjava/javax/security/sasl/AuthenticationException.java b/libjava/javax/security/sasl/AuthenticationException.java
index 1af2eb30a15..b215f413770 100644
--- a/libjava/javax/security/sasl/AuthenticationException.java
+++ b/libjava/javax/security/sasl/AuthenticationException.java
@@ -1,22 +1,22 @@
-/* AuthenticationException.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+/* AuthenticationException.java --
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
-GNU Classpathis free software; you can redistribute it and/or modify
+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 Classpathis distributed in the hope that it will be useful, but
+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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/AuthorizeCallback.java b/libjava/javax/security/sasl/AuthorizeCallback.java
index 77fe78698ad..d32f03be1d8 100644
--- a/libjava/javax/security/sasl/AuthorizeCallback.java
+++ b/libjava/javax/security/sasl/AuthorizeCallback.java
@@ -1,22 +1,22 @@
-/* AuthorizeCallback.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+/* AuthorizeCallback.java --
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
-GNU Classpathis free software; you can redistribute it and/or modify
+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 Classpathis distributed in the hope that it will be useful, but
+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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/RealmCallback.java b/libjava/javax/security/sasl/RealmCallback.java
index 49bc08ae2ec..26712e020ae 100644
--- a/libjava/javax/security/sasl/RealmCallback.java
+++ b/libjava/javax/security/sasl/RealmCallback.java
@@ -1,5 +1,5 @@
-/* RealmCallback.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+/* RealmCallback.java --
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -15,8 +15,8 @@ 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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/RealmChoiceCallback.java b/libjava/javax/security/sasl/RealmChoiceCallback.java
index 2e00407610f..40203d1f440 100644
--- a/libjava/javax/security/sasl/RealmChoiceCallback.java
+++ b/libjava/javax/security/sasl/RealmChoiceCallback.java
@@ -1,5 +1,5 @@
-/* RealmChoiceCallback.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+/* RealmChoiceCallback.java --
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -15,8 +15,8 @@ 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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/Sasl.java b/libjava/javax/security/sasl/Sasl.java
index 2174692f4b4..b08890f7e4b 100644
--- a/libjava/javax/security/sasl/Sasl.java
+++ b/libjava/javax/security/sasl/Sasl.java
@@ -1,5 +1,5 @@
-/* Sasl.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+/* Sasl.java -- 
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -15,8 +15,8 @@ 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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/SaslClient.java b/libjava/javax/security/sasl/SaslClient.java
index ca95ced2554..ed73b1458cc 100644
--- a/libjava/javax/security/sasl/SaslClient.java
+++ b/libjava/javax/security/sasl/SaslClient.java
@@ -1,22 +1,22 @@
-/* SaslClient.java
-   Copyright (C) 2003, Free Software Foundation, Inc.
+/* SaslClient.java --
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
-GNU Classpathis free software; you can redistribute it and/or modify
+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 Classpathis distributed in the hope that it will be useful, but
+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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/SaslClientFactory.java b/libjava/javax/security/sasl/SaslClientFactory.java
index b67c7a324f0..13d13c8eb12 100644
--- a/libjava/javax/security/sasl/SaslClientFactory.java
+++ b/libjava/javax/security/sasl/SaslClientFactory.java
@@ -15,8 +15,8 @@ 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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/SaslException.java b/libjava/javax/security/sasl/SaslException.java
index 9ff091d6374..5beec25b208 100644
--- a/libjava/javax/security/sasl/SaslException.java
+++ b/libjava/javax/security/sasl/SaslException.java
@@ -15,8 +15,8 @@ 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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/SaslServer.java b/libjava/javax/security/sasl/SaslServer.java
index 3f0d79d4412..6811d11a362 100644
--- a/libjava/javax/security/sasl/SaslServer.java
+++ b/libjava/javax/security/sasl/SaslServer.java
@@ -15,8 +15,8 @@ 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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;
diff --git a/libjava/javax/security/sasl/SaslServerFactory.java b/libjava/javax/security/sasl/SaslServerFactory.java
index b9387bbeed1..65d1bbf37d2 100644
--- a/libjava/javax/security/sasl/SaslServerFactory.java
+++ b/libjava/javax/security/sasl/SaslServerFactory.java
@@ -15,8 +15,8 @@ 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
+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
@@ -33,7 +33,7 @@ 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.  */
+exception statement from your version. */
 
 
 package javax.security.sasl;