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

System.Security.Cryptography fails on WASM (#25285)

This commit is contained in:
Brennan 2020-08-31 13:53:55 -07:00 committed by GitHub
parent 80662903a2
commit a73ae505a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnectionFactory.cs
View File

@ -82,11 +82,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
// Internal for testing
internal static HttpConnectionOptions ShallowCopyHttpConnectionOptions(HttpConnectionOptions options)
{
return new HttpConnectionOptions
var newOptions = new HttpConnectionOptions
{
HttpMessageHandlerFactory = options.HttpMessageHandlerFactory,
Headers = options.Headers,
ClientCertificates = options.ClientCertificates,
Cookies = options.Cookies,
Url = options.Url,
Transports = options.Transports,
@ -99,6 +98,14 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
DefaultTransferFormat = options.DefaultTransferFormat,
WebSocketConfiguration = options.WebSocketConfiguration,
};
// WASM doesn't support Crypto APIs and our setter throws if you try to assign null
if (options.ClientCertificates != null)
{
newOptions.ClientCertificates = options.ClientCertificates;
}
return newOptions;
}
}
}

9
src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnectionOptions.cs
View File

@ -10,6 +10,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections;
using Microsoft.AspNetCore.Http.Connections.Client.Internal;
namespace Microsoft.AspNetCore.Http.Connections.Client
{
@ -28,7 +29,13 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
public HttpConnectionOptions()
{
_headers = new Dictionary<string, string>();
_clientCertificates = new X509CertificateCollection();
// System.Security.Cryptography isn't supported on WASM currently
if (!Utils.IsRunningInBrowser())
{
_clientCertificates = new X509CertificateCollection();
}
_cookies = new CookieContainer();
Transports = HttpTransports.All;