mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.8.0.73

Browse Source 
Former-commit-id: d18deab1b47cfd3ad8cba82b3f37d00eec2170af
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-12-10 18:00:56 +00:00
parent bceda29824
commit 73ee7591e8
1043 changed files with 16271 additions and 22080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System/Mono.AppleTls/AppleCertificateHelper.cs
View File

@@ -14,9 +14,11 @@ extern alias MonoSecurity;
using System;
using System.Collections;
using System.Reflection;
using System.Net.Security;
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using MNS = Mono.Net.Security;
#if MONO_SECURITY_ALIAS
using MonoSecurity::Mono.Security.Interface;
#else
@@ -116,12 +118,12 @@ namespace Mono.AppleTls
}
public static bool InvokeSystemCertificateValidator (
ICertificateValidator2 validator, string targetHost, bool serverMode,
MNS.ChainValidationHelper validator, string targetHost, bool serverMode,
X509CertificateCollection certificates,
ref MonoSslPolicyErrors errors, ref int status11)
ref SslPolicyErrors errors, ref int status11)
{
if (certificates == null) {
errors |= MonoSslPolicyErrors.RemoteCertificateNotAvailable;
errors |= SslPolicyErrors.RemoteCertificateNotAvailable;
return false;
}
@@ -150,7 +152,7 @@ namespace Mono.AppleTls
if (result == SecTrustResult.Unspecified || result == SecTrustResult.Proceed)
return true;
errors |= MonoSslPolicyErrors.RemoteCertificateChainErrors;
errors |= SslPolicyErrors.RemoteCertificateChainErrors;
return false;
}
}

15
mcs/class/System/Mono.AppleTls/AppleTlsProvider.cs
View File

@@ -28,7 +28,7 @@ using Mono.Security.Interface;
namespace Mono.AppleTls
{
class AppleTlsProvider : MonoTlsProvider
class AppleTlsProvider : MNS.MobileTlsProvider
{
public override string Name {
get { return "apple-tls"; }
@@ -38,14 +38,7 @@ namespace Mono.AppleTls
get { return MNS.MonoTlsProviderFactory.AppleTlsId; }
}
public override IMonoSslStream CreateSslStream (
Stream innerStream, bool leaveInnerStreamOpen,
MonoTlsSettings settings = null)
{
return SslStream.CreateMonoSslStream (innerStream, leaveInnerStreamOpen, this, settings);
}
internal override IMonoSslStream CreateSslStreamInternal (
internal override MNS.MobileAuthenticatedStream CreateSslStream (
SslStream sslStream, Stream innerStream, bool leaveInnerStreamOpen,
MonoTlsSettings settings)
{
@@ -73,9 +66,9 @@ namespace Mono.AppleTls
}
internal override bool ValidateCertificate (
ICertificateValidator2 validator, string targetHost, bool serverMode,
MNS.ChainValidationHelper validator, string targetHost, bool serverMode,
X509CertificateCollection certificates, bool wantsChain, ref X509Chain chain,
ref MonoSslPolicyErrors errors, ref int status11)
ref SslPolicyErrors errors, ref int status11)
{
if (wantsChain)
chain = MNS.SystemCertificateValidator.CreateX509Chain (certificates);

2
mcs/class/System/Mono.AppleTls/AppleTlsStream.cs
View File

@@ -31,7 +31,7 @@ namespace Mono.AppleTls
class AppleTlsStream : MNS.MobileAuthenticatedStream
{
public AppleTlsStream (Stream innerStream, bool leaveInnerStreamOpen, SslStream owner,
MonoTlsSettings settings, MonoTlsProvider provider)
MonoTlsSettings settings, MNS.MobileTlsProvider provider)
: base (innerStream, leaveInnerStreamOpen, owner, settings, provider)
{
}