From 741d5b57ee9a517a2e941b0f90e1e074c04f2236 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Thu, 19 Jun 2014 11:55:37 -0700
Subject: [PATCH] Include client certificate feature renames.

---
 .../FeatureContext.cs                                    | 9 +++++----
 .../HttpsTests.cs                                        | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
index 0a92682721..195dbdc82e 100644
--- a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
@@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Server.WebListener
         IHttpConnectionFeature,
         IHttpResponseFeature,
         IHttpSendFileFeature,
-        IHttpTransportLayerSecurityFeature,
+        IHttpClientCertificateFeature,
         IHttpRequestLifetimeFeature,
         IHttpWebSocketFeature,
         IHttpOpaqueUpgradeFeature
@@ -89,7 +89,7 @@ namespace Microsoft.AspNet.Server.WebListener
             if (Request.IsSecureConnection)
             {
                 // TODO: Should this feature be conditional? Should we add this for HTTP requests?
-                _features.Add(typeof(IHttpTransportLayerSecurityFeature), this);
+                _features.Add(typeof(IHttpClientCertificateFeature), this);
             }
             _features.Add(typeof(IHttpResponseFeature), this);
             _features.Add(typeof(IHttpSendFileFeature), this);
@@ -295,7 +295,7 @@ namespace Microsoft.AspNet.Server.WebListener
             set { _remotePort = value; }
         }
 
-        X509Certificate IHttpTransportLayerSecurityFeature.ClientCertificate
+        X509Certificate IHttpClientCertificateFeature.ClientCertificate
         {
             get
             {
@@ -308,12 +308,13 @@ namespace Microsoft.AspNet.Server.WebListener
             set { _clientCert = value; }
         }
 
-        async Task IHttpTransportLayerSecurityFeature.LoadAsync()
+        async Task<X509Certificate> IHttpClientCertificateFeature.GetClientCertificateAsync()
         {
             if (_clientCert == null)
             {
                 _clientCert = await Request.GetClientCertificateAsync();
             }
+            return _clientCert;
         }
 
         Stream IHttpResponseFeature.Body
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs
index 1257d82d7b..08e662a2f3 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs
@@ -85,9 +85,9 @@ namespace Microsoft.AspNet.Server.WebListener
             using (Utilities.CreateHttpsServer(async env =>
             {
                 var httpContext = new DefaultHttpContext((IFeatureCollection)env);
-                var tls = httpContext.GetFeature<IHttpTransportLayerSecurityFeature>();
+                var tls = httpContext.GetFeature<IHttpClientCertificateFeature>();
                 Assert.NotNull(tls);
-                await tls.LoadAsync();
+                await tls.GetClientCertificateAsync();
                 Assert.Null(tls.ClientCertificate);
             }))
             {
@@ -102,9 +102,9 @@ namespace Microsoft.AspNet.Server.WebListener
             using (Utilities.CreateHttpsServer(async env =>
             {
                 var httpContext = new DefaultHttpContext((IFeatureCollection)env);
-                var tls = httpContext.GetFeature<IHttpTransportLayerSecurityFeature>();
+                var tls = httpContext.GetFeature<IHttpClientCertificateFeature>();
                 Assert.NotNull(tls);
-                await tls.LoadAsync();
+                await tls.GetClientCertificateAsync();
                 Assert.NotNull(tls.ClientCertificate);
             }))
             {