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

Imported Upstream version 6.6.0.89

Browse Source 
Former-commit-id: b39a328747c2f3414dc52e009fb6f0aa80ca2492
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-09-24 08:53:40 +00:00
parent cf815e07e0
commit 95fdb59ea6
2556 changed files with 138145 additions and 47453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs
View File

@@ -31,9 +31,11 @@ extern alias MonoSecurity;
#if MONO_SECURITY_ALIAS
using MX = MonoSecurity::Mono.Security.X509;
using MonoSecurity::Mono.Security.Cryptography;
using MonoSecurity::Mono.Security.Authenticode;
#else
using MX = Mono.Security.X509;
using Mono.Security.Cryptography;
using Mono.Security.Authenticode;
#endif
using System;
@@ -86,9 +88,13 @@ namespace Mono.Btls
try {
ImportPkcs12 (data, null);
} catch {
string msg = Locale.GetText ("Unable to decode certificate.");
// inner exception is the original (not second) exception
throw new CryptographicException (msg, e);
try {
ImportAuthenticode (data);
} catch {
string msg = Locale.GetText ("Unable to decode certificate.");
// inner exception is the original (not second) exception
throw new CryptographicException (msg, e);
}
}
}
} else {
@@ -101,9 +107,13 @@ namespace Mono.Btls
// fix bug #79028
Import (data);
} catch {
string msg = Locale.GetText ("Unable to decode certificate.");
// inner exception is the original (not second) exception
throw new CryptographicException (msg, e);
try {
ImportAuthenticode (data);
} catch {
string msg = Locale.GetText ("Unable to decode certificate.");
// inner exception is the original (not second) exception
throw new CryptographicException (msg, e);
}
}
}
}
@@ -188,7 +198,14 @@ namespace Mono.Btls
set {
if (nativePrivateKey != null)
nativePrivateKey.Dispose ();
nativePrivateKey = null;
try {
// FIXME: there doesn't seem to be a public API to check whether it actually
// contains a private key (apart from RSAManaged.PublicOnly).
if (value != null)
nativePrivateKey = MonoBtlsKey.CreateFromRSAPrivateKey ((RSA)value);
} catch {
nativePrivateKey = null;
}
}
}
@@ -261,6 +278,14 @@ namespace Mono.Btls
}
}
void ImportAuthenticode (byte[] data)
{
if (data != null) {
AuthenticodeDeformatter ad = new AuthenticodeDeformatter (data);
Import (ad.SigningCertificate.RawData);
}
}
public override bool Verify (X509Certificate2 thisCertificate)
{
using (var chain = new MonoBtlsX509Chain ()) {