From 5444b0ce2a69f5a93ddf53f28a506e281e3c3f01 Mon Sep 17 00:00:00 2001
From: Martin Baulig <martin.baulig@xamarin.com>
Date: Tue, 14 Apr 2015 16:12:30 +0200
Subject: [PATCH] Include the OpenSSL backend in the Mac UI.

---
 .../Mono.Security.NewTls.TestProvider.csproj  | 41 ++++++++++++++++++-
 external/web-tests                            |  2 +-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Mac/Mono.Security.NewTls.TestProvider/Mono.Security.NewTls.TestProvider.csproj b/Mac/Mono.Security.NewTls.TestProvider/Mono.Security.NewTls.TestProvider.csproj
index c7d6418..cda32b7 100644
--- a/Mac/Mono.Security.NewTls.TestProvider/Mono.Security.NewTls.TestProvider.csproj
+++ b/Mac/Mono.Security.NewTls.TestProvider/Mono.Security.NewTls.TestProvider.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;MACUI</DefineConstants>
+    <DefineConstants>DEBUG;MACUI;HAVE_OPENSSL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -29,6 +29,8 @@
     <CreatePackage>false</CreatePackage>
     <EnableCodeSigning>false</EnableCodeSigning>
     <EnablePackageSigning>false</EnablePackageSigning>
+    <PlatformTarget>x86</PlatformTarget>
+    <XamMacArch>i386</XamMacArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
@@ -42,7 +44,7 @@
     <CreatePackage>false</CreatePackage>
     <EnableCodeSigning>false</EnableCodeSigning>
     <EnablePackageSigning>false</EnablePackageSigning>
-    <DefineConstants>MACUI</DefineConstants>
+    <DefineConstants>MACUI;HAVE_OPENSSL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -158,6 +160,27 @@
       <Link>AppDelegate.designer.cs</Link>
     </Compile>
     <Compile Include="BuiltinTestServer.cs" />
+    <Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\NativeCryptoProvider.cs">
+      <Link>Mono.Security.NewTls.TestProvider\NativeCryptoProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\NativeOpenSsl.cs">
+      <Link>Mono.Security.NewTls.TestProvider\NativeOpenSsl.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\NativeOpenSslError.cs">
+      <Link>Mono.Security.NewTls.TestProvider\NativeOpenSslError.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\NativeOpenSslException.cs">
+      <Link>Mono.Security.NewTls.TestProvider\NativeOpenSslException.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\OpenSslClient.cs">
+      <Link>Mono.Security.NewTls.TestProvider\OpenSslClient.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\OpenSslConnection.cs">
+      <Link>Mono.Security.NewTls.TestProvider\OpenSslConnection.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Mono.Security.NewTls.TestProvider\Mono.Security.NewTls.TestProvider\OpenSslServer.cs">
+      <Link>Mono.Security.NewTls.TestProvider\OpenSslServer.cs</Link>
+    </Compile>
   </ItemGroup>
   <Import Project="..\..\external\web-tests\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.projitems" Label="Shared" Condition="Exists('..\..\external\web-tests\Xamarin.AsyncTests.PortableImpl\Xamarin.AsyncTests.PortableImpl.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
@@ -222,4 +245,18 @@
       <Link>MainMenu.xib</Link>
     </InterfaceDefinition>
   </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="..\..\lib\libcrypto.1.0.0.dylib">
+      <Link>libcrypto.1.0.0.dylib</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </BundleResource>
+    <BundleResource Include="..\..\lib\libNativeOpenSsl.dylib">
+      <Link>libNativeOpenSsl.dylib</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </BundleResource>
+    <BundleResource Include="..\..\lib\libssl.1.0.0.dylib">
+      <Link>libssl.1.0.0.dylib</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </BundleResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/external/web-tests b/external/web-tests
index f1ecef5..7a234d9 160000
--- a/external/web-tests
+++ b/external/web-tests
@@ -1 +1 @@
-Subproject commit f1ecef52752db315dad3a4a5c93b40028dd3cfa7
+Subproject commit 7a234d93c7bae62e3304995f96b62897dbc4e8cc