2006-08-14 Casey Marshall <csm@gnu.org>

	Merge in ssl-nio-branch work. See `ChangeLog-ssl-nio' for a record
	of changes made on this branch.
	Files modified:
	* gnu/classpath/debug/Component.java
	* gnu/classpath/debug/SystemLogger.java
	* gnu/java/security/action/GetPropertyAction.java
	* gnu/java/security/action/GetSecurityPropertyAction.java
	* gnu/javax/crypto/RSACipherImpl.java
	* gnu/javax/net/ssl/PrivateCredentials.java
	* gnu/javax/net/ssl/provider/Alert.java
	* gnu/javax/net/ssl/provider/AlertException.java
	* gnu/javax/net/ssl/provider/Certificate.java
	* gnu/javax/net/ssl/provider/CertificateRequest.java
	* gnu/javax/net/ssl/provider/CertificateType.java
	* gnu/javax/net/ssl/provider/CertificateVerify.java
	* gnu/javax/net/ssl/provider/CipherSuite.java
	* gnu/javax/net/ssl/provider/ClientHello.java
	* gnu/javax/net/ssl/provider/ClientKeyExchange.java
	* gnu/javax/net/ssl/provider/CompressionMethod.java
	* gnu/javax/net/ssl/provider/Constructed.java
	* gnu/javax/net/ssl/provider/ContentType.java
	* gnu/javax/net/ssl/provider/DiffieHellman.java
	* gnu/javax/net/ssl/provider/Extension.java
	* gnu/javax/net/ssl/provider/Finished.java
	* gnu/javax/net/ssl/provider/Handshake.java
	* gnu/javax/net/ssl/provider/Jessie.java
	* gnu/javax/net/ssl/provider/ProtocolVersion.java
	* gnu/javax/net/ssl/provider/Random.java
	* gnu/javax/net/ssl/provider/ServerHello.java
	* gnu/javax/net/ssl/provider/ServerKeyExchange.java
	* gnu/javax/net/ssl/provider/Signature.java
	* gnu/javax/net/ssl/provider/Util.java
	* gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
	* gnu/javax/net/ssl/provider/X509TrustManagerFactory.java
	* java/security/MessageDigest.java
	* java/security/MessageDigestSpi.java
	* java/security/Signature.java
	* java/security/SignatureSpi.java
	* javax/crypto/Mac.java
	* javax/crypto/MacSpi.java
	* javax/net/ssl/HandshakeCompletedEvent.java
	* javax/net/ssl/HttpsURLConnection.java
	* javax/net/ssl/SSLContext.java
	* javax/net/ssl/SSLContextSpi.java
	* javax/net/ssl/SSLSession.java
	Files added:
	* gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java
	* gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java
	* gnu/javax/net/ssl/provider/SimpleSessionContext.java
	* gnu/javax/net/ssl/provider/ServerRSAParams.java
	* gnu/javax/net/ssl/provider/SSLContextImpl.java
	* gnu/javax/net/ssl/provider/ServerDHParams.java
	* gnu/javax/net/ssl/provider/ClientHelloBuilder.java
	* gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java
	* gnu/javax/net/ssl/provider/SignatureAlgorithm.java
	* gnu/javax/net/ssl/provider/CipherSuiteList.java
	* gnu/javax/net/ssl/provider/ServerNameList.java
	* gnu/javax/net/ssl/provider/SSLServerSocketImpl.java
	* gnu/javax/net/ssl/provider/CompressionMethodList.java
	* gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.java
	* gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java
	* gnu/javax/net/ssl/provider/TrustedAuthorities.java
	* gnu/javax/net/ssl/provider/CertificateStatusRequest.java
	* gnu/javax/net/ssl/provider/ServerHelloDone.java
	* gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
	* gnu/javax/net/ssl/provider/SSLSocketImpl.java
	* gnu/javax/net/ssl/provider/ServerHelloBuilder.java
	* gnu/javax/net/ssl/provider/Record.java
	* gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java
	* gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
	* gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java
	* gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.java
	* gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java
	* gnu/javax/net/ssl/provider/CertificateBuilder.java
	* gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
	* gnu/javax/net/ssl/provider/CertificateStatusType.java
	* gnu/javax/net/ssl/provider/ExtensionList.java
	* gnu/javax/net/ssl/provider/ClientCertificateTypeList.java
	* gnu/javax/net/ssl/provider/ClientPSKParameters.java
	* gnu/javax/net/ssl/provider/X500PrincipalList.java
	* gnu/javax/net/ssl/provider/ServerHandshake.java
	* gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.java
	* gnu/javax/net/ssl/provider/SessionImpl.java
	* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
	* gnu/javax/net/ssl/provider/ServerPSKParameters.java
	* gnu/javax/net/ssl/provider/TruncatedHMAC.java
	* gnu/javax/net/ssl/provider/MaxFragmentLength.java
	* gnu/javax/net/ssl/provider/HelloRequest.java
	* gnu/javax/net/ssl/provider/ServerKeyExchangeParams.java
	* gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
	* gnu/javax/net/ssl/provider/CipherAlgorithm.java
	* gnu/javax/net/ssl/provider/ClientHandshake.java
	* gnu/javax/net/ssl/provider/ExchangeKeys.java
	* gnu/javax/net/ssl/provider/CertificateURL.java
	* gnu/javax/net/ssl/provider/EmptyExchangeKeys.java
	* gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
	* gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java
	* gnu/javax/net/ssl/provider/Builder.java
	* gnu/javax/net/ssl/provider/Debug.java
	* gnu/javax/net/ssl/provider/SSLEngineImpl.java
	* gnu/javax/net/ssl/provider/MacAlgorithm.java
	* gnu/javax/net/ssl/provider/DelegatedTask.java
	* gnu/javax/net/ssl/provider/InputSecurityParameters.java
	* gnu/javax/net/ssl/provider/ClientHelloV2.java
	* gnu/javax/net/ssl/provider/OutputSecurityParameters.java
	* gnu/javax/net/ssl/provider/AbstractHandshake.java
	* javax/net/ssl/SSLEngine.java
	* javax/net/ssl/CertPathTrustManagerParameters.java
	* javax/net/ssl/KeyStoreBuilderParameters.java
	* javax/net/ssl/X509ExtendedKeyManager.java
	* javax/net/ssl/SSLEngineResult.java
	* gnu/javax/net/ssl/PreSharedKeyManager.java
	* gnu/javax/net/ssl/Session.java
	* gnu/javax/net/ssl/PreSharedKeyManagerParameters.java
	* gnu/javax/net/ssl/SSLCipherSuite.java
	* gnu/javax/net/ssl/AbstractSessionContext.java
	* gnu/javax/net/ssl/SessionStoreException.java
	* gnu/javax/net/ssl/SSLRecordHandler.java
	* gnu/javax/net/ssl/SSLProtocolVersion.java
	* gnu/javax/crypto/key/GnuPBEKey.java
	* gnu/java/security/util/ByteBufferOutputStream.java
	* gnu/java/security/Requires.java
	* gnu/javax/security/auth/callback/CertificateCallback.java
	Files removed:
	* gnu/javax/net/ssl/provider/Context.java
	* gnu/javax/net/ssl/provider/DigestInputStream.java
	* gnu/javax/net/ssl/provider/DigestOutputStream.java
	* gnu/javax/net/ssl/provider/Enumerated.java
	* gnu/javax/net/ssl/provider/Extensions.java
	* gnu/javax/net/ssl/provider/GNUSecurityParameters.java
	* gnu/javax/net/ssl/provider/JCESecurityParameters.java
	* gnu/javax/net/ssl/provider/JDBCSessionContext.java
	* gnu/javax/net/ssl/provider/JessieDHPrivateKey.java
	* gnu/javax/net/ssl/provider/JessieDHPublicKey.java
	* gnu/javax/net/ssl/provider/JessieRSAPrivateKey.java
	* gnu/javax/net/ssl/provider/JessieRSAPublicKey.java
	* gnu/javax/net/ssl/provider/KeyPool.java
	* gnu/javax/net/ssl/provider/OverflowException.java
	* gnu/javax/net/ssl/provider/RecordInput.java
	* gnu/javax/net/ssl/provider/RecordInputStream.java
	* gnu/javax/net/ssl/provider/RecordOutputStream.java
	* gnu/javax/net/ssl/provider/RecordingInputStream.java
	* gnu/javax/net/ssl/provider/SSLRSASignature.java
	* gnu/javax/net/ssl/provider/SSLServerSocket.java
	* gnu/javax/net/ssl/provider/SSLServerSocketFactory.java
	* gnu/javax/net/ssl/provider/SSLSocket.java
	* gnu/javax/net/ssl/provider/SSLSocketFactory.java
	* gnu/javax/net/ssl/provider/SSLSocketInputStream.java
	* gnu/javax/net/ssl/provider/SSLSocketOutputStream.java
	* gnu/javax/net/ssl/provider/SecurityParameters.java
	* gnu/javax/net/ssl/provider/Session.java
	* gnu/javax/net/ssl/provider/SessionContext.java
	* gnu/javax/net/ssl/provider/SynchronizedRandom.java
	* gnu/javax/net/ssl/provider/XMLSessionContext.java

1 files changed, 158 insertions, 0 deletions

diff --git a/gnu/javax/net/ssl/provider/ClientHelloV2.java b/gnu/javax/net/ssl/provider/ClientHelloV2.java
new file mode 100644
index 000000000..a514d9ad3
--- /dev/null
+++ b/gnu/javax/net/ssl/provider/ClientHelloV2.java
@@ -0,0 +1,158 @@
+/* ClientHelloV2.java -- a hello message from SSLv2.
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+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 of the License, or (at
+your option) any later version.
+
+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; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+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.  */
+
+
+package gnu.javax.net.ssl.provider;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A client hello message from SSLv2. In SSLv3 and later, clients can
+ * send an SSLv2 client hello message, but set the protocol version
+ * for a later version.
+ *
+ * <p>The format of a version 2 client hello is:
+ *
+ * <pre>
+    char MSG-CLIENT-HELLO          // equals 1
+    char CLIENT-VERSION-MSB
+    char CLIENT-VERSION-LSB
+    char CIPHER-SPECS-LENGTH-MSB
+    char CIPHER-SPECS-LENGTH-LSB
+    char SESSION-ID-LENGTH-MSB
+    char SESSION-ID-LENGTH-LSB
+    char CHALLENGE-LENGTH-MSB
+    char CHALLENGE-LENGTH-LSB
+    char CIPHER-SPECS-DATA[(MSB&lt;&lt;8)|LSB]
+    char SESSION-ID-DATA[(MSB&lt;&lt;8)|LSB]
+    char CHALLENGE-DATA[(MSB&lt;&lt;8)|LSB]</pre>
+ */
+class ClientHelloV2 implements Constructed
+{
+  private final ByteBuffer buffer;
+
+  ClientHelloV2 (final ByteBuffer buffer)
+  {
+    this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
+  }
+
+  public int length ()
+  {
+    return 9 + cipherSpecsLength () + sessionIdLength () + challengeLength ();
+  }
+
+  ProtocolVersion version ()
+  {
+    return ProtocolVersion.getInstance (buffer.getShort (1));
+  }
+
+  int cipherSpecsLength ()
+  {
+    return buffer.getShort (3) & 0xFFFF;
+  }
+
+  int sessionIdLength ()
+  {
+    return buffer.getShort (5) & 0xFFFF;
+  }
+
+  int challengeLength ()
+  {
+    return buffer.getShort (7) & 0xFFFF;
+  }
+
+  public List<CipherSuite> cipherSpecs ()
+  {
+    int n = cipherSpecsLength ();
+    List<CipherSuite> l = new ArrayList<CipherSuite>(n / 3);
+    ByteBuffer b = (ByteBuffer) buffer.duplicate ().position (9);
+    for (int i = 0; i < n; i += 3)
+      {
+        if (b.get () == 0)
+          l.add (CipherSuite.forValue(b.getShort()).resolve());
+        else
+          b.getShort ();
+      }
+    return l;
+  }
+
+  byte[] sessionId ()
+  {
+    byte[] id = new byte[sessionIdLength ()];
+    ((ByteBuffer) buffer.duplicate ().position (9 + cipherSpecsLength ())).get (id);
+    return id;
+  }
+
+  byte[] challenge ()
+  {
+    byte[] challenge = new byte[challengeLength ()];
+    ((ByteBuffer) buffer.duplicate ().position (9 + cipherSpecsLength () + sessionIdLength ())).get (challenge);
+    return challenge;
+  }
+
+  public String toString ()
+  {
+    return toString (null);
+  }
+
+  public String toString (String prefix)
+  {
+    StringWriter str = new StringWriter ();
+    PrintWriter out = new PrintWriter (str);
+
+    if (prefix != null) out.print (prefix);
+    out.println ("CLIENT-HELLO-MSG");
+    if (prefix != null) out.print (prefix);
+    out.print ("  version: ");
+    out.println (version ());
+    if (prefix != null) out.print (prefix);
+    out.println ("  suites: ");
+    out.println (cipherSpecs ());
+    if (prefix != null) out.print (prefix);
+    out.print ("  sessionId: ");
+    out.println (Util.toHexString (sessionId (), ':'));
+    if (prefix != null) out.print (prefix);
+    out.print ("  challenge: ");
+    out.println (Util.toHexString (challenge (), ':'));
+    return str.toString ();
+  }
+}
\ No newline at end of file