[pgsqlclient-checkins] pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake TlsClientFinished.cs

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake
In directory sc8-pr-cvs1:/tmp/cvs-serv15165

Modified Files:
	TlsClientFinished.cs TlsClientHello.cs TlsClientKeyExchange.cs 
	TlsServerCertificate.cs TlsServerCertificateRequest.cs 
	TlsServerFinished.cs TlsServerHello.cs TlsServerKeyExchange.cs 
Log Message:
Added changes to read, write stuff of the TLS library:
* Removed TlsReader and TlsWriter
* Added TlsSocket and TlsNetworkStream
* Renamed TlsSessionState as TlsSessionContext

Index: TlsClientFinished.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsClientFinished.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TlsClientFinished.cs	1 Sep 2003 10:21:20 -0000	1.3
--- TlsClientFinished.cs	16 Sep 2003 12:29:08 -0000	1.4
***************
*** 54,58 ****
  			hashes.Write(Session.HandshakeHashes.GetSHAHash());
  
! 			Write(Session.State.PRF(Session.State.MasterSecret, "client finished", hashes.GetBytes(), 12));
  
  			hashes.Reset();
--- 54,58 ----
  			hashes.Write(Session.HandshakeHashes.GetSHAHash());
  
! 			Write(Session.Context.PRF(Session.Context.MasterSecret, "client finished", hashes.GetBytes(), 12));
  
  			hashes.Reset();

Index: TlsClientHello.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsClientHello.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TlsClientHello.cs	1 Sep 2003 10:21:20 -0000	1.2
--- TlsClientHello.cs	16 Sep 2003 12:29:08 -0000	1.3
***************
*** 47,51 ****
  			base.UpdateSession();
  
! 			Session.State.ClientRandom = random;
  
  			random = null;
--- 47,51 ----
  			base.UpdateSession();
  
! 			Session.Context.ClientRandom = random;
  
  			random = null;

Index: TlsClientKeyExchange.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsClientKeyExchange.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TlsClientKeyExchange.cs	14 Sep 2003 10:49:36 -0000	1.6
--- TlsClientKeyExchange.cs	16 Sep 2003 12:29:08 -0000	1.7
***************
*** 41,55 ****
  		{
  			// Compute pre master secret
! 			byte[] preMasterSecret = Session.State.CreatePremasterSecret();
  
  			// Create a new RSA key
  			RSACryptoServiceProvider rsa = null;
! 			if (Session.State.ServerSettings.ServerKeyExchange)
  			{
! 				rsa = Session.State.Cipher.CreateRSA(Session.State.ServerSettings.RsaParameters);
  			}
  			else
  			{
! 				rsa = Session.State.Cipher.CreateRSA(Session.State.ServerSettings.ServerCertificates[0]);
  			}			
  			
--- 41,55 ----
  		{
  			// Compute pre master secret
! 			byte[] preMasterSecret = Session.Context.CreatePremasterSecret();
  
  			// Create a new RSA key
  			RSACryptoServiceProvider rsa = null;
! 			if (Session.Context.ServerSettings.ServerKeyExchange)
  			{
! 				rsa = Session.Context.Cipher.CreateRSA(Session.Context.ServerSettings.RsaParameters);
  			}
  			else
  			{
! 				rsa = Session.Context.Cipher.CreateRSA(Session.Context.ServerSettings.ServerCertificates[0]);
  			}			
  			
***************
*** 63,70 ****
  
  			// Create master secret
! 			Session.State.CreateMasterSecret(preMasterSecret);
  
  			// Create keys
! 			Session.State.CreateKeys();
  
  			// Clear resources
--- 63,70 ----
  
  			// Create master secret
! 			Session.Context.CreateMasterSecret(preMasterSecret);
  
  			// Create keys
! 			Session.Context.CreateKeys();
  
  			// Clear resources

Index: TlsServerCertificate.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsServerCertificate.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TlsServerCertificate.cs	13 Sep 2003 11:10:45 -0000	1.5
--- TlsServerCertificate.cs	16 Sep 2003 12:29:08 -0000	1.6
***************
*** 56,60 ****
  		{
  			base.UpdateSession();
! 			this.Session.State.ServerSettings.ServerCertificates = certificates;
  		}
  
--- 56,60 ----
  		{
  			base.UpdateSession();
! 			this.Session.Context.ServerSettings.ServerCertificates = certificates;
  		}
  

Index: TlsServerCertificateRequest.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsServerCertificateRequest.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TlsServerCertificateRequest.cs	12 Sep 2003 23:49:35 -0000	1.3
--- TlsServerCertificateRequest.cs	16 Sep 2003 12:29:08 -0000	1.4
***************
*** 38,42 ****
  			base.UpdateSession();
  
! 			Session.State.ServerSettings.CertificateRequest = true;
  		}
  
--- 38,42 ----
  			base.UpdateSession();
  
! 			Session.Context.ServerSettings.CertificateRequest = true;
  		}
  

