[Mono.Security]: Cleanup 'CertificateValidationHelper'.
authorMartin Baulig <martin.baulig@xamarin.com>
Fri, 8 Apr 2016 13:41:13 +0000 (15:41 +0200)
committerMartin Baulig <martin.baulig@xamarin.com>
Fri, 8 Apr 2016 17:12:02 +0000 (19:12 +0200)
The overloaded GetValidator() which takes both 'MonoTlsSettings'
and 'MonoTlsProvider' is actually used by the test suite, so let's
keep it public.

(cherry picked from commit 0977d531d2579c9051a6a2e6d0cb47e4f720bea4)

mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs

index 561e7888db7d1dc1162964c83b88a22c485fe056..fd392b409e5a4bef6de68f174911b79f638997be 100644 (file)
@@ -145,25 +145,20 @@ namespace Mono.Security.Interface
                        get { return supportsTrustAnchors; }
                }
 
-               static ICertificateValidator2 GetDefaultValidator (MonoTlsProvider provider, MonoTlsSettings settings)
-               {
-                       return (ICertificateValidator2)NoReflectionHelper.GetDefaultCertificateValidator (provider, settings);
-               }
-
                /*
                 * Internal API, intended to be used by MonoTlsProvider implementations.
                 */
-               internal static ICertificateValidator2 GetValidator (MonoTlsProvider provider, MonoTlsSettings settings)
+               internal static ICertificateValidator2 GetDefaultValidator (MonoTlsSettings settings, MonoTlsProvider provider)
                {
-                       return GetDefaultValidator (provider, settings);
+                       return (ICertificateValidator2)NoReflectionHelper.GetDefaultCertificateValidator (provider, settings);
                }
 
                /*
                 * Use this overloaded version in user code.
                 */
-               public static ICertificateValidator GetValidator (MonoTlsSettings settings)
+               public static ICertificateValidator GetValidator (MonoTlsSettings settings, MonoTlsProvider provider = null)
                {
-                       return GetDefaultValidator (null, settings);
+                       return GetDefaultValidator (settings, provider);
                }
        }
 }