Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@@ -50,17 +50,17 @@ namespace Mono.Btls.Interface
public static X509Certificate CreateCertificate (byte[] data, BtlsX509Format format, bool disallowFallback = false)
{
return MonoBtlsProvider.CreateCertificate (data, (MonoBtlsX509Format)format, disallowFallback);
return MonoBtlsProvider.CreateCertificate (data, (MonoBtlsX509Format)format);
}
public static X509Certificate2 CreateCertificate2 (byte[] data, BtlsX509Format format, bool disallowFallback = false)
{
return MonoBtlsProvider.CreateCertificate2 (data, (MonoBtlsX509Format)format, disallowFallback);
return MonoBtlsProvider.CreateCertificate (data, (MonoBtlsX509Format)format);
}
public static X509Certificate2 CreateCertificate2 (byte[] data, string password, bool disallowFallback = false)
{
return MonoBtlsProvider.CreateCertificate2 (data, password, disallowFallback);
return MonoBtlsProvider.CreateCertificate (data, password);
}
public static BtlsX509Chain CreateNativeChain ()

View File

@@ -100,7 +100,8 @@ namespace Mono.Btls.Interface
public Oid GetSignatureAlgorithm ()
{
return Instance.GetSignatureAlgorithm ();
var algorithm = Instance.GetSignatureAlgorithm ();
return Oid.FromOidValue (algorithm, OidGroup.SignatureAlgorithm);
}
public AsnEncodedData GetPublicKeyAsn1 ()