huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make CertificateLoader public #11312 (#11655)

This commit is contained in:
Chris Ross 2019-06-27 14:04:32 -07:00 committed by GitHub
parent b957b75a54
commit 2e7c52d97c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs
View File

@ -242,6 +242,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
} }
namespace Microsoft.AspNetCore.Server.Kestrel.Https namespace Microsoft.AspNetCore.Server.Kestrel.Https
{ {
public static partial class CertificateLoader
{
public static System.Security.Cryptography.X509Certificates.X509Certificate2 LoadFromStoreCert(string subject, string storeName, System.Security.Cryptography.X509Certificates.StoreLocation storeLocation, bool allowInvalid) { throw null; }
}
public enum ClientCertificateMode public enum ClientCertificateMode
{ {
NoCertificate = 0, NoCertificate = 0,
@ -262,10 +266,3 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https
public void AllowAnyClientCertificate() { } public void AllowAnyClientCertificate() { }
} }
} }
namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal
{
public static partial class CertificateLoader
{
public static System.Security.Cryptography.X509Certificates.X509Certificate2 LoadFromStoreCert(string subject, string storeName, System.Security.Cryptography.X509Certificates.StoreLocation storeLocation, bool allowInvalid) { throw null; }
}
}

2
src/Servers/Kestrel/Core/src/CertificateLoader.cs
View File

@ -6,7 +6,7 @@ using System.Linq;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core;
namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal namespace Microsoft.AspNetCore.Server.Kestrel.Https
{ {
public static class CertificateLoader public static class CertificateLoader
{ {

2
src/Servers/Kestrel/samples/SampleApp/Startup.cs
View File

@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.AspNetCore.Server.Kestrel.Https.Internal; using Microsoft.AspNetCore.Server.Kestrel.Https;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;

2
src/Servers/Kestrel/test/InMemory.FunctionalTests/CertificateLoaderTests.cs
View File

@ -3,7 +3,7 @@
using System.Linq; using System.Linq;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using Microsoft.AspNetCore.Server.Kestrel.Https.Internal; using Microsoft.AspNetCore.Server.Kestrel.Https;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Logging.Testing;
using Xunit; using Xunit;