Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mcs/class/Mono.Btls.Interface/Mono.Btls.Interface/BtlsProvider.cs3
-rw-r--r--mcs/class/System/Mono.Btls/MonoBtlsProvider.cs6
-rw-r--r--mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs2
-rw-r--r--mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs6
-rw-r--r--mcs/tools/btls/btls-cert-sync.cs4
-rw-r--r--mono/metadata/icall-def.h9
-rw-r--r--mono/metadata/icall.c2
7 files changed, 15 insertions, 17 deletions
diff --git a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface/BtlsProvider.cs b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface/BtlsProvider.cs
index 6a8d8106253..0959dd0b612 100644
--- a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface/BtlsProvider.cs
+++ b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface/BtlsProvider.cs
@@ -26,6 +26,7 @@
using System;
using Mono.Security.Interface;
using System.Security.Cryptography.X509Certificates;
+using MNS = Mono.Net.Security;
namespace Mono.Btls.Interface
{
@@ -33,7 +34,7 @@ namespace Mono.Btls.Interface
{
public static bool IsSupported ()
{
- return MonoBtlsProvider.IsSupported ();
+ return MNS.MonoTlsProviderFactory.IsBtlsSupported ();
}
public static MonoTlsProvider GetProvider ()
diff --git a/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs b/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs
index 1a5185a514f..147f53e1a41 100644
--- a/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs
+++ b/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs
@@ -32,7 +32,6 @@ using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
-using System.Runtime.CompilerServices;
using System.Security.Cryptography.X509Certificates;
using System.Security.Authentication;
@@ -59,12 +58,9 @@ namespace Mono.Btls
get { return "btls"; }
}
- [MethodImpl (MethodImplOptions.InternalCall)]
- public extern static bool IsSupported ();
-
internal MonoBtlsProvider ()
{
- if (!IsSupported ())
+ if (!MNS.MonoTlsProviderFactory.IsBtlsSupported ())
throw new NotSupportedException ("BTLS is not supported in this runtime.");
}
diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs
index 6849b160bf3..db2e81529ba 100644
--- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs
@@ -18,7 +18,7 @@ namespace Mono.Net.Security
case "legacy":
return new LegacyTlsProvider ();
case "btls":
- if (!MonoBtlsProvider.IsSupported ())
+ if (!IsBtlsSupported ())
throw new NotSupportedException ("BTLS in not supported!");
return new MonoBtlsProvider ();
default:
diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs
index ab6a536f260..071535a5c44 100644
--- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs
+++ b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs
@@ -39,6 +39,7 @@ using System.Security.Cryptography.X509Certificates;
using System;
using System.Net;
using System.Collections.Generic;
+using System.Runtime.CompilerServices;
#if !MOBILE
using System.Reflection;
@@ -107,6 +108,9 @@ namespace Mono.Net.Security
initialized = true;
}
}
+
+ [MethodImpl (MethodImplOptions.InternalCall)]
+ internal extern static bool IsBtlsSupported ();
#endif
static object locker = new object ();
@@ -157,7 +161,7 @@ namespace Mono.Net.Security
providerRegistration = new Dictionary<string,string> ();
providerRegistration.Add ("legacy", "Mono.Net.Security.LegacyTlsProvider");
providerRegistration.Add ("default", "Mono.Net.Security.LegacyTlsProvider");
- if (Mono.Btls.MonoBtlsProvider.IsSupported ())
+ if (IsBtlsSupported ())
providerRegistration.Add ("btls", "Mono.Btls.MonoBtlsProvider");
X509Helper2.Initialize ();
}
diff --git a/mcs/tools/btls/btls-cert-sync.cs b/mcs/tools/btls/btls-cert-sync.cs
index 0ef071ffefa..fcdc708e0ab 100644
--- a/mcs/tools/btls/btls-cert-sync.cs
+++ b/mcs/tools/btls/btls-cert-sync.cs
@@ -2,7 +2,7 @@ using System;
using System.IO;
using System.Text;
using System.Security.Cryptography.X509Certificates;
-using Mono.Btls;
+using MNS = Mono.Net.Security;
namespace Mono.Btls
{
@@ -10,7 +10,7 @@ namespace Mono.Btls
{
static void Main (string[] args)
{
- if (!MonoBtlsProvider.IsSupported ()) {
+ if (!MNS.MonoTlsProviderFactory.IsBtlsSupported ()) {
Console.Error.WriteLine ("BTLS is not supported in this runtime!");
Environment.Exit (255);
}
diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h
index 2d48a0a8a0d..c90a85a3c3d 100644
--- a/mono/metadata/icall-def.h
+++ b/mono/metadata/icall-def.h
@@ -124,9 +124,6 @@ ICALL(BTLS_PKCS12_8, "mono_btls_pkcs12_import", mono_btls_pkcs12_import)
ICALL(BTLS_PKCS12_9, "mono_btls_pkcs12_new", mono_btls_pkcs12_new)
ICALL(BTLS_PKCS12_10, "mono_btls_pkcs12_up_ref", mono_btls_pkcs12_up_ref)
-ICALL_TYPE(BTLS_PROVIDER, "Mono.Btls.MonoBtlsProvider", BTLS_PROVIDER_1)
-ICALL(BTLS_PROVIDER_1, "IsSupported", ves_icall_Mono_Btls_Provider_IsSupported)
-
ICALL_TYPE(BTLS_SSL, "Mono.Btls.MonoBtlsSsl", BTLS_SSL_1)
ICALL(BTLS_SSL_1, "mono_btls_ssl_accept", mono_btls_ssl_accept)
ICALL(BTLS_SSL_2, "mono_btls_ssl_add_chain_certificate", mono_btls_ssl_add_chain_certificate)
@@ -314,9 +311,6 @@ ICALL(BTLS_X509_VERIFY_PARAM_16, "mono_btls_x509_verify_param_set_mono_flags", m
ICALL(BTLS_X509_VERIFY_PARAM_17, "mono_btls_x509_verify_param_set_name", mono_btls_x509_verify_param_set_name)
ICALL(BTLS_X509_VERIFY_PARAM_18, "mono_btls_x509_verify_param_set_purpose", mono_btls_x509_verify_param_set_purpose)
ICALL(BTLS_X509_VERIFY_PARAM_19, "mono_btls_x509_verify_param_set_time", mono_btls_x509_verify_param_set_time)
-#else
-ICALL_TYPE(BTLS_PROVIDER, "Mono.Btls.MonoBtlsProvider", BTLS_PROVIDER_1)
-ICALL(BTLS_PROVIDER_1, "IsSupported", ves_icall_Mono_Btls_Provider_IsSupported)
#endif
#ifndef DISABLE_COM
@@ -325,6 +319,9 @@ ICALL(COMPROX_1, "AddProxy", ves_icall_Mono_Interop_ComInteropProxy_AddProxy)
ICALL(COMPROX_2, "FindProxy", ves_icall_Mono_Interop_ComInteropProxy_FindProxy)
#endif
+ICALL_TYPE(TLS_PROVIDER_FACTORY, "Mono.Net.Security.MonoTlsProviderFactory", TLS_PROVIDER_FACTORY_1)
+ICALL(TLS_PROVIDER_FACTORY_1, "IsBtlsSupported", ves_icall_Mono_TlsProviderFactory_IsBtlsSupported)
+
ICALL_TYPE(RUNTIME, "Mono.Runtime", RUNTIME_1)
ICALL(RUNTIME_1, "GetDisplayName", ves_icall_Mono_Runtime_GetDisplayName)
ICALL(RUNTIME_12, "GetNativeStackTrace", ves_icall_Mono_Runtime_GetNativeStackTrace)
diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index ed0ac7e81b8..b47bf989fd4 100644
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -8083,7 +8083,7 @@ ves_icall_Microsoft_Win32_NativeMethods_SetPriorityClass (gpointer handle, gint3
}
ICALL_EXPORT MonoBoolean
-ves_icall_Mono_Btls_Provider_IsSupported (void)
+ves_icall_Mono_TlsProviderFactory_IsBtlsSupported (void)
{
#if HAVE_BTLS
return TRUE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 01:17:29 +0300