PatchSet 4816
Date: 2004/06/03 19:42:16
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with Jessie
2004-06-03 Dalibor Topic <[EMAIL PROTECTED]>
libraries/javalib/javax/net/ServerSocketFactory.java,
libraries/javalib/javax/net/SocketFactory.java,
libraries/javalib/javax/net/VanillaServerSocketFactory.java,
libraries/javalib/javax/net/VanillaSocketFactory.java,
libraries/javalib/javax/net/ssl/Engine.java,
libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java,
libraries/javalib/javax/net/ssl/KeyManagerFactory.java,
libraries/javalib/javax/net/ssl/SSLContext.java,
libraries/javalib/javax/net/ssl/SSLServerSocket.java,
libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java,
libraries/javalib/javax/net/ssl/SSLSession.java,
libraries/javalib/javax/net/ssl/SSLSocketFactory.java,
libraries/javalib/javax/net/ssl/TrustManagerFactory.java,
libraries/javalib/javax/net/ssl/X509KeyManager.java,
libraries/javalib/javax/security/cert/Certificate.java,
libraries/javalib/javax/security/cert/X509CertBridge.java,
libraries/javalib/javax/security/cert/X509Certificate.java:
Resynced with Jessie CVS.
Members:
ChangeLog:1.2384->1.2385
libraries/javalib/javax/net/ServerSocketFactory.java:1.3->1.4
libraries/javalib/javax/net/SocketFactory.java:1.2->1.3
libraries/javalib/javax/net/VanillaServerSocketFactory.java:1.2->1.3
libraries/javalib/javax/net/VanillaSocketFactory.java:1.2->1.3
libraries/javalib/javax/net/ssl/Engine.java:1.2->1.3
libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.3->1.4
libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.4->1.5
libraries/javalib/javax/net/ssl/SSLContext.java:1.3->1.4
libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.4->1.5
libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.4->1.5
libraries/javalib/javax/net/ssl/SSLSession.java:1.3->1.4
libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.4->1.5
libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.4->1.5
libraries/javalib/javax/net/ssl/X509KeyManager.java:1.3->1.4
libraries/javalib/javax/security/cert/Certificate.java:1.4->1.5
libraries/javalib/javax/security/cert/X509CertBridge.java:1.3->1.4
libraries/javalib/javax/security/cert/X509Certificate.java:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2384 kaffe/ChangeLog:1.2385
--- kaffe/ChangeLog:1.2384 Thu Jun 3 18:56:03 2004
+++ kaffe/ChangeLog Thu Jun 3 19:42:16 2004
@@ -1,3 +1,24 @@
+2004-06-03 Dalibor Topic <[EMAIL PROTECTED]>
+
+ libraries/javalib/javax/net/ServerSocketFactory.java,
+ libraries/javalib/javax/net/SocketFactory.java,
+ libraries/javalib/javax/net/VanillaServerSocketFactory.java,
+ libraries/javalib/javax/net/VanillaSocketFactory.java,
+ libraries/javalib/javax/net/ssl/Engine.java,
+ libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java,
+ libraries/javalib/javax/net/ssl/KeyManagerFactory.java,
+ libraries/javalib/javax/net/ssl/SSLContext.java,
+ libraries/javalib/javax/net/ssl/SSLServerSocket.java,
+ libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java,
+ libraries/javalib/javax/net/ssl/SSLSession.java,
+ libraries/javalib/javax/net/ssl/SSLSocketFactory.java,
+ libraries/javalib/javax/net/ssl/TrustManagerFactory.java,
+ libraries/javalib/javax/net/ssl/X509KeyManager.java,
+ libraries/javalib/javax/security/cert/Certificate.java,
+ libraries/javalib/javax/security/cert/X509CertBridge.java,
+ libraries/javalib/javax/security/cert/X509Certificate.java:
+ Resynced with Jessie CVS.
+
2004-06-03 Guilhem Lavaux <[EMAIL PROTECTED]>
* libraries/javalib/java/text/RuleBasedCollator.java:
Index: kaffe/libraries/javalib/javax/net/ServerSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/ServerSocketFactory.java:1.3
kaffe/libraries/javalib/javax/net/ServerSocketFactory.java:1.4
--- kaffe/libraries/javalib/javax/net/ServerSocketFactory.java:1.3 Mon Mar 22
11:25:18 2004
+++ kaffe/libraries/javalib/javax/net/ServerSocketFactory.java Thu Jun 3 19:42:19
2004
@@ -40,8 +40,10 @@
package javax.net;
import java.io.IOException;
+
import java.net.InetAddress;
import java.net.ServerSocket;
+
import java.security.Security;
/**
Index: kaffe/libraries/javalib/javax/net/SocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/SocketFactory.java:1.2
kaffe/libraries/javalib/javax/net/SocketFactory.java:1.3
--- kaffe/libraries/javalib/javax/net/SocketFactory.java:1.2 Mon Mar 22 11:25:18
2004
+++ kaffe/libraries/javalib/javax/net/SocketFactory.java Thu Jun 3 19:42:19
2004
@@ -40,9 +40,11 @@
package javax.net;
import java.io.IOException;
+
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
+
import java.security.Security;
/**
Index: kaffe/libraries/javalib/javax/net/VanillaServerSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/VanillaServerSocketFactory.java:1.2
kaffe/libraries/javalib/javax/net/VanillaServerSocketFactory.java:1.3
--- kaffe/libraries/javalib/javax/net/VanillaServerSocketFactory.java:1.2 Mon
Mar 22 11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/VanillaServerSocketFactory.java Thu Jun 3
19:42:19 2004
@@ -40,6 +40,7 @@
package javax.net;
import java.io.IOException;
+
import java.net.InetAddress;
import java.net.ServerSocket;
Index: kaffe/libraries/javalib/javax/net/VanillaSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/VanillaSocketFactory.java:1.2
kaffe/libraries/javalib/javax/net/VanillaSocketFactory.java:1.3
--- kaffe/libraries/javalib/javax/net/VanillaSocketFactory.java:1.2 Mon Mar 22
11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/VanillaSocketFactory.java Thu Jun 3 19:42:19
2004
@@ -40,6 +40,7 @@
package javax.net;
import java.io.IOException;
+
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
Index: kaffe/libraries/javalib/javax/net/ssl/Engine.java
diff -u kaffe/libraries/javalib/javax/net/ssl/Engine.java:1.2
kaffe/libraries/javalib/javax/net/ssl/Engine.java:1.3
--- kaffe/libraries/javalib/javax/net/ssl/Engine.java:1.2 Mon Mar 22 11:25:19
2004
+++ kaffe/libraries/javalib/javax/net/ssl/Engine.java Thu Jun 3 19:42:19 2004
@@ -40,6 +40,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+
import java.security.NoSuchAlgorithmException;
import java.security.Provider;
Index: kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java
diff -u kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.3
kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.4
--- kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.3 Mon
Mar 22 11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java Thu Jun 3
19:42:19 2004
@@ -40,7 +40,6 @@
package javax.net.ssl;
import java.security.cert.Certificate;
-
import javax.security.cert.X509Certificate;
/**
Index: kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.4
kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.5
--- kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.4 Mon Mar 22
11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java Thu Jun 3
19:42:19 2004
@@ -40,6 +40,7 @@
package javax.net.ssl;
import java.lang.reflect.InvocationTargetException;
+
import java.security.AccessController;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
Index: kaffe/libraries/javalib/javax/net/ssl/SSLContext.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLContext.java:1.3
kaffe/libraries/javalib/javax/net/ssl/SSLContext.java:1.4
--- kaffe/libraries/javalib/javax/net/ssl/SSLContext.java:1.3 Mon Mar 22 11:25:19
2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLContext.java Thu Jun 3 19:42:19
2004
@@ -40,6 +40,7 @@
package javax.net.ssl;
import java.lang.reflect.InvocationTargetException;
+
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
Index: kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.4
kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.5
--- kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.4 Mon Mar 22
11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java Thu Jun 3 19:42:19
2004
@@ -41,6 +41,7 @@
package javax.net.ssl;
import java.io.IOException;
+
import java.net.InetAddress;
import java.net.ServerSocket;
Index: kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.4
kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.5
--- kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.4 Mon
Mar 22 11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java Thu Jun 3
19:42:19 2004
@@ -41,7 +41,6 @@
import java.security.KeyStore;
import java.security.Security;
-
import javax.net.ServerSocketFactory;
/**
Index: kaffe/libraries/javalib/javax/net/ssl/SSLSession.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLSession.java:1.3
kaffe/libraries/javalib/javax/net/ssl/SSLSession.java:1.4
--- kaffe/libraries/javalib/javax/net/ssl/SSLSession.java:1.3 Mon Mar 22 11:25:19
2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLSession.java Thu Jun 3 19:42:19
2004
@@ -40,7 +40,6 @@
package javax.net.ssl;
import java.security.cert.Certificate;
-
import javax.security.cert.X509Certificate;
/**
Index: kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.4
kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.5
--- kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.4 Mon Mar 22
11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java Thu Jun 3 19:42:19
2004
@@ -41,9 +41,10 @@
import java.io.IOException;
import java.net.Socket;
+import java.security.AccessController;
import java.security.KeyStore;
+import java.security.PrivilegedAction;
import java.security.Security;
-
import javax.net.SocketFactory;
/**
Index: kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.4
kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.5
--- kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.4 Mon Mar 22
11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java Thu Jun 3
19:42:19 2004
@@ -40,6 +40,7 @@
package javax.net.ssl;
import java.lang.reflect.InvocationTargetException;
+
import java.security.AccessController;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
Index: kaffe/libraries/javalib/javax/net/ssl/X509KeyManager.java
diff -u kaffe/libraries/javalib/javax/net/ssl/X509KeyManager.java:1.3
kaffe/libraries/javalib/javax/net/ssl/X509KeyManager.java:1.4
--- kaffe/libraries/javalib/javax/net/ssl/X509KeyManager.java:1.3 Mon Mar 22
11:25:19 2004
+++ kaffe/libraries/javalib/javax/net/ssl/X509KeyManager.java Thu Jun 3 19:42:19
2004
@@ -40,6 +40,7 @@
package javax.net.ssl;
import java.net.Socket;
+
import java.security.Principal;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
Index: kaffe/libraries/javalib/javax/security/cert/Certificate.java
diff -u kaffe/libraries/javalib/javax/security/cert/Certificate.java:1.4
kaffe/libraries/javalib/javax/security/cert/Certificate.java:1.5
--- kaffe/libraries/javalib/javax/security/cert/Certificate.java:1.4 Mon Mar 22
11:25:22 2004
+++ kaffe/libraries/javalib/javax/security/cert/Certificate.java Thu Jun 3
19:42:20 2004
@@ -44,6 +44,7 @@
import java.security.NoSuchProviderException;
import java.security.PublicKey;
import java.security.SignatureException;
+
import java.util.Arrays;
import java.util.zip.Adler32;
Index: kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java
diff -u kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java:1.3
kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java:1.4
--- kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java:1.3 Mon Mar 22
11:25:22 2004
+++ kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java Thu Jun 3
19:42:20 2004
@@ -40,12 +40,14 @@
package javax.security.cert;
import java.math.BigInteger;
+
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
-import java.security.Principal;
import java.security.PublicKey;
+import java.security.Principal;
import java.security.SignatureException;
+
import java.util.Date;
/**
Index: kaffe/libraries/javalib/javax/security/cert/X509Certificate.java
diff -u kaffe/libraries/javalib/javax/security/cert/X509Certificate.java:1.4
kaffe/libraries/javalib/javax/security/cert/X509Certificate.java:1.5
--- kaffe/libraries/javalib/javax/security/cert/X509Certificate.java:1.4 Mon
Mar 22 11:25:22 2004
+++ kaffe/libraries/javalib/javax/security/cert/X509Certificate.java Thu Jun 3
19:42:20 2004
@@ -41,9 +41,14 @@
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;
+
import java.util.Date;
/**
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
