[kaffe] CVS kaffe (dalibor): Resynced with Jessie

Kaffe CVS cvs-commits at kaffe.org
Sun Jan 11 13:49:02 PST 2004


PatchSet 4323 
Date: 2004/01/11 21:31:06
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with Jessie

2004-01-11  Dalibor Topic <robilad at kaffe.org>

        Resynced with Jessie 0.9.6.

        * javax/net/ssl/HandshakeCompletedEvent.java,
        javax/net/ssl/HttpsURLConnection.java,
        javax/net/ssl/KeyManagerFactory.java,
        javax/net/ssl/SSLPermission.java,
        javax/net/ssl/SSLServerSocket.java,
        javax/net/ssl/SSLServerSocket.java.in,
        javax/net/ssl/SSLServerSocketFactory.java,
        javax/net/ssl/SSLSessionBindingEvent.java,
        javax/net/ssl/SSLSocket.java,
        javax/net/ssl/SSLSocketFactory.java,
        javax/net/ssl/TrustManagerFactory.java,
        javax/security/cert/Certificate.java,
        javax/security/cert/CertificateEncodingException.java,
        javax/security/cert/CertificateException.java,
        javax/security/cert/CertificateExpiredException.java,
        javax/security/cert/CertificateNotYetValidException.java,
        javax/security/cert/CertificateParsingException.java,
        javax/security/cert/X509Certificate.java:
        Resynced with upstream.

Members: 
	ChangeLog:1.1910->1.1911 
	libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.1->1.2 
	libraries/javalib/javax/net/ssl/HttpsURLConnection.java:1.2->1.3 
	libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.2->1.3 
	libraries/javalib/javax/net/ssl/SSLPermission.java:1.2->1.3 
	libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.2->1.3 
	libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.2->1.3 
	libraries/javalib/javax/net/ssl/SSLSessionBindingEvent.java:1.2->1.3 
	libraries/javalib/javax/net/ssl/SSLSocket.java:1.2->1.3 
	libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.2->1.3 
	libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.2->1.3 
	libraries/javalib/javax/security/cert/Certificate.java:1.2->1.3 
	libraries/javalib/javax/security/cert/CertificateEncodingException.java:1.2->1.3 
	libraries/javalib/javax/security/cert/CertificateException.java:1.2->1.3 
	libraries/javalib/javax/security/cert/CertificateExpiredException.java:1.2->1.3 
	libraries/javalib/javax/security/cert/CertificateNotYetValidException.java:1.2->1.3 
	libraries/javalib/javax/security/cert/CertificateParsingException.java:1.2->1.3 
	libraries/javalib/javax/security/cert/X509Certificate.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1910 kaffe/ChangeLog:1.1911
--- kaffe/ChangeLog:1.1910	Sun Jan 11 20:17:18 2004
+++ kaffe/ChangeLog	Sun Jan 11 21:31:06 2004
@@ -1,5 +1,29 @@
 2004-01-11  Dalibor Topic <robilad at kaffe.org>
 
+        Resynced with Jessie 0.9.6.
+
+	* javax/net/ssl/HandshakeCompletedEvent.java,
+        javax/net/ssl/HttpsURLConnection.java,
+        javax/net/ssl/KeyManagerFactory.java,
+        javax/net/ssl/SSLPermission.java,
+        javax/net/ssl/SSLServerSocket.java,
+        javax/net/ssl/SSLServerSocket.java.in,
+        javax/net/ssl/SSLServerSocketFactory.java,
+        javax/net/ssl/SSLSessionBindingEvent.java,
+        javax/net/ssl/SSLSocket.java,
+        javax/net/ssl/SSLSocketFactory.java,
+        javax/net/ssl/TrustManagerFactory.java,
+	javax/security/cert/Certificate.java,
+        javax/security/cert/CertificateEncodingException.java,
+        javax/security/cert/CertificateException.java,
+        javax/security/cert/CertificateExpiredException.java,
+        javax/security/cert/CertificateNotYetValidException.java,
+        javax/security/cert/CertificateParsingException.java,
+        javax/security/cert/X509Certificate.java:
+	Resynced with upstream.
+
+2004-01-11  Dalibor Topic <robilad at kaffe.org>
+
         Resynced with GNU Classpath.
 
 	2004-01-10  Michael Koch  <konqueror at gmx.de>
