[pgsqlclient-checkins] pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls CipherSuite.cs,1.11,1.12 ServerContext.cs,1.2,1.3 TlsServerSettings.cs,1.2,1.3

[Carlos Guzm?n ?l. <car...@us...>]

Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25083

Modified Files:
	CipherSuite.cs ServerContext.cs TlsServerSettings.cs 
Log Message:

2004-03-19 Carlos Guzmán Álvarez <car...@te...>

	* Mono.Security.Protocol.Tls.Handshake.Server/TlsClientHello.cs:

		- Fixed cipher suite selection.

	* Mono.Security.Protocol.Tls/TlsServerSettings.cs:
	* Mono.Security.Protocol.Tls.Handshake.Client/TlsClientKeyExchange.cs:
	* Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs:
	* Mono.Security.Protocol.Tls.Handshake.Client/TlsServerKeyExchange.cs:

		- Added new CertificateRSA property.

		- Added new UpdateCErtfificateRSA method.

	* Mono.Security.Protocol.Tls/CipherSuite.cs:

		- Removed CertificateRSA() method.	

Index: TlsServerSettings.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls/TlsServerSettings.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TlsServerSettings.cs	3 Mar 2004 16:22:36 -0000	1.2
--- TlsServerSettings.cs	19 Mar 2004 22:44:47 -0000	1.3
***************
*** 26,29 ****
--- 26,30 ----
  using System.Security.Cryptography;
  
+ using Mono.Security.Cryptography;
  using Mono.Security.X509;
  using Mono.Security.Protocol.Tls.Handshake;
***************
*** 36,45 ****
  
  		private X509CertificateCollection	certificates;
  		private bool						serverKeyExchange;
  		private bool						certificateRequest;
  		private	ClientCertificateType[]		certificateTypes;
- 		private string[]					distinguisedNames;
- 		private RSAParameters				rsaParameters;
- 		private byte[]						signedParams;		
  
  		#endregion
--- 37,47 ----
  
  		private X509CertificateCollection	certificates;
+ 		private RSA							certificateRSA;
+ 		private RSAParameters				rsaParameters;
+ 		private byte[]						signedParams;
+ 		private string[]					distinguisedNames;
  		private bool						serverKeyExchange;
  		private bool						certificateRequest;
  		private	ClientCertificateType[]		certificateTypes;
  
  		#endregion
***************
*** 51,56 ****
--- 53,69 ----
  			get { return this.serverKeyExchange; }
  			set { this.serverKeyExchange = value; }
+ 		}		
+ 
+ 		public X509CertificateCollection Certificates
+ 		{
+ 			get { return this.certificates; }
+ 			set { this.certificates = value; }
  		}
  
+ 		public RSA CertificateRSA
+ 		{
+ 			get { return this.certificateRSA; }
+ 		}
+ 		
  		public RSAParameters RsaParameters
  		{
***************
*** 83,98 ****
  		}
  		
! 		public X509CertificateCollection Certificates
  		{
- 			get { return this.certificates; }
- 			set { this.certificates = value; }
  		}
  
  		#endregion
  
! 		#region Constructors
  
! 		public TlsServerSettings()
  		{
  		}
  
--- 96,126 ----
  		}
  		
! 		#endregion
! 
! 		#region Constructors
! 
! 		public TlsServerSettings()
  		{
  		}
  
  		#endregion
  
! 		#region Methods
  
! 		public void UpdateCertificateRSA()
  		{
+ 			if (this.certificates == null ||
+ 				this.certificates.Count == 0)
+ 			{
+ 				this.certificateRSA = null;
+ 			}
+ 			else
+ 			{
+ 				this.certificateRSA = new RSAManaged(
+ 					this.certificates[0].RSA.KeySize);
+ 
+ 				this.certificateRSA.ImportParameters(
+ 					this.certificates[0].RSA.ExportParameters(false));
+ 			}
  		}
  

Index: ServerContext.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls/ServerContext.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ServerContext.cs	5 Mar 2004 23:21:55 -0000	1.2
--- ServerContext.cs	19 Mar 2004 22:44:47 -0000	1.3
***************
*** 72,75 ****
--- 72,77 ----
  			this.ServerSettings.Certificates = new MonoX509.X509CertificateCollection();
  			this.ServerSettings.Certificates.Add(cert);
+ 
+ 			this.ServerSettings.UpdateCertificateRSA();
  		}
  

Index: CipherSuite.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls/CipherSuite.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CipherSuite.cs	18 Mar 2004 14:06:31 -0000	1.11
--- CipherSuite.cs	19 Mar 2004 22:44:47 -0000	1.12
***************
*** 243,256 ****
  		}
  
- 		public RSA CertificateRSA()
- 		{
- 			RSA rsaCert = this.Context.ServerSettings.Certificates[0].RSA;
- 			RSA rsa		= new RSAManaged(rsaCert.KeySize);
- 
- 			rsa.ImportParameters(rsaCert.ExportParameters(false));
- 
- 			return rsa;
- 		}
- 
  		public void UpdateClientCipherIV(byte[] iv)
  		{
--- 243,246 ----