simplify code for Moonlight profile

diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog
index e4e81a4864608720565965ddb631e866ccfea905..e80407398f27650edb95dacea21f6134dc2b87d1 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-23  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * ClientSessionCache.cs: Do not let the ValidityInterval be 
+       controlled by an environment variable for Moonlight
+       * HttpsClientStream.cs: Simplify code for Moonlight profile
+
 2010-05-10  Sebastien Pouliot  <sebastien@ximian.com>
 
        * CipherSuite.cs:

diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ClientSessionCache.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ClientSessionCache.cs
index 749a51edea4a3094ec58e8dd19eaafac2da4eb8a..912299c1995b2a9dcef16eb796b74e807db8860c 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ClientSessionCache.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ClientSessionCache.cs
@@ -47,6 +47,9 @@ namespace Mono.Security.Protocol.Tls {
 
                static ClientSessionInfo ()
                {
+#if MOONLIGHT
+                       ValidityInterval = DefaultValidityInterval;
+#else
                        string user_cache_timeout = Environment.GetEnvironmentVariable ("MONO_TLS_SESSION_CACHE_TIMEOUT");
                        if (user_cache_timeout == null) {
                                ValidityInterval = DefaultValidityInterval;
@@ -58,6 +61,7 @@ namespace Mono.Security.Protocol.Tls {
                                        ValidityInterval = DefaultValidityInterval;
                                }
                        }
+#endif
                }
 
                public ClientSessionInfo (string hostname, byte[] id)

diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs
index 5a614874e5b8db98af9ef216fd8ef8c9947391f6..ffecc7218c08764110494f84f3f9a4c7b761fae9 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs
@@ -55,10 +55,10 @@ namespace Mono.Security.Protocol.Tls {
                        _status = 0;
                        if (buffer != null)
                                InputBuffer.Write (buffer, 0, buffer.Length);
-#if !NET_1_0
+#if !MOONLIGHT
                         // also saved from reflection
                         base.CheckCertRevocationStatus = ServicePointManager.CheckCertificateRevocationList;
-#endif
+
                        ClientCertSelection += delegate (X509CertificateCollection clientCerts, X509Certificate serverCertificate,
                                string targetHost, X509CertificateCollection serverRequestedCertificates) {
                                return ((clientCerts == null) || (clientCerts.Count == 0)) ? null : clientCerts [0];
@@ -67,6 +67,7 @@ namespace Mono.Security.Protocol.Tls {
                                X509Certificate2 cert = (certificate as X509Certificate2);
                                return (cert == null) ? null : cert.PrivateKey;
                        };
+#endif
                }
 
                public bool TrustFailure {
@@ -81,6 +82,12 @@ namespace Mono.Security.Protocol.Tls {
                        }
                }
 
+#if MOONLIGHT
+                internal override bool RaiseServerCertificateValidation (X509Certificate certificate, int[] certificateErrors)
+               {
+                       return true;
+               }
+#else
                 internal override bool RaiseServerCertificateValidation (X509Certificate certificate, int[] certificateErrors)
                 {
                        bool failed = (certificateErrors.Length > 0);
@@ -118,5 +125,6 @@ namespace Mono.Security.Protocol.Tls {
                        }
                        return failed;
                }
+#endif
         }
 }