[System] Don't build managed BTLS code on monotouch
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 25 Oct 2016 16:44:33 +0000 (18:44 +0200)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 25 Oct 2016 16:44:33 +0000 (18:44 +0200)
After 2fb07d6c6d5b3915ef4665391febbb7b8be09fb5 BTLS can be used as a shared lib,
but this caused an issue in some monotouch tools which grepped the P/Invokes for `__Internal`
since these icalls wouldn't resolve on monotouch since BTLS is disabled there.

Instead, we now completely leave out building the managed parts of BTLS when
BTLS is not enabled.

45 files changed:
configure.ac
mcs/build/profiles/monotouch_runtime.make
mcs/class/System/Makefile
mcs/class/System/Mono.Btls/MonoBtlsBio.cs
mcs/class/System/Mono.Btls/MonoBtlsContext.cs
mcs/class/System/Mono.Btls/MonoBtlsError.cs
mcs/class/System/Mono.Btls/MonoBtlsException.cs
mcs/class/System/Mono.Btls/MonoBtlsKey.cs
mcs/class/System/Mono.Btls/MonoBtlsObject.cs
mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs
mcs/class/System/Mono.Btls/MonoBtlsProvider.cs
mcs/class/System/Mono.Btls/MonoBtlsSsl.cs
mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs
mcs/class/System/Mono.Btls/MonoBtlsSslError.cs
mcs/class/System/Mono.Btls/MonoBtlsStream.cs
mcs/class/System/Mono.Btls/MonoBtlsUtils.cs
mcs/class/System/Mono.Btls/MonoBtlsX509.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Error.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Exception.cs
mcs/class/System/Mono.Btls/MonoBtlsX509FileType.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Format.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs
mcs/class/System/Mono.Btls/MonoBtlsX509LookupAndroid.cs
mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs
mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs
mcs/class/System/Mono.Btls/MonoBtlsX509LookupType.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs
mcs/class/System/Mono.Btls/MonoBtlsX509NameEntryType.cs
mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Purpose.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs
mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs
mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs
mcs/class/System/Mono.Btls/MonoBtlsX509StoreManager.cs
mcs/class/System/Mono.Btls/MonoBtlsX509StoreType.cs
mcs/class/System/Mono.Btls/MonoBtlsX509TrustKind.cs
mcs/class/System/Mono.Btls/MonoBtlsX509VerifyFlags.cs
mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs
mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs
mcs/class/System/Mono.Btls/X509ChainImplBtls.cs
mcs/class/System/System.Security.Cryptography.X509Certificates/X509Helper2.cs
mcs/class/System/System.dll.sources
mcs/class/System/monotouch_watch_System.dll.exclude.sources

index cc55c8b33c6d0039c4c080d8dc88ac1b6dfd7518..5e2b19c4164dddfc0d9e69c43970db9716cb53a7 100644 (file)
@@ -4413,9 +4413,13 @@ fi
       echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS" >> $srcdir/$mcsdir/build/config.make
     fi
 
-       if test "x$enable_dynamic_btls" = "xyes"; then
-          echo "DYNAMIC_BTLS=1" >> $srcdir/$mcsdir/build/config.make
-       fi
+    if test "x$enable_btls" = "xyes"; then
+      echo "HAVE_BTLS=1" >> $srcdir/$mcsdir/build/config.make
+      if test "x$enable_dynamic_btls" = "xyes"; then
+        echo "HAVE_DYNAMIC_BTLS=1" >> $srcdir/$mcsdir/build/config.make
+      fi
+    fi
+
   fi
 
 )
index e4370cf4f985b188dc80ed333347e114bf4e24c1..1603d123c72bc13c29fa0b6b73e4a782da8bbfb1 100644 (file)
@@ -39,3 +39,5 @@ FRAMEWORK_VERSION = 2.1
 NO_INSTALL = yes
 MOBILE_STATIC = yes
 MOBILE_PROFILE = yes
+
+PROFILE_DISABLE_BTLS=1
index 29eace8a1ff7c66b451fd4ab2197116fb5d79df9..3b75713e6d5f31890af8e42b80fdea8d63ec9cf3 100644 (file)
@@ -42,8 +42,16 @@ endif
 
 LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%)
 
-ifdef DYNAMIC_BTLS
-LIB_MCS_FLAGS += -d:DYNAMIC_BTLS
+ifndef PROFILE_DISABLE_BTLS
+ifdef HAVE_BTLS
+
+LIB_MCS_FLAGS += -d:MONO_FEATURE_BTLS
+
+ifdef HAVE_DYNAMIC_BTLS
+LIB_MCS_FLAGS += -d:MONO_FEATURE_DYNAMIC_BTLS
+endif
+
+endif
 endif
 
 ifndef NO_THREAD_ABORT
