[pgsqlclient-checkins] pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client TlsServerCertificate.cs,1.10,1.11

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

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

Modified Files:
	TlsServerCertificate.cs 
Log Message:
Sync Mono.Security stuff wit Mono Beta 1 sources

Index: TlsServerCertificate.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security/Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TlsServerCertificate.cs	21 Apr 2004 12:54:53 -0000	1.10
--- TlsServerCertificate.cs	9 May 2004 12:05:48 -0000	1.11
***************
*** 122,136 ****
  				return true;
  
! 			KeyUsage ku = KeyUsage.none;
  			switch (context.Cipher.ExchangeAlgorithmType) 
  			{
  				case ExchangeAlgorithmType.RsaSign:
! 					ku = KeyUsage.digitalSignature;
  					break;
  				case ExchangeAlgorithmType.RsaKeyX:
! 					ku = KeyUsage.keyEncipherment;
  					break;
  				case ExchangeAlgorithmType.DiffieHellman:
! 					ku = KeyUsage.keyAgreement;
  					break;
  				case ExchangeAlgorithmType.Fortezza:
--- 122,136 ----
  				return true;
  
! 			KeyUsages ku = KeyUsages.none;
  			switch (context.Cipher.ExchangeAlgorithmType) 
  			{
  				case ExchangeAlgorithmType.RsaSign:
! 					ku = KeyUsages.digitalSignature;
  					break;
  				case ExchangeAlgorithmType.RsaKeyX:
! 					ku = KeyUsages.keyEncipherment;
  					break;
  				case ExchangeAlgorithmType.DiffieHellman:
! 					ku = KeyUsages.keyAgreement;
  					break;
  				case ExchangeAlgorithmType.Fortezza:
***************
*** 172,176 ****
  			{
  				NetscapeCertTypeExtension ct = new NetscapeCertTypeExtension (xtn);
! 				return ct.Support (NetscapeCertTypeExtension.CertType.SslServer);
  			}
  
--- 172,176 ----
  			{
  				NetscapeCertTypeExtension ct = new NetscapeCertTypeExtension (xtn);
! 				return ct.Support (NetscapeCertTypeExtension.CertTypes.SslServer);
  			}
  
***************
*** 223,227 ****
  			chain.Remove (leaf);
  			X509Chain verify = new X509Chain (chain);
! 			if (!verify.Build (leaf)) 
  			{
  				switch (verify.Status) 
--- 223,239 ----
  			chain.Remove (leaf);
  			X509Chain verify = new X509Chain (chain);
! 
! 			bool result = false;
! 
! 			try
! 			{
! 				result = !verify.Build (leaf);
! 			}
! 			catch (Exception)
! 			{
! 				result = false;
! 			}
! 
! 			if (!result) 
  			{
  				switch (verify.Status)