Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.121
diff -u -r1.121 configure.ac
--- configure.ac	3 Dec 2005 16:59:42 -0000	1.121
+++ configure.ac	26 Dec 2005 00:10:02 -0000
@@ -178,6 +178,19 @@
               [COMPILE_QT_PEER=no])
 AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes)
 
+dnl -----------------------------------------------------------
+dnl Crypto and SSL support (enabled by default)
+dnl -----------------------------------------------------------
+
+AC_ARG_ENABLE([crypto],
+	      [AS_HELP_STRING(--disable-crypto,compile crypto and SSL support [default=yes])],
+	      [case "${enableval}" in
+	        yes) COMPILE_CRYPTO=yes ;;
+		no) COMPILE_CRYPTO=no ;;
+		*) COMPILE_CRYPTO=yes ;;
+	      esac],
+	      [COMPILE_CRYPTO=yes])
+AM_CONDITIONAL(COMPILE_CRYPTO, test "x${COMPILE_CRYPTO}" = xyes)
 
 dnl -----------------------------------------------------------
 dnl Sets the native libraries installation dir
Index: gnu/classpath/debug/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/classpath/debug/Component.java,v
retrieving revision 1.2
diff -u -r1.2 Component.java
--- gnu/classpath/debug/Component.java	8 Aug 2005 07:18:42 -0000	1.2
+++ gnu/classpath/debug/Component.java	26 Dec 2005 00:10:02 -0000
@@ -89,9 +89,9 @@
   public static final Component SSL_HANDSHAKE = new Component ("SSL HANDSHAKE", 0);
 
   /**
-   * Traces the application messages during SSL communications.
+   * Traces the record layer during SSL communications.
    */
-  public static final Component SSL_APPLICATION = new Component ("SSL APPLICATION", 1);
+  public static final Component SSL_RECORD_LAYER = new Component ("SSL RECORD", 1);
 
   /**
    * Trace details about the SSL key exchange.
@@ -141,15 +141,15 @@
   {
     try
       {
-	Field f = Component.class.getField (name.toUpperCase ());
-	if (!Modifier.isStatic (f.getModifiers ())
-	    || Component.class.isAssignableFrom (f.getClass ()))
-	  return null;
-	return (Component) f.get (null);
+        Field f = Component.class.getField (name.toUpperCase ());
+        if (!Modifier.isStatic (f.getModifiers ())
+            || Component.class.isAssignableFrom (f.getClass ()))
+          return null;
+        return (Component) f.get (null);
       }
     catch (Throwable _)
       {
-	return null;
+        return null;
       }
   }
 
@@ -162,4 +162,4 @@
   {
     return endIndex;
   }
-}
\ No newline at end of file
+}
Index: gnu/java/security/provider/Gnu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/Gnu.java,v
retrieving revision 1.10
diff -u -r1.10 Gnu.java
--- gnu/java/security/provider/Gnu.java	25 Sep 2005 21:40:42 -0000	1.10
+++ gnu/java/security/provider/Gnu.java	26 Dec 2005 00:10:02 -0000
@@ -166,14 +166,6 @@
         // CertStore
         put("CertStore.Collection", CollectionCertStoreImpl.class.getName());
 
-        // KeyAgreement
-        put("KeyAgreement.DiffieHellman", gnu.javax.crypto.DiffieHellmanImpl.class.getName());
-        put("Alg.Alias.KeyAgreement.DH", "DiffieHellman");
-
-        // Cipher
-        put("Cipher.RSAES-PKCS1-v1_5", gnu.javax.crypto.RSACipherImpl.class.getName());
-        put("Alg.Alias.Cipher.RSA", "RSAES-PKCS1-v1_5");
-
         return null;
       }
     });
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.107
diff -u -r1.107 Makefile.am
--- lib/Makefile.am	18 Dec 2005 18:43:26 -0000	1.107
+++ lib/Makefile.am	26 Dec 2005 00:10:02 -0000
@@ -99,8 +99,13 @@
 	mkdir -p $(top_builddir)/java/util
 	$(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/java/util/LocaleData.java
 
+if COMPILE_CRYPTO
 genclasses: gen-classlist.sh standard.omit $(top_builddir)/java/util/LocaleData.java gen-xpath-parser
 	top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL) ./gen-classlist.sh standard
+else
+genclasses: gen-classlist.sh no-crypto.omit $(top_builddir)/java/util/LocaleData.java gen-xpath-parser
+	top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL) ./gen-classlist.sh no-crypto
+endif
 
 # Only rebuild parsers when explicitly asked to.
 if REGEN_PARSERS
@@ -135,7 +140,7 @@
 	touch compile-classes
 endif
 
-EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
+EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh no-crypto.omit
 CLEANFILES = compile-classes resources classes \
 	glibj.zip classes.1 \
 	$(top_builddir)/java/util/LocaleData.java \
Index: resource/java/security/classpath.security
===================================================================
RCS file: /cvsroot/classpath/classpath/resource/java/security/classpath.security,v
retrieving revision 1.3
diff -u -r1.3 classpath.security
--- resource/java/security/classpath.security	2 Jul 2005 20:33:02 -0000	1.3
+++ resource/java/security/classpath.security	26 Dec 2005 00:10:02 -0000
@@ -1,5 +1,5 @@
 # classpath.security
-#    Copyright (C) 2002 Free Software Foundation, Inc.
+#    Copyright (C) 2002,2005 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Classpath.
 # 
@@ -37,3 +37,7 @@
 
 
 security.provider.1=gnu.java.security.provider.Gnu
+security.provider.2=gnu.javax.crypto.jce.GnuCrypto
+security.provider.3=gnu.javax.crypto.jce.GnuSecurity
+security.provider.4=gnu.javax.crypto.jce.GnuSasl
+security.provider.5=gnu.javax.net.ssl.provider.Jessie