Author: spouliot
Date: 2005-04-10 14:31:17 -0400 (Sun, 10 Apr 2005)
New Revision: 42764

Modified:
   
branches/mono-1-0/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog
   
branches/mono-1-0/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs
Log:
2005-04-10  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * HttpsClientStream.cs: Added a TrustFailure property so a 
        WebException can now report TrustFailure correctly. Fix bug 74286.



Modified: 
branches/mono-1-0/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog
===================================================================
--- 
branches/mono-1-0/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog  
    2005-04-10 18:26:53 UTC (rev 42763)
+++ 
branches/mono-1-0/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog  
    2005-04-10 18:31:17 UTC (rev 42764)
@@ -1,3 +1,8 @@
+2005-04-10  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * HttpsClientStream.cs: Added a TrustFailure property so a 
+       WebException can now report TrustFailure correctly. Fix bug 74286.
+
 2005-04-07  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * SslCipherSuite.cs: Fix calculation (sequence number) for the server

Modified: 
branches/mono-1-0/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs
===================================================================
--- 
branches/mono-1-0/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs
   2005-04-10 18:26:53 UTC (rev 42763)
+++ 
branches/mono-1-0/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs
   2005-04-10 18:31:17 UTC (rev 42764)
@@ -5,10 +5,8 @@
 // Author:
 //      Sebastien Pouliot  <[EMAIL PROTECTED]>
 //
-// (C) 2004 Novell (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc. (http://www.novell.com)
 //
-
-//
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -41,8 +39,8 @@
         internal class HttpsClientStream : SslClientStream {
 
                 private HttpWebRequest _request;
+               private int _status;
 
-
                 public HttpsClientStream (Stream stream, 
X509CertificateCollection clientCertificates,
                                        HttpWebRequest request, byte [] buffer)
                         : base (stream, request.RequestUri.Host, false, 
SecurityProtocolType.Default, clientCertificates)
@@ -50,6 +48,7 @@
                         // this constructor permit access to the WebRequest to 
call
                         // ICertificatePolicy.CheckValidationResult
                         _request = request;
+                       _status = 0;
                        if (buffer != null)
                                InputBuffer.Write (buffer, 0, buffer.Length);
 #if !NET_1_0
@@ -58,19 +57,29 @@
 #endif
                 }
 
+               public bool TrustFailure {
+                       get { 
+                               switch (_status) {
+                               case -2146762486: // CERT_E_CHAINING            
0x800B010A
+                               case -2146762487: // CERT_E_UNTRUSTEDROOT       
0x800B0109
+                                       return true;
+                               default:
+                                       return false;
+                               }
+                       }
+               }
+
                 internal override bool RaiseServerCertificateValidation 
(X509Certificate certificate, int[] certificateErrors)
                 {
-                        bool failed = (certificateErrors.Length > 0);
-                        if (ServicePointManager.CertificatePolicy != null) {
-                                ServicePoint sp = _request.ServicePoint;
+                       bool failed = (certificateErrors.Length > 0);
+                       // only one problem can be reported by this interface
+                       _status = ((failed) ? certificateErrors [0] : 0);
 
-                                // only one problem can be reported by this 
interface
-                                int problem = ((failed) ? certificateErrors 
[0] : 0);
-
-                                return 
ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, 
_request, problem);
-                        }
-                        return failed;
-                }
+                       if (ServicePointManager.CertificatePolicy != null) {
+                               ServicePoint sp = _request.ServicePoint;
+                               return 
ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, 
_request, _status);
+                       }
+                       return failed;
+               }
         }
 }
-

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to