Update of /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake
In directory sc8-pr-cvs1:/tmp/cvs-serv20455
Modified Files:
TlsClientFinished.cs TlsClientKeyExchange.cs
TlsServerFinished.cs
Log Message:
Moved Key generation methods to TlsSessionState class
Index: TlsClientFinished.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsClientFinished.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TlsClientFinished.cs 20 Aug 2003 11:51:31 -0000 1.1
--- TlsClientFinished.cs 25 Aug 2003 16:41:02 -0000 1.2
***************
*** 54,58 ****
hashes.Write(Session.HandshakeHashes.GetSHAHash());
! Write(Session.PRF(Session.State.MasterSecret, "client finished", hashes.GetBytes(), 12));
hashes.Reset();
--- 54,58 ----
hashes.Write(Session.HandshakeHashes.GetSHAHash());
! Write(Session.State.PRF(Session.State.MasterSecret, "client finished", hashes.GetBytes(), 12));
hashes.Reset();
Index: TlsClientKeyExchange.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsClientKeyExchange.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TlsClientKeyExchange.cs 20 Aug 2003 15:45:05 -0000 1.2
--- TlsClientKeyExchange.cs 25 Aug 2003 16:41:02 -0000 1.3
***************
*** 41,45 ****
{
// Compute pre master secret
! byte[] preMasterSecret = Session.CreatePremasterSecret();
// Create a new RSA key
--- 41,45 ----
{
// Compute pre master secret
! byte[] preMasterSecret = Session.State.CreatePremasterSecret();
// Create a new RSA key
***************
*** 61,68 ****
// Create master secret
! Session.CreateMasterSecret(preMasterSecret);
// Create keys
! Session.CreateKeys();
// Clear resources
--- 61,68 ----
// Create master secret
! Session.State.CreateMasterSecret(preMasterSecret);
// Create keys
! Session.State.CreateKeys();
// Clear resources
Index: TlsServerFinished.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsServerFinished.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TlsServerFinished.cs 20 Aug 2003 11:51:31 -0000 1.1
--- TlsServerFinished.cs 25 Aug 2003 16:41:02 -0000 1.2
***************
*** 56,60 ****
hashes.Write(Session.HandshakeHashes.GetSHAHash());
! byte[] clientPRF = Session.PRF(Session.State.MasterSecret, "server finished", hashes.GetBytes(), 12);
hashes.Reset();
--- 56,60 ----
hashes.Write(Session.HandshakeHashes.GetSHAHash());
! byte[] clientPRF = Session.State.PRF(Session.State.MasterSecret, "server finished", hashes.GetBytes(), 12);
hashes.Reset();
|
