[System]: Temporarily switch the default TLS provider back to "legacy".

Also revert the Jenkins commit in c462f4e6032cd70d692461f09b295671d380eef8.

(cherry picked from commit cd1b0b8edf43ee61dc87ebc7edbc44f7d56204b5)

diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs
index ae8b40dcbb32cefe440000da52c03cae704270cb..5f61781ca3a7a280a4f02b1d78ccb432f79ad7bb 100644 (file)
--- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs
@@ -156,12 +156,8 @@ namespace Mono.Net.Security
                                        return;
                                providerRegistration = new Dictionary<string,string> ();
                                providerRegistration.Add ("legacy", "Mono.Net.Security.LegacyTlsProvider");
-                               if (Mono.Btls.MonoBtlsProvider.IsSupported ()) {
+                               if (Mono.Btls.MonoBtlsProvider.IsSupported ())
                                        providerRegistration.Add ("btls", "Mono.Btls.MonoBtlsProvider");
-                                       providerRegistration.Add ("default", "Mono.Btls.MonoBtlsProvider");
-                               } else {
-                                       providerRegistration.Add ("default", "Mono.Net.Security.LegacyTlsProvider");
-                               }
                                X509Helper2.Initialize ();
                        }
                }

diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh
index 2dbbd03c027198c81b4c53e91323fe914cd66af2..ab17183b1b0bf0a8d5cfc1565fbd926becb336bb 100755 (executable)
--- a/scripts/ci/run-jenkins.sh
+++ b/scripts/ci/run-jenkins.sh
@@ -3,8 +3,6 @@
 TESTCMD=`dirname "${BASH_SOURCE[0]}"`/run-step.sh
 
 export TEST_HARNESS_VERBOSE=1
-export MONO_TLS_PROVIDER=legacy
-
 if [[ ${label} == w* ]]; then
     # Passing -ggdb3 on Cygwin breaks linking against libmonosgen-x.y.dll
     export CFLAGS="-g -O2"