Index: kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java
diff -u kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.1 kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.2
--- kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.1	Fri Aug 15 16:59:15 2003
+++ kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java	Sun Jan 11 21:31:07 2004
@@ -40,6 +40,7 @@
 package javax.net.ssl;
 
 import java.security.cert.Certificate;
+import javax.security.cert.X509Certificate;
 
 /**
  * An event raised by a SSLSocket and passed to the {@link
@@ -55,8 +56,11 @@
   // Fields.
   // -------------------------------------------------------------------
 
+  /** Serialization constant. */
+  private static final long serialVersionUID = 7914963744257769778L;
+
   /** The session. */
-  private final SSLSession session;
+  private transient final SSLSession session;
 
   // Constructor.
   // -------------------------------------------------------------------
@@ -87,7 +91,9 @@
    */
   public String getCipherSuite()
   {
-    return session.getCipherSuite();
+    if (session != null)
+      return session.getCipherSuite();
+    return null;
   }
 
   /**
@@ -97,7 +103,9 @@
    */
   public Certificate[] getLocalCertificates()
   {
-    return session.getLocalCertificates();
+    if (session != null)
+      return session.getLocalCertificates();
+    return null;
   }
 
   /**
@@ -109,7 +117,16 @@
    */
   public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException
   {
-    return session.getPeerCertificates();
+    if (session != null)
+      return session.getPeerCertificates();
+    return null;
+  }
+
+  public X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException
+  {
+    if (session != null)
+      return session.getPeerCertificateChain();
+    return null;
   }
 
   /**
Index: kaffe/libraries/javalib/javax/net/ssl/HttpsURLConnection.java
diff -u kaffe/libraries/javalib/javax/net/ssl/HttpsURLConnection.java:1.2 kaffe/libraries/javalib/javax/net/ssl/HttpsURLConnection.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/HttpsURLConnection.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/HttpsURLConnection.java	Sun Jan 11 21:31:07 2004
@@ -253,5 +253,5 @@
    * @throws SSLPeerUnverifiedException If the peer could not be
    *   verified.
    */
-  public abstract Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException;
+  public abstract Certificate[] getServerCertificates() throws SSLPeerUnverifiedException;
 }
Index: kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.2 kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java	Sun Jan 11 21:31:07 2004
@@ -41,11 +41,13 @@
 
 import java.lang.reflect.InvocationTargetException;
 
+import java.security.AccessController;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.PrivilegedAction;
 import java.security.Provider;
 import java.security.Security;
 import java.security.UnrecoverableKeyException;
@@ -65,6 +67,9 @@
   /** The service name for key manager factories. */
   private static final String KEY_MANAGER_FACTORY = "KeyManagerFactory";
 
+  /** The system default trust manager algorithm. */
+  private static final String DEFAULT_ALGORITHM = "JessieX509";
+
   /** The underlying engine. */
   private final KeyManagerFactorySpi kmfSpi;
 
@@ -98,17 +103,32 @@
   /**
    * Get the default algorithm name. This value may be specified at
    * run-time via the security property
-   * "ssl.KeyManagerFactory.algorithm.algorithm". If this property is
-   * not specified, this method returns "GNUX509".
+   * "ssl.KeyManagerFactory.algorithm". If this property is
+   * not specified, this method returns "JessieX509".
    *
    * @return The default key manager factory algorithm's name.
    */
   public static final String getDefaultAlgorithm()
   {
-    String name = Security.getProperty("ssl.KeyManagerFactory.algorithm.algorithm");
-    if (name == null)
-      name = "GNUX509";
-    return name;
+    String alg = null;
+    try
+      {
+        alg = (String) AccessController.doPrivileged(
+          new PrivilegedAction()
+          {
+            public Object run()
+            {
+              return Security.getProperty("ssl.KeyManagerFactory.algorithm");
+            }
+          }
+        );
+      }
+    catch (SecurityException se)
+      {
+      }
+    if (alg == null)
+      alg = DEFAULT_ALGORITHM;
+    return alg;
   }
 
   /**
Index: kaffe/libraries/javalib/javax/net/ssl/SSLPermission.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLPermission.java:1.2 kaffe/libraries/javalib/javax/net/ssl/SSLPermission.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/SSLPermission.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/SSLPermission.java	Sun Jan 11 21:31:07 2004
@@ -47,6 +47,14 @@
 public class SSLPermission extends BasicPermission
 {
 
+  // Constant.
+  // -------------------------------------------------------------------------
+
+  private static final long serialVersionUID = -3456898025505876775L;
+
+  // Constructors.
+  // -------------------------------------------------------------------------
+
   public SSLPermission(String name)
   {
     super(name);
Index: kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.2 kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java	Sun Jan 11 21:31:07 2004
@@ -123,7 +123,7 @@
    *
    * @param enabled The new enabled value.
    */