Index: TlsServerFinished.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsServerFinished.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TlsServerFinished.cs	13 Sep 2003 10:23:47 -0000	1.5
--- TlsServerFinished.cs	16 Sep 2003 12:29:08 -0000	1.6
***************
*** 56,60 ****
  			hashes.Write(Session.HandshakeHashes.GetSHAHash());
  
! 			byte[] clientPRF = Session.State.PRF(Session.State.MasterSecret, "server finished", hashes.GetBytes(), 12);
  
  			hashes.Reset();
--- 56,60 ----
  			hashes.Write(Session.HandshakeHashes.GetSHAHash());
  
! 			byte[] clientPRF = Session.Context.PRF(Session.Context.MasterSecret, "server finished", hashes.GetBytes(), 12);
  
  			hashes.Reset();

Index: TlsServerHello.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsServerHello.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TlsServerHello.cs	12 Sep 2003 23:49:35 -0000	1.3
--- TlsServerHello.cs	16 Sep 2003 12:29:08 -0000	1.4
***************
*** 50,57 ****
  
  			Session.SetSessionId(this.sessionId);
! 			Session.State.ServerRandom			= this.random;
! 			Session.State.Cipher				= this.cipherSuite;
! 			Session.State.CompressionMethod		= this.compressionMethod;
! 			Session.State.Cipher.SessionState	= Session.State;
  		}
  
--- 50,57 ----
  
  			Session.SetSessionId(this.sessionId);
! 			Session.Context.ServerRandom			= this.random;
! 			Session.Context.Cipher				= this.cipherSuite;
! 			Session.Context.CompressionMethod		= this.compressionMethod;
! 			Session.Context.Cipher.SessionState	= Session.Context;
  		}
  

Index: TlsServerKeyExchange.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/Handshake/TlsServerKeyExchange.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TlsServerKeyExchange.cs	12 Sep 2003 23:49:35 -0000	1.4
--- TlsServerKeyExchange.cs	16 Sep 2003 12:29:08 -0000	1.5
***************
*** 48,54 ****
  			base.UpdateSession();
  
! 			this.Session.State.ServerSettings.ServerKeyExchange = true;
! 			this.Session.State.ServerSettings.RsaParameters		= this.rsaParams;
! 			this.Session.State.ServerSettings.SignedParams		= this.signedParams;
  		}
  
--- 48,54 ----
  			base.UpdateSession();
  
! 			this.Session.Context.ServerSettings.ServerKeyExchange = true;
! 			this.Session.Context.ServerSettings.RsaParameters		= this.rsaParams;
! 			this.Session.Context.ServerSettings.SignedParams		= this.signedParams;
  		}
  
***************
*** 88,93 ****
  			TlsStreamWriter stream = new TlsStreamWriter();
  
! 			stream.Write(Session.State.ClientRandom);
! 			stream.Write(Session.State.ServerRandom);
  			stream.Write(rsaParams.Modulus.Length);
  			stream.Write(rsaParams.Modulus);
--- 88,93 ----
  			TlsStreamWriter stream = new TlsStreamWriter();
  
! 			stream.Write(Session.Context.ClientRandom);
! 			stream.Write(Session.Context.ServerRandom);
  			stream.Write(rsaParams.Modulus.Length);
  			stream.Write(rsaParams.Modulus);