From db21455da9d74354b75accafc4e8e3c21466f048 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 25 Oct 2016 18:44:33 +0200 Subject: [PATCH] [System] Don't build managed BTLS code on monotouch 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. --- configure.ac | 10 +++-- mcs/build/profiles/monotouch_runtime.make | 2 + mcs/class/System/Makefile | 12 +++++- mcs/class/System/Mono.Btls/MonoBtlsBio.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsContext.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsError.cs | 2 +- .../System/Mono.Btls/MonoBtlsException.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsKey.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsObject.cs | 4 +- mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs | 2 +- .../System/Mono.Btls/MonoBtlsProvider.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsSsl.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs | 2 +- .../System/Mono.Btls/MonoBtlsSslError.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsStream.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsUtils.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsX509.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Chain.cs | 2 +- mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Error.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Exception.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509FileType.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Format.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Lookup.cs | 2 +- .../Mono.Btls/MonoBtlsX509LookupAndroid.cs | 2 +- .../Mono.Btls/MonoBtlsX509LookupMono.cs | 2 +- .../MonoBtlsX509LookupMonoCollection.cs | 2 +- .../Mono.Btls/MonoBtlsX509LookupType.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Name.cs | 2 +- .../Mono.Btls/MonoBtlsX509NameEntryType.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509NameList.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Purpose.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Revoked.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509Store.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509StoreCtx.cs | 2 +- .../Mono.Btls/MonoBtlsX509StoreManager.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509StoreType.cs | 2 +- .../System/Mono.Btls/MonoBtlsX509TrustKind.cs | 2 +- .../Mono.Btls/MonoBtlsX509VerifyFlags.cs | 2 +- .../Mono.Btls/MonoBtlsX509VerifyParam.cs | 2 +- .../Mono.Btls/X509CertificateImplBtls.cs | 2 +- .../System/Mono.Btls/X509ChainImplBtls.cs | 2 +- .../X509Helper2.cs | 16 ++++---- mcs/class/System/System.dll.sources | 2 +- ...monotouch_watch_System.dll.exclude.sources | 38 ------------------- 45 files changed, 68 insertions(+), 92 deletions(-) diff --git a/configure.ac b/configure.ac index cc55c8b33c6..5e2b19c4164 100644 --- a/configure.ac +++ b/configure.ac @@ -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 ) diff --git a/mcs/build/profiles/monotouch_runtime.make b/mcs/build/profiles/monotouch_runtime.make index e4370cf4f98..1603d123c72 100644 --- a/mcs/build/profiles/monotouch_runtime.make +++ b/mcs/build/profiles/monotouch_runtime.make @@ -39,3 +39,5 @@ FRAMEWORK_VERSION = 2.1 NO_INSTALL = yes MOBILE_STATIC = yes MOBILE_PROFILE = yes + +PROFILE_DISABLE_BTLS=1 diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 29eace8a1ff..3b75713e6d5 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsBio.cs b/mcs/class/System/Mono.Btls/MonoBtlsBio.cs index ca62c8e4a29..204d1679289 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsBio.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsBio.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsContext.cs b/mcs/class/System/Mono.Btls/MonoBtlsContext.cs index c06688dc86e..2df24d9793a 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsContext.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsContext.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsError.cs b/mcs/class/System/Mono.Btls/MonoBtlsError.cs index bbfee5ef897..5e61bcf0463 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsError.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsError.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsException.cs b/mcs/class/System/Mono.Btls/MonoBtlsException.cs index bf6b163f95f..44282c97ec5 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsException.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsException.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsKey.cs b/mcs/class/System/Mono.Btls/MonoBtlsKey.cs index 04ccb467a95..f0cc3764d68 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsKey.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsKey.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsObject.cs b/mcs/class/System/Mono.Btls/MonoBtlsObject.cs index 9731e1deb44..fd267d49f64 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsObject.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsObject.cs @@ -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"; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs b/mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs index 2f97cb87474..92e432092b6 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs b/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs index 5e1e3b1507a..b3005858631 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsSsl.cs b/mcs/class/System/Mono.Btls/MonoBtlsSsl.cs index d04a15a1a66..d7510901357 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsSsl.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsSsl.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs b/mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs index 7fac0f33821..fd9b6f1b629 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsSslError.cs b/mcs/class/System/Mono.Btls/MonoBtlsSslError.cs index 38f6f4fb0e7..432ba5d036a 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsSslError.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsSslError.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsStream.cs b/mcs/class/System/Mono.Btls/MonoBtlsStream.cs index d2f32e98c65..38b6d83a4d6 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsStream.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsStream.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsUtils.cs b/mcs/class/System/Mono.Btls/MonoBtlsUtils.cs index 63dba5d6987..41759681958 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsUtils.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsUtils.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509.cs index b35c0c14225..c722ad9fbfd 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs index 853e3bb60c5..7113d1f48f6 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs index 004a29abc1f..6801b79b785 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Error.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Error.cs index 50196bfd49d..bf40275b9f5 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Error.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Error.cs @@ -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 { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Exception.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Exception.cs index 588e7a7f692..bb982bc0f45 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Exception.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Exception.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509FileType.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509FileType.cs index 67d26e6c357..1475457507b 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509FileType.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509FileType.cs @@ -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 { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Format.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Format.cs index 551da69c4bf..609d0c1f2ab 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Format.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Format.cs @@ -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 { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs index fc24dc79d0c..b2e863b085a 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupAndroid.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupAndroid.cs index 45f365ce3ee..db0151ac93c 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupAndroid.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupAndroid.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs index 73d16a3bb5d..cd86cde03ad 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs index 8a854f6303a..139243e2a23 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMonoCollection.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupType.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupType.cs index 2cbdf7cb718..6bb42d989f3 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupType.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupType.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs index 88e1bb427d7..74e335a64ca 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509NameEntryType.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509NameEntryType.cs index 781d6917c9d..1a4cdae673f 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509NameEntryType.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509NameEntryType.cs @@ -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 { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs index ab3a7bba62c..005ffd03eab 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Purpose.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Purpose.cs index d80957c301b..b8b416330d0 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Purpose.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Purpose.cs @@ -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 { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs index 583a6d01517..1bb279a4ae1 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs index 76db62bb9f8..537993566e5 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs index f197a66bc3d..9b8e82bb5e2 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509StoreManager.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509StoreManager.cs index 13c92a29ef0..9b67262aff6 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509StoreManager.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509StoreManager.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509StoreType.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509StoreType.cs index 22cc0726cd7..b4ac5930054 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509StoreType.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509StoreType.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509TrustKind.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509TrustKind.cs index e207683711b..4d855887042 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509TrustKind.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509TrustKind.cs @@ -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 { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyFlags.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyFlags.cs index 628633bcfd1..493fc9b1c3d 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyFlags.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyFlags.cs @@ -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 { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs index d95610a92da..9029722a504 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs @@ -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; diff --git a/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs b/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs index ef077b80e9f..f780812ce40 100644 --- a/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs +++ b/mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs @@ -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 diff --git a/mcs/class/System/Mono.Btls/X509ChainImplBtls.cs b/mcs/class/System/Mono.Btls/X509ChainImplBtls.cs index 79a985ce674..6bbdcfe915e 100644 --- a/mcs/class/System/Mono.Btls/X509ChainImplBtls.cs +++ b/mcs/class/System/Mono.Btls/X509ChainImplBtls.cs @@ -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; diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Helper2.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Helper2.cs index 9bbe99f8631..7d0b3d1487c 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Helper2.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Helper2.cs @@ -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 (); diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources index cde1c1ed221..e1cabcf69ae 100644 --- a/mcs/class/System/System.dll.sources +++ b/mcs/class/System/System.dll.sources @@ -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 diff --git a/mcs/class/System/monotouch_watch_System.dll.exclude.sources b/mcs/class/System/monotouch_watch_System.dll.exclude.sources index 8c6728097b7..8d7969bf906 100644 --- a/mcs/class/System/monotouch_watch_System.dll.exclude.sources +++ b/mcs/class/System/monotouch_watch_System.dll.exclude.sources @@ -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 -- 2.25.1