Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls
In directory sc8-pr-cvs1:/tmp/cvs-serv14297
Modified Files:
TlsCipherSuiteFactory.cs TlsSessionContext.cs
Log Message:
* TlsSessionContext.cs:
- Fixed mac keys clearing for SSL3 protocol.
Index: TlsCipherSuiteFactory.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsCipherSuiteFactory.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TlsCipherSuiteFactory.cs 3 Nov 2003 18:11:54 -0000 1.6
--- TlsCipherSuiteFactory.cs 3 Nov 2003 19:41:34 -0000 1.7
***************
*** 121,126 ****
// Supported ciphers
! scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8);
! scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8);
scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0);
scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0);
--- 121,126 ----
// Supported ciphers
! // scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8);
! // scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8);
scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0);
scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0);
Index: TlsSessionContext.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSessionContext.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TlsSessionContext.cs 3 Nov 2003 18:11:54 -0000 1.11
--- TlsSessionContext.cs 3 Nov 2003 19:41:34 -0000 1.12
***************
*** 272,281 ****
this.clientWriteKey = null;
this.clientWriteIV = null;
! this.clientWriteMAC = null;
!
// Clear server keys
this.serverWriteKey = null;
this.serverWriteIV = null;
! this.serverWriteMAC = null;
}
--- 272,286 ----
this.clientWriteKey = null;
this.clientWriteIV = null;
!
// Clear server keys
this.serverWriteKey = null;
this.serverWriteIV = null;
!
! // Clear MAC keys if protocol is different than Ssl3
! if (this.protocol != TlsProtocol.Ssl3)
! {
! this.clientWriteMAC = null;
! this.serverWriteMAC = null;
! }
}
|