-  public abstract void setEnabledSessionCreation(boolean enabled);
+  public abstract void setEnableSessionCreation(boolean enabled);
 
   /**
    * Returns whether or not this server socket will require clients to
Index: kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.2 kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java	Sun Jan 11 21:31:07 2004
@@ -102,31 +102,50 @@
     catch (Exception e)
       {
       }
-    try
+    if (context == null)
       {
-        if (context == null)
+        KeyManager[] km = null;
+        TrustManager[] tm = null;
+
+        // 1. Determine which algorithms to use for the key and trust
+        // manager factories.
+        String kmAlg = KeyManagerFactory.getDefaultAlgorithm();
+        String tmAlg = TrustManagerFactory.getDefaultAlgorithm();
+        // 2. Try to initialize the factories with default parameters.
+        try
           {
-            String kmAlg = Security.getProperty("ssl.keyManagerFactory.algorithm");
-            if (kmAlg == null)
-              {
-                kmAlg = "JessieX509";
-              }
-            String tmAlg = Security.getProperty("ssl.trustManagerFactory.algorithm");
-            if (tmAlg == null)
-              {
-                tmAlg = "JessieX509";
-              }
             KeyManagerFactory kmf = KeyManagerFactory.getInstance(kmAlg);
-            TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmAlg);
             kmf.init(null, null);
+            km = kmf.getKeyManagers();
+          }
+        catch (Exception ex)
+          {
+          }
+        try
+          {
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmAlg);
             tmf.init((KeyStore) null);
+            tm = tmf.getTrustManagers();
+          }
+        catch (Exception ex)
+          {
+          }
+
+        // 3. Create and initialize a context.
+        try
+          {
             context = SSLContext.getInstance("SSLv3");
-            context.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+            context.init(km, tm, null);
           }
-        synchronized (context)
+        catch (Exception ex)
           {
-            return context.getServerSocketFactory();
+            throw new RuntimeException("error instantiating default server socket factory: "
+                                       + ex.toString());
           }
+      }
+    try
+      {
+        return context.getServerSocketFactory();
       }
     catch (Exception e)
       {
Index: kaffe/libraries/javalib/javax/net/ssl/SSLSessionBindingEvent.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLSessionBindingEvent.java:1.2 kaffe/libraries/javalib/javax/net/ssl/SSLSessionBindingEvent.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/SSLSessionBindingEvent.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/SSLSessionBindingEvent.java	Sun Jan 11 21:31:07 2004
@@ -51,6 +51,8 @@
   // Fields.
   // -------------------------------------------------------------------
 
+  private static final long serialVersionUID = 3989172637106345L;
+
   private final String name;
 
   // Constructor.
Index: kaffe/libraries/javalib/javax/net/ssl/SSLSocket.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLSocket.java:1.2 kaffe/libraries/javalib/javax/net/ssl/SSLSocket.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/SSLSocket.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/SSLSocket.java	Sun Jan 11 21:31:07 2004
@@ -53,7 +53,7 @@
   // Constructors.
   // -------------------------------------------------------------------------
 
-  protected SSLSocket() throws IOException
+  protected SSLSocket()
   {
     super();
   }
Index: kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.2 kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java	Sun Jan 11 21:31:07 2004
@@ -110,49 +110,11 @@
       {
         KeyManager[] km = null;
         TrustManager[] tm = null;
-        String kmAlg = null;
-        String tmAlg = null;
 
         // 1. Determine which algorithms to use for the key and trust
         // manager factories.
-        try
-          {
-            kmAlg = (String) AccessController.doPrivileged(
-              new PrivilegedAction()
-              {
-                public Object run()
-                {
-                  return Security.getProperty("ssl.keyManagerFactory.algorithm");
-                }
-              }
-            );
-          }
-        catch (SecurityException se)
-          {
-          }
-        if (kmAlg == null)
-          {
-            kmAlg = "JessieX509";
-          }
-        try
-          {
-            tmAlg = (String) AccessController.doPrivileged(
-              new PrivilegedAction()
-              {
-                public Object run()
-                {
-                  return Security.getProperty("ssl.trustManagerFactory.algorithm");
-                }
-              }
-            );
-          }
-        catch (SecurityException se)
-          {
-          }
-        if (tmAlg == null)
-          {
-            tmAlg = "JessieX509";
-          }
+        String kmAlg = KeyManagerFactory.getDefaultAlgorithm();
+        String tmAlg = TrustManagerFactory.getDefaultAlgorithm();
 
         // 2. Try to initialize the factories with default parameters.
         try
@@ -188,10 +150,7 @@
       }
     try
       {
-        synchronized (context)
-          {
-            return context.getSocketFactory();
-          }
+        return context.getSocketFactory();
       }
     catch (Exception e)
       {
Index: kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.2 kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.2	Tue Dec  2 20:11:17 2003
+++ kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java	Sun Jan 11 21:31:07 2004
@@ -41,11 +41,13 @@
 
 import java.lang.reflect.InvocationTargetException;
 
+import java.security.AccessController;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.PrivilegedAction;
 import java.security.Provider;
 import java.security.Security;
 
@@ -61,6 +63,9 @@
   /** The service name for trust manager factories. */
   private static final String TRUST_MANAGER_FACTORY = "TrustManagerFactory";
 
+  /** The system default trust manager algorithm. */
+  private static final String DEFAULT_ALGORITHM = "JessieX509";
+
   /** The underlying engine class. */
   private final TrustManagerFactorySpi tmfSpi;
 
@@ -178,6 +183,38 @@
       {
         throw new NoSuchAlgorithmException(algorithm);
       }
+  }
+
+  /**
+   * Returns the default algorithm for trust manager factories. The value
+   * returned is either the value of the security property
+   * "ssl.TrustManagerFactory.algorithm" if it is set, or the value "JessieX509"
+   * if not.
+   *
+   * @return The default algorithm name.
+   * @see Security.getProperty(java.lang.String)
+   */
+  public static final String getDefaultAlgorithm()
+  {
+    String alg = null;
+    try
+      {
+        alg = (String) AccessController.doPrivileged(
+          new PrivilegedAction()
+          {
+            public Object run()
+            {
+              return Security.getProperty("ssl.TrustManagerFactory.algorithm");
+            }
+          }
+        );
+      }
+    catch (SecurityException se)
+      {
+      }
+    if (alg == null)
+      alg = DEFAULT_ALGORITHM;
+    return alg;
   }
 
   // Instance methods.
Index: kaffe/libraries/javalib/javax/security/cert/Certificate.java
diff -u kaffe/libraries/javalib/javax/security/cert/Certificate.java:1.2 kaffe/libraries/javalib/javax/security/cert/Certificate.java:1.3
--- kaffe/libraries/javalib/javax/security/cert/Certificate.java:1.2	Tue Dec  2 20:11:18 2003
+++ kaffe/libraries/javalib/javax/security/cert/Certificate.java	Sun Jan 11 21:31:08 2004
@@ -55,7 +55,8 @@
  * java.security.cert.Certificate} class. It should not be used in new
  * applications.</b></p>
  *
- * @deprecated Use java.security.cert.Certificate instead.
+ * <p><strong>NOTE:</strong> This package is deprecated. Use
+ * java.security.cert.Certificate instead.
  */
 public abstract class Certificate
 {
Index: kaffe/libraries/javalib/javax/security/cert/CertificateEncodingException.java
diff -u kaffe/libraries/javalib/javax/security/cert/CertificateEncodingException.java:1.2 kaffe/libraries/javalib/javax/security/cert/CertificateEncodingException.java:1.3
--- kaffe/libraries/javalib/javax/security/cert/CertificateEncodingException.java:1.2	Tue Dec  2 20:11:18 2003
+++ kaffe/libraries/javalib/javax/security/cert/CertificateEncodingException.java	Sun Jan 11 21:31:08 2004
@@ -46,7 +46,8 @@
  * java.security.cert.CertificateEncodingException} class. It should not be used
  * in new  applications.</b></p>
  *
- * @deprecated Use java.security.cert.CertificateEncodingException instead.
+ * <p><strong>NOTE:</strong></p> This class is deprecated. Use
+ * java.security.cert.CertificateEncodingException instead.</p>
  */
 public class CertificateEncodingException extends CertificateException
 {
Index: kaffe/libraries/javalib/javax/security/cert/CertificateException.java
diff -u kaffe/libraries/javalib/javax/security/cert/CertificateException.java:1.2 kaffe/libraries/javalib/javax/security/cert/CertificateException.java:1.3
--- kaffe/libraries/javalib/javax/security/cert/CertificateException.java:1.2	Tue Dec  2 20:11:18 2003
+++ kaffe/libraries/javalib/javax/security/cert/CertificateException.java	Sun Jan 11 21:31:08 2004
@@ -46,7 +46,8 @@
  * java.security.cert.CertificateException} class. It should not be used in new
  * applications.</b></p>
  *
