From 8fc8307ad239922dc66edfdbd9aec758c5812651 Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Fri, 2 Oct 2015 16:25:32 -0700
Subject: [PATCH] Embed private key with the test X.509 certificate

- Use the PKCS #12 certificate format to enable this
---
 samples/SampleApp/Startup.cs                     |   9 +++++----
 .../HttpsConnectionFilterTests.cs                |   4 +++-
 .../TestResources/testCert.cer                   | Bin 759 -> 0 bytes
 .../TestResources/testCert.pfx                   | Bin 0 -> 2483 bytes
 4 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.cer
 create mode 100644 test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.pfx

diff --git a/samples/SampleApp/Startup.cs b/samples/SampleApp/Startup.cs
index c9a27b42ff..2f18d72aed 100644
--- a/samples/SampleApp/Startup.cs
+++ b/samples/SampleApp/Startup.cs
@@ -5,6 +5,7 @@ using System;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.Extensions.Logging;
+using Microsoft.Dnx.Runtime;
 
 #if DNX451
 using System.IO;
@@ -16,7 +17,7 @@ namespace SampleApp
 {
     public class Startup
     {
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IApplicationEnvironment env)
         {
             loggerFactory.MinimumLevel = LogLevel.Debug;
 
@@ -24,12 +25,12 @@ namespace SampleApp
 
 #if DNX451
             var testCertPath = Path.Combine(
-                Environment.CurrentDirectory,
-                @"../../test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.cer");
+                env.ApplicationBasePath,
+                @"../../test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.pfx");
 
             if (File.Exists(testCertPath))
             {
-                app.UseKestrelHttps(new X509Certificate2(testCertPath));
+                app.UseKestrelHttps(new X509Certificate2(testCertPath, "testPassword"));
             }
             else
             {
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/HttpsConnectionFilterTests.cs b/test/Microsoft.AspNet.Server.KestrelTests/HttpsConnectionFilterTests.cs
index 4a824be407..48167e7e68 100644
--- a/test/Microsoft.AspNet.Server.KestrelTests/HttpsConnectionFilterTests.cs
+++ b/test/Microsoft.AspNet.Server.KestrelTests/HttpsConnectionFilterTests.cs
@@ -49,7 +49,9 @@ namespace Microsoft.AspNet.Server.KestrelTests
                 var sereverAddress = "https://localhost:54321/";
                 var serviceContext = new TestServiceContext()
                 {
-                    ConnectionFilter = new HttpsConnectionFilter(new X509Certificate2(@"TestResources/testCert.cer"), new NoOpConnectionFilter())
+                    ConnectionFilter = new HttpsConnectionFilter(
+                        new X509Certificate2(@"TestResources/testCert.pfx", "testPassword"),
+                        new NoOpConnectionFilter())
                 };
 
                 using (var server = new TestServer(App, serviceContext, sereverAddress))
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.cer b/test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.cer
deleted file mode 100644
index 75b57442b0b06daab6eee9a4471002367504aa94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 759
zcmXqLV)|^*#CU%JGZP~dlR%07lTUkVe=Ku;yy#?0<a%=hPBvC;K4vCaRt5tRLm>kJ
zHs(+kW?{~p{N%)(jQrvf137VCLsJ7wLo)+2BO?Q&C?MAi&NYm}p{t2e$$*!QQ>)FR
z?K>|cBO@yVa}y&!1JEU0Oihf83<uYy7thN*_RBV}a^0gpymP#~zb}t5(sZ`Gwe@RN
zYKY*Jn+9b^7a2xOG(Rk`I{aznjn&%g4%}PP%8)(h_k*QJcXpgw>~S!O&2x2_dkOdV
z!W;KjWScQ)MikBPUMYLFH~ZZr?!LbkygSakJ^N$@NA(QPnuMLN8t?DgVV0U7cvp8;
z&H6~`Slx-cR!o$TdcOT{QP5Mz9%aormtUW9d32EbaG2nO-iqklrn*mNw{<!D_Dk!(
z<QMN2c7C;a({1Lpx-46-pWr%sBI?Ta%-AV4>!0Y9+kd~l)u@frN__g<`%=-<{`jo@
z@H{2_*5%WkQ3@eKyH9>@bo?Ze{%^H#VC$6dIOXt@Ow5c7jEg-D+zniTAuh|vVrO8}
zAh0xV%k)hQTV|drzdfBhQJ!a^81~?8!WWOgfM#T<+q&?}!uC@Re`RkS3jY5%YTYLL
zItvEB-8Ov|!5dc!{Nn$bvSESLlcVeUw2nM3<(+Wq6kneK;{wOz)CwbODc9(;9f?k7
zZb!v<{Bf*#cJR%)XRofWRjMfWJ0n}M;N}#Um$C{OH}Cc4CMms}ddbPnf$`Vr55=Wt
z?;1$P@caFin7Bgh>8Idh??scIulc#1b6?T-%iCh_RYaUnp6-A0&r5;&4U<ES`<xfq
z{}ESxUt?OcQD~{(22T#hU6n$`n<aX-e0#vfbh*vPI5y$=iP<mJp5Np-o_^dbJS<)(
tF{d^4UJ_^0o;ym$dli1PM|O2{Z1$Rw&=<wKC@^TB;B2AwMFBoL;{Xw9MIrzI

diff --git a/test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.pfx b/test/Microsoft.AspNet.Server.KestrelTests/TestResources/testCert.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..7118908c2d730670c16e9f8b2c532a262c951989
GIT binary patch
literal 2483
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

literal 0
HcmV?d00001