Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls
In directory sc8-pr-cvs1:/tmp/cvs-serv1261
Modified Files:
TlsSocket.cs
Log Message:
Added more enhacements to the Handshake protocol
Index: TlsSocket.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSocket.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TlsSocket.cs 13 Oct 2003 19:13:30 -0000 1.2
--- TlsSocket.cs 13 Oct 2003 20:47:11 -0000 1.3
***************
*** 465,475 ****
// Read message data
- /*
byte[] data = new byte[length];
handMsg.Read(data, 0, length);
- */
// Create and process the server message
! message = createServerHandshakeMessage(handshakeType, handMsg);
// Update session
--- 465,473 ----
// Read message data
byte[] data = new byte[length];
handMsg.Read(data, 0, length);
// Create and process the server message
! message = createServerHandshakeMessage(handshakeType, data);
// Update session
***************
*** 596,600 ****
{
// Reset isSecure field
! session.IsSecure = false;
// Send client hello
--- 594,598 ----
{
// Reset isSecure field
! this.session.IsSecure = false;
// Send client hello
***************
*** 618,622 ****
// Now initialize session cipher with the generated keys
! session.Context.Cipher.InitializeCipher();
// Send certificate verify if requested
--- 616,620 ----
// Now initialize session cipher with the generated keys
! this.session.Context.Cipher.InitializeCipher();
// Send certificate verify if requested
***************
*** 639,646 ****
// Clear Key Info
! session.Context.ClearKeyInfo();
// Set isSecure
! session.IsSecure = true;
}
--- 637,644 ----
// Clear Key Info
! this.session.Context.ClearKeyInfo();
// Set isSecure
! this.session.IsSecure = true;
}
***************
*** 669,673 ****
}
! private TlsHandshakeMessage createServerHandshakeMessage(TlsHandshakeType type, TlsStreamReader handMsg)
{
switch (type)
--- 667,671 ----
}
! private TlsHandshakeMessage createServerHandshakeMessage(TlsHandshakeType type, byte[] buffer)
{
switch (type)
***************
*** 678,697 ****
case TlsHandshakeType.ServerHello:
! return new TlsServerHello(session, handMsg);
case TlsHandshakeType.Certificate:
! return new TlsServerCertificate(session, handMsg);
case TlsHandshakeType.ServerKeyExchange:
! return new TlsServerKeyExchange(session, handMsg);
case TlsHandshakeType.CertificateRequest:
! return new TlsServerCertificateRequest(session, handMsg);
case TlsHandshakeType.ServerHelloDone:
! return new TlsServerHelloDone(session, handMsg);
case TlsHandshakeType.Finished:
! return new TlsServerFinished(session, handMsg);
default:
--- 676,695 ----
case TlsHandshakeType.ServerHello:
! return new TlsServerHello(session, buffer);
case TlsHandshakeType.Certificate:
! return new TlsServerCertificate(session, buffer);
case TlsHandshakeType.ServerKeyExchange:
! return new TlsServerKeyExchange(session, buffer);
case TlsHandshakeType.CertificateRequest:
! return new TlsServerCertificateRequest(session, buffer);
case TlsHandshakeType.ServerHelloDone:
! return new TlsServerHelloDone(session, buffer);
case TlsHandshakeType.Finished:
! return new TlsServerFinished(session, buffer);
default:
|