index ca62c8e4a2921712170cd47d5027f6e95a26ed65..204d167928974c609463c4c561847fd0278d810d 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index c06688dc86eee8fdd083e5f42ce1c9c06bce3472..2df24d9793ae3106b598d4bb34fce098724d5300 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 #if MONO_SECURITY_ALIAS
 extern alias MonoSecurity;
 #endif
index bbfee5ef89788b5113df5203f731d44cdfc1b95b..5e61bcf04634b91e2c80d4c93668ddd9ebae6034 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index bf6b163f95f7ad6bb710cc80815a882b45d0b91a..44282c97ec51f153011d010bac80d364447df5de 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 
 namespace Mono.Btls
index 04ccb467a95ba0950eec2adc07ae05948f9ecc0a..f0cc3764d6835b6cad2866ff1702ef4d8ce3d52a 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index 9731e1deb442c8b074b3a1eb9d8b2a28ac67ade0..fd267d49f642961efb99e6fe5c94f7354e4af690 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.Threading;
 using System.Runtime.InteropServices;
@@ -33,7 +33,7 @@ namespace Mono.Btls
 {
        abstract class MonoBtlsObject : IDisposable
        {
-#if DYNAMIC_BTLS
+#if MONO_FEATURE_DYNAMIC_BTLS
                internal const string BTLS_DYLIB = "libmono-btls-shared";
 #else
                internal const string BTLS_DYLIB = "__Internal";
index 2f97cb87474d8b97fd109c51c0ccd4bcffe7d29a..92e432092b645b7245a3c9dc482e6e2cd44d0b43 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
index 5e1e3b1507aa163b3baf85c493370e931e1b4a95..b3005858631d826a1c9b695e3f5ef22c15b4bff1 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 #if MONO_SECURITY_ALIAS
 extern alias MonoSecurity;
 #endif
index d04a15a1a668c8ce2291423a9511c6e7b4c62877..d7510901357fdb925c7cd32cd7df98e6794cf912 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index 7fac0f3382129c1f58821dcda938fe229c54f5b5..fd9b6f1b629bf75d71cf86afc9354b250ab8043d 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
index 38f6f4fb0e732ecf88a928aef94642cb8c874967..432ba5d036a4f2336dfd408592d9865405b0c339 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 namespace Mono.Btls
 {
        // keep in sync with boringssl/include/ssl.h
index d2f32e98c659a8decd453b987721804bbb25450c..38b6d83a4d6706ca62b1158e567f0ed2472faf38 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 #if MONO_SECURITY_ALIAS
 extern alias MonoSecurity;
 #endif
index 63dba5d698778162568e0b5695a18151fa7a9765..41759681958952cb63f605af81381fbd58aef30e 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.Text;
 using System.Security.Cryptography.X509Certificates;
index b35c0c1422595f6c20fb1029b6c0bdbbfabcb8cc..c722ad9fbfd3ac54f082b7ada8445166480502fb 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index 853e3bb60c55158d42755fed4c7282ecb6c8dbf5..7113d1f48f6076454610a6c9d524791176387bcb 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
index 004a29abc1fc6dcb9ff4b50708a01a818b219670..6801b79b785c24b0204646e8443864eb16e833b7 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index 50196bfd49d8e70fdbfe64e3e68f42be986007f0..bf40275b9f5677e07f0ca9d08162a6a6162463a4 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 namespace Mono.Btls
 {
index 588e7a7f6925a071ac0dd8da7e44c5648751b51a..bb982bc0f45c27d0d8f3a6b0bee629ae33c1e955 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 
 namespace Mono.Btls
index 67d26e6c3573b63f28eb1be30ef4478046e9cca1..1475457507b4ab4c6434fe61347735777cd79851 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 namespace Mono.Btls
 {
index 551da69c4bfd610af08808949137d8aa053dc0aa..609d0c1f2aba32220410825219914897954377cf 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 namespace Mono.Btls
 {
index fc24dc79d0c4d761a339c371f2a87be40b8f0a41..b2e863b085a0366ac5b43f8324aa8c41a919fba2 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
index 45f365ce3eeb327034888989676cab4f76f9dff8..db0151ac93c2ac1891125478694a49032be116f9 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP && MONODROID
+#if SECURITY_DEP && MONO_FEATURE_BTLS && MONODROID
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
index 73d16a3bb5d3ee0a8e3a10e3bbcecfb78e088170..cd86cde03adf804e01ced27644fbef84ff994c93 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
index 8a854f6303a1e612c00d25d200109d291815a07d..139243e2a23d398f76af96ac3cc79b26cd6fccbf 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
index 2cbdf7cb718bce325124f92de46e1562b0bcc4da..6bb42d989f3118da000ba2d41c4000c9ab52b246 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 
 namespace Mono.Btls
index 88e1bb427d7c3c4e43c384f9c2895aebaef02cd4..74e335a64cad49b642f8b70ca5ebcfb9268394d2 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index 781d6917c9db11d8e3c959fbaecc970681eeeee6..1a4cdae673f6d1d9dae79a8946f3092d6b5ebb33 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 namespace Mono.Btls
 {
index ab3a7bba62c69bf042d0236c6bf661646d4e570a..005ffd03eaba6f5a4b0b9dd907b98ea268b7adf5 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index d80957c301b1c9246cd8a77416a6b66f952fc59a..b8b416330d007957aff9ee5b7c9b8d285eb4b4e1 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 namespace Mono.Btls
 {
index 583a6d01517fac62e3e8f746ae48c6fcbe3b7df9..1bb279a4ae12f70b3a04d8cf4ff15d75ab87f93d 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Text;
index 76db62bb9f83fb03cc7d59132e836b1a1402130d..537993566e53a6a1c7fd2cf9e978639e928224c2 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Collections.Generic;
index f197a66bc3da7725c4fcf681ec80df53923d54d3..9b8e82bb5e2766a135eda18c56be9413bf1a62b3 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
index 13c92a29ef0560a9db89b0ae81a2b2af5e2e2e66..9b67262aff68a6c5706973eadf3618b53b51ceaf 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 #if MONO_SECURITY_ALIAS
 extern alias MonoSecurity;
 #endif
index 22cc0726cd76e749cec8e0c6c6e0155e1d87614a..b4ac5930054573cbf3ff0153c5644b7b61de9a1e 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 namespace Mono.Btls
 {
        enum MonoBtlsX509StoreType
index e207683711b0683f2e2d93f20fb0f3ed0b26f224..4d8558870425094fbb32ecfdb27292fe16d997bb 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 namespace Mono.Btls
 {
index 628633bcfd18473846ca47f44224b8eb26763c19..493fc9b1c3dd77ad8c58802a9201dedc53ad463c 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 namespace Mono.Btls
 {
index d95610a92da22a64fb10fe839d786a4a7a9dc1ec..9029722a504791521461113e329e85ec56339ac5 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
index ef077b80e9fedeea766e756fb2895e99c4786ff4..f780812ce404f952eb8a07f6332a075587216a22 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 #if MONO_SECURITY_ALIAS
 extern alias MonoSecurity;
 #endif
index 79a985ce6749562f1871b38961e1ebee4faeafe6..6bbdcfe915e6031bdf4e315d96e54176fd774793 100644 (file)
@@ -23,7 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if SECURITY_DEP
+#if SECURITY_DEP && MONO_FEATURE_BTLS
 using System;
 using System.Text;
 using System.Security;
index 9bbe99f86314cd4eb7e1eafbb667171e3133e079..7d0b3d1487cda4b4b5a74edbc957997fa56556f1 100644 (file)
@@ -35,13 +35,13 @@ extern alias MonoSecurity;
 using MonoSecurity::Mono.Security.Interface;
 using MX = MonoSecurity::Mono.Security.X509;
 #else
-#if !FEATURE_NO_BSD_SOCKETS
+#if MONO_FEATURE_BTLS
 using Mono.Security.Interface;
 #endif
 using MX = Mono.Security.X509;
 #endif
 
-#if !FEATURE_NO_BSD_SOCKETS
+#if MONO_FEATURE_BTLS
 using Mono.Btls;
 #endif
 #endif
@@ -94,7 +94,7 @@ namespace System.Security.Cryptography.X509Certificates
                        X509Helper.ThrowIfContextInvalid (impl);
                }
 
-#if FEATURE_NO_BSD_SOCKETS
+#if !MONO_FEATURE_BTLS
                static X509Certificate GetNativeInstance (X509CertificateImpl impl)
                {
                        throw new PlatformNotSupportedException ();
@@ -122,11 +122,11 @@ namespace System.Security.Cryptography.X509Certificates
                                x509.ExportAsPEM (bio, includeHumanReadableForm);
                        }
                }
-#endif // !FEATURE_NO_BSD_SOCKETS
+#endif // !MONO_FEATURE_BTLS
 
                internal static X509Certificate2Impl Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags, bool disableProvider = false)
                {
-#if !FEATURE_NO_BSD_SOCKETS
+#if MONO_FEATURE_BTLS
                        if (!disableProvider) {
                                var provider = MonoTlsProviderFactory.GetProvider ();
                                if (provider.HasNativeCertificates) {
@@ -134,7 +134,7 @@ namespace System.Security.Cryptography.X509Certificates
                                        return impl;
                                }
                        }
-#endif // FEATURE_NO_BSD_SOCKETS
+#endif // MONO_FEATURE_BTLS
                        var impl2 = new X509Certificate2ImplMono ();
                        impl2.Import (rawData, password, keyStorageFlags);
                        return impl2;
@@ -142,7 +142,7 @@ namespace System.Security.Cryptography.X509Certificates
 
                internal static X509Certificate2Impl Import (X509Certificate cert, bool disableProvider = false)
                {
-#if !FEATURE_NO_BSD_SOCKETS
+#if MONO_FEATURE_BTLS
                        if (!disableProvider) {
                                var provider = MonoTlsProviderFactory.GetProvider ();
                                if (provider.HasNativeCertificates) {
@@ -150,7 +150,7 @@ namespace System.Security.Cryptography.X509Certificates
                                        return impl;
                                }
                        }
-#endif // FEATURE_NO_BSD_SOCKETS
+#endif // MONO_FEATURE_BTLS
                        var impl2 = cert.Impl as X509Certificate2Impl;
                        if (impl2 != null)
                                return (X509Certificate2Impl)impl2.Clone ();
index cde1c1ed221688825e081406200a1e4fbc245549..e1cabcf69ae5cddbf98a5542667b8eba0b381f83 100644 (file)
@@ -537,8 +537,8 @@ Mono.Btls/MonoBtlsX509Exception.cs
 Mono.Btls/MonoBtlsX509FileType.cs
 Mono.Btls/MonoBtlsX509Format.cs
 Mono.Btls/MonoBtlsX509Lookup.cs
-Mono.Btls/MonoBtlsX509LookupMono.cs
 Mono.Btls/MonoBtlsX509LookupMonoCollection.cs
+Mono.Btls/MonoBtlsX509LookupMono.cs
 Mono.Btls/MonoBtlsX509LookupType.cs
 Mono.Btls/MonoBtlsX509Name.cs
 Mono.Btls/MonoBtlsX509NameList.cs
index 8c6728097b7129ea1850e496e88c4002d33a253b..8d7969bf906d647a0c358b9c6080a17477d1153e 100644 (file)
@@ -142,44 +142,6 @@ System.Net/WebConnection.cs
 System.Net/WebConnectionData.cs
 System.Net/WebConnectionGroup.cs
 System.Net/WebConnectionStream.cs
-Mono.Btls/MonoBtlsBio.cs
-Mono.Btls/MonoBtlsContext.cs
-Mono.Btls/MonoBtlsError.cs
-Mono.Btls/MonoBtlsException.cs
-Mono.Btls/MonoBtlsKey.cs
-Mono.Btls/MonoBtlsObject.cs
-Mono.Btls/MonoBtlsPkcs12.cs
-Mono.Btls/MonoBtlsProvider.cs
-Mono.Btls/MonoBtlsSsl.cs
-Mono.Btls/MonoBtlsSslCtx.cs
-Mono.Btls/MonoBtlsSslError.cs
-Mono.Btls/MonoBtlsStream.cs
-Mono.Btls/MonoBtlsUtils.cs
-Mono.Btls/MonoBtlsX509.cs
-Mono.Btls/MonoBtlsX509Chain.cs
-Mono.Btls/MonoBtlsX509Crl.cs
-Mono.Btls/MonoBtlsX509Error.cs
-Mono.Btls/MonoBtlsX509Exception.cs
-Mono.Btls/MonoBtlsX509FileType.cs
-Mono.Btls/MonoBtlsX509Format.cs
-Mono.Btls/MonoBtlsX509Lookup.cs
-Mono.Btls/MonoBtlsX509LookupMonoCollection.cs
-Mono.Btls/MonoBtlsX509LookupMono.cs
-Mono.Btls/MonoBtlsX509LookupType.cs
-Mono.Btls/MonoBtlsX509Name.cs
-Mono.Btls/MonoBtlsX509NameList.cs
-Mono.Btls/MonoBtlsX509NameEntryType.cs
-Mono.Btls/MonoBtlsX509Purpose.cs
-Mono.Btls/MonoBtlsX509Revoked.cs
-Mono.Btls/MonoBtlsX509Store.cs
-Mono.Btls/MonoBtlsX509StoreCtx.cs
-Mono.Btls/MonoBtlsX509StoreManager.cs
-Mono.Btls/MonoBtlsX509StoreType.cs
-Mono.Btls/MonoBtlsX509TrustKind.cs
-Mono.Btls/MonoBtlsX509VerifyFlags.cs
-Mono.Btls/MonoBtlsX509VerifyParam.cs
-Mono.Btls/X509CertificateImplBtls.cs
-Mono.Btls/X509ChainImplBtls.cs
 ../referencesource/System/net/System/Net/Sockets/TCPClient.cs
 ../referencesource/System/net/System/Net/Sockets/TCPListener.cs
 ../referencesource/System/net/System/Net/Sockets/UDPClient.cs