- * @deprecated Use java.security.cert.CertificateException instead.
+ * <p><strong>NOTE:</strong> This class is deprecated. Use
+ * java.security.cert.CertificateException instead.</p>
  */
 public class CertificateException extends Exception
 {
Index: kaffe/libraries/javalib/javax/security/cert/CertificateExpiredException.java
diff -u kaffe/libraries/javalib/javax/security/cert/CertificateExpiredException.java:1.2 kaffe/libraries/javalib/javax/security/cert/CertificateExpiredException.java:1.3
--- kaffe/libraries/javalib/javax/security/cert/CertificateExpiredException.java:1.2	Tue Dec  2 20:11:18 2003
+++ kaffe/libraries/javalib/javax/security/cert/CertificateExpiredException.java	Sun Jan 11 21:31:08 2004
@@ -46,7 +46,8 @@
  * java.security.cert.CertificateExpiredException} class. It should not be used
  * in new applications.</b></p>
  *
- * @deprecated Use java.security.cert.CertificateExpiredException instead.
+ * <p><strong>NOTE:</strong> This class is deprecated.
+ * Use java.security.cert.CertificateExpiredException instead.
  */
 public class CertificateExpiredException extends CertificateException
 {
Index: kaffe/libraries/javalib/javax/security/cert/CertificateNotYetValidException.java
diff -u kaffe/libraries/javalib/javax/security/cert/CertificateNotYetValidException.java:1.2 kaffe/libraries/javalib/javax/security/cert/CertificateNotYetValidException.java:1.3
--- kaffe/libraries/javalib/javax/security/cert/CertificateNotYetValidException.java:1.2	Tue Dec  2 20:11:18 2003
+++ kaffe/libraries/javalib/javax/security/cert/CertificateNotYetValidException.java	Sun Jan 11 21:31:08 2004
@@ -46,7 +46,8 @@
  * java.security.cert.CertificateNotYetValidException} class. It should not be
  * used in new applications.</b></p>
  *
- * @deprecated Use java.security.cert.CertificateNotYetValidException instead.
+ * <p><strong>NOTE:</strong> This class is deprecated.
+ * Use java.security.cert.CertificateNotYetValidException instead.</p>
  */
 public class CertificateNotYetValidException extends CertificateException
 {
Index: kaffe/libraries/javalib/javax/security/cert/CertificateParsingException.java
diff -u kaffe/libraries/javalib/javax/security/cert/CertificateParsingException.java:1.2 kaffe/libraries/javalib/javax/security/cert/CertificateParsingException.java:1.3
--- kaffe/libraries/javalib/javax/security/cert/CertificateParsingException.java:1.2	Tue Dec  2 20:11:18 2003
+++ kaffe/libraries/javalib/javax/security/cert/CertificateParsingException.java	Sun Jan 11 21:31:08 2004
@@ -45,7 +45,8 @@
  * <p><b>This class is deprecated. It should not be used in new
  * applications.</b></p>
  *
- * @deprecated Use the java.security.cert package instead.
+ * <p><strong>NOTE:</strong> This class is deprecated.
+ * Use the java.security.cert package instead.</p>
  */
 public class CertificateParsingException extends CertificateException
 {
Index: kaffe/libraries/javalib/javax/security/cert/X509Certificate.java
diff -u kaffe/libraries/javalib/javax/security/cert/X509Certificate.java:1.2 kaffe/libraries/javalib/javax/security/cert/X509Certificate.java:1.3
--- kaffe/libraries/javalib/javax/security/cert/X509Certificate.java:1.2	Tue Dec  2 20:11:18 2003
+++ kaffe/libraries/javalib/javax/security/cert/X509Certificate.java	Sun Jan 11 21:31:08 2004
@@ -58,7 +58,8 @@
  * java.security.cert.X509Certificate} class. It should not be used in new
  * applications.</b></p>
  *
- * @deprecated Use java.security.cert.X509Certificate instead.
+ * <p><strong>NOTE:</strong> This class is deprecated.
+ * Use java.security.cert.X509Certificate instead.</p>
  */
 public abstract class X509Certificate extends Certificate
 {




More information about the kaffe mailing list