[System] Add new 'Mono.Security.Interface.MonoTlsProviderFactory' callback to let...

List of original contributors:

Martin Baulig <martin.baulig@xamarin.com>

diff --git a/mcs/class/System/Assembly/AssemblyInfoEx.cs b/mcs/class/System/Assembly/AssemblyInfoEx.cs
new file mode 100644 (file)
index 0000000..22e5bca
--- /dev/null
+++ b/mcs/class/System/Assembly/AssemblyInfoEx.cs
@@ -0,0 +1,7 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo ("monotouch, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
+[assembly: InternalsVisibleTo ("Xamarin.iOS, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
+[assembly: InternalsVisibleTo ("Xamarin.Mac, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
+[assembly: InternalsVisibleTo ("Xamarin.WatchOS, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
+[assembly: InternalsVisibleTo ("Xamarin.TVOS, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]

diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.MonoTouch.opt.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.MonoTouch.opt.cs
deleted file mode 100644 (file)
index b8c5d6d..0000000
--- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.MonoTouch.opt.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#if MONOTOUCH || XAMMAC
-
-// this file is a shim to enable compiling monotouch profiles without mono-extensions
-namespace Mono.Net.Security
-{
-       static partial class MonoTlsProviderFactory
-       {
-               static IMonoTlsProvider CreateDefaultProvider ()
-               {
-                       throw new System.NotSupportedException ();
-               }
-       }
-}
-
-#endif

diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactoryExt.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactoryExt.cs
new file mode 100644 (file)
index 0000000..f9f939b
--- /dev/null
+++ b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactoryExt.cs
@@ -0,0 +1,22 @@
+// Copyright 2015 Xamarin Inc. All rights reserved.
+
+using System;
+using MSI = Mono.Security.Interface;
+
+namespace Mono.Net.Security
+{
+       static partial class MonoTlsProviderFactory
+       {
+               static IMonoTlsProvider CreateDefaultProvider ()
+               {
+                       #if SECURITY_DEP
+                       MSI.MonoTlsProvider provider = null;
+                       if (MSI.MonoTlsProviderFactory._PrivateFactoryDelegate != null)
+                               provider = MSI.MonoTlsProviderFactory._PrivateFactoryDelegate ();
+                       if (provider != null)
+                               return new Private.MonoTlsProviderWrapper (provider);
+                       #endif
+                       return null;
+               }
+       }
+}

diff --git a/mcs/class/System/Mono.Security.Interface/MonoTlsProviderFactoryExt.cs b/mcs/class/System/Mono.Security.Interface/MonoTlsProviderFactoryExt.cs
new file mode 100644 (file)
index 0000000..e902c80
--- /dev/null
+++ b/mcs/class/System/Mono.Security.Interface/MonoTlsProviderFactoryExt.cs
@@ -0,0 +1,9 @@
+namespace Mono.Security.Interface
+{
+       public delegate MonoTlsProvider MonoTlsProviderFactoryDelegate ();
+
+       static partial class MonoTlsProviderFactory
+       {
+               public static MonoTlsProviderFactoryDelegate _PrivateFactoryDelegate;
+       }
+}

diff --git a/mcs/class/System/monotouch_System.dll.sources b/mcs/class/System/monotouch_System.dll.sources
index 8dce31d234c5b119f6502c1b4dbf3c9b3baf94c0..8f3de2eff5d4afd0a8048ca3c1460423b79e1ec6 100644 (file)
--- a/mcs/class/System/monotouch_System.dll.sources
+++ b/mcs/class/System/monotouch_System.dll.sources
@@ -1,2 +1,5 @@
 #include mobile_System.dll.sources
 MonoTouch/MonoPInvokeCallbackAttribute.cs
+Assembly/AssemblyInfoEx.cs
+Mono.Net.Security/MonoTlsProviderFactoryExt.cs
+Mono.Security.Interface/MonoTlsProviderFactoryExt.cs

diff --git a/mcs/class/System/monotouch_opt_System.dll.sources b/mcs/class/System/monotouch_opt_System.dll.sources
deleted file mode 100644 (file)
index 6877457..0000000
--- a/mcs/class/System/monotouch_opt_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-Mono.Net.Security/MonoTlsProviderFactory.MonoTouch.opt.cs

diff --git a/mcs/class/System/monotouch_runtime_opt_System.dll.sources b/mcs/class/System/monotouch_runtime_opt_System.dll.sources
deleted file mode 100644 (file)
index 54025c5..0000000
--- a/mcs/class/System/monotouch_runtime_opt_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include monotouch_opt_System.dll.sources

diff --git a/mcs/class/System/monotouch_tv_opt_System.dll.sources b/mcs/class/System/monotouch_tv_opt_System.dll.sources
deleted file mode 100644 (file)
index 54025c5..0000000
--- a/mcs/class/System/monotouch_tv_opt_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include monotouch_opt_System.dll.sources

diff --git a/mcs/class/System/monotouch_tv_runtime_opt_System.dll.sources b/mcs/class/System/monotouch_tv_runtime_opt_System.dll.sources
deleted file mode 100644 (file)
index 54025c5..0000000
--- a/mcs/class/System/monotouch_tv_runtime_opt_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include monotouch_opt_System.dll.sources

diff --git a/mcs/class/System/monotouch_watch_opt_System.dll.sources b/mcs/class/System/monotouch_watch_opt_System.dll.sources
deleted file mode 100644 (file)
index 54025c5..0000000
--- a/mcs/class/System/monotouch_watch_opt_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include monotouch_opt_System.dll.sources

diff --git a/mcs/class/System/monotouch_watch_runtime_opt_System.dll.sources b/mcs/class/System/monotouch_watch_runtime_opt_System.dll.sources
deleted file mode 100644 (file)
index 54025c5..0000000
--- a/mcs/class/System/monotouch_watch_runtime_opt_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include monotouch_opt_System.dll.sources

diff --git a/mcs/class/System/xammac_System.dll.sources b/mcs/class/System/xammac_System.dll.sources
index 70a77a6dbff401e4d973b5d5f8ce11321a969f9a..330f5106870020aee431722048cc1f9f8e8a4ba5 100644 (file)
--- a/mcs/class/System/xammac_System.dll.sources
+++ b/mcs/class/System/xammac_System.dll.sources
@@ -1 +1,4 @@
 #include mobile_System.dll.sources
+Assembly/AssemblyInfoEx.cs
+Mono.Net.Security/MonoTlsProviderFactoryExt.cs
+Mono.Security.Interface/MonoTlsProviderFactoryExt.cs

diff --git a/mcs/class/System/xammac_net_4_5_System.dll.sources b/mcs/class/System/xammac_net_4_5_System.dll.sources
index 3ff0aad1cfbd9e7ccb83c6ef390899c0cf041fe2..7e48f7ecc9d76cd28f42010171c2275d41b2d00f 100644 (file)
--- a/mcs/class/System/xammac_net_4_5_System.dll.sources
+++ b/mcs/class/System/xammac_net_4_5_System.dll.sources
@@ -1 +1,2 @@
 #include System.dll.sources
+Assembly/AssemblyInfoEx.cs

diff --git a/mcs/class/System/xammac_net_4_5_opt_System.dll.sources b/mcs/class/System/xammac_net_4_5_opt_System.dll.sources
deleted file mode 100644 (file)
index 86ff246..0000000
--- a/mcs/class/System/xammac_net_4_5_opt_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include xammac_opt_System.dll.sources

diff --git a/mcs/class/System/xammac_opt_System.dll.sources b/mcs/class/System/xammac_opt_System.dll.sources
deleted file mode 100644 (file)
index 6877457..0000000
--- a/mcs/class/System/xammac_opt_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-Mono.Net.Security/MonoTlsProviderFactory.MonoTouch.opt.cs