Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19352
Modified Files:
RecordProtocol.cs TlsCipherSuite.cs
Log Message:
2004-03-09 Carlos Guzman Alvarez <car...@te...>
* Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs:
* Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificateRequest.cs:
* Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs:
* Mono.Security.Protocol.Tls.Handshake.Server/TlsClientCertificateVerify.cs:
* Mono.Security.Protocol.Tls.Handshake.Server/TlsServerCertificateRequest.cs:
* Mono.Security.Protocol.Tls.Handshake.Server/TlsServerFinished.cs:
- Fixed meesage type definition.
* Mono.Security.Protocol.Tls/Ciphersuite.cs:
- Added generation of the Server encryption algorithms.
- Modified encryption/decription methods for work
as client or server as needed.
Index: RecordProtocol.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RecordProtocol.cs 9 Mar 2004 20:00:59 -0000 1.9
--- RecordProtocol.cs 9 Mar 2004 22:05:51 -0000 1.10
***************
*** 351,362 ****
System.Array.Copy(ecr, ecr.Length - iv.Length, iv, 0, iv.Length);
! if (this.Context is ClientContext)
! {
! this.context.Cipher.UpdateClientCipherIV(iv);
! }
! else
! {
! this.context.Cipher.UpdateServerCipherIV(iv);
! }
}
--- 351,355 ----
System.Array.Copy(ecr, ecr.Length - iv.Length, iv, 0, iv.Length);
! this.context.Cipher.UpdateClientCipherIV(iv);
}
***************
*** 377,380 ****
--- 370,375 ----
this.context.Cipher.DecryptRecord(fragment, ref dcrFragment, ref dcrMAC);
+ #warning "This code needs review"
+ /*
// Set new IV
if (this.context.Cipher.CipherMode == CipherMode.CBC)
***************
*** 385,395 ****
if (this.Context is ClientContext)
{
! this.context.Cipher.UpdateServerCipherIV(iv);
}
else
{
! this.context.Cipher.UpdateClientCipherIV(iv);
}
}
// Check MAC code
--- 380,391 ----
if (this.Context is ClientContext)
{
! // this.context.Cipher.UpdateServerCipherIV(iv);
}
else
{
! // this.context.Cipher.UpdateClientCipherIV(iv);
}
}
+ */
// Check MAC code
Index: TlsCipherSuite.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls/TlsCipherSuite.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TlsCipherSuite.cs 9 Mar 2004 20:00:59 -0000 1.5
--- TlsCipherSuite.cs 9 Mar 2004 22:05:51 -0000 1.6
***************
*** 43,48 ****
bool exportable, bool blockMode, byte keyMaterialSize,
byte expandedKeyMaterialSize, short effectiveKeyBytes,
! byte ivSize, byte blockSize) :
! base(code, name, cipherAlgorithmType, hashAlgorithmType,
exchangeAlgorithmType, exportable, blockMode, keyMaterialSize,
expandedKeyMaterialSize, effectiveKeyBytes, ivSize, blockSize)
--- 43,48 ----
bool exportable, bool blockMode, byte keyMaterialSize,
byte expandedKeyMaterialSize, short effectiveKeyBytes,
! byte ivSize, byte blockSize)
! :base(code, name, cipherAlgorithmType, hashAlgorithmType,
exchangeAlgorithmType, exportable, blockMode, keyMaterialSize,
expandedKeyMaterialSize, effectiveKeyBytes, ivSize, blockSize)
|
