Imported Upstream version 6.6.0.89

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

View File

@@ -33,10 +33,14 @@
extern alias MonoSecurity;
using MonoSecurity::Mono.Security;
using MonoSecurity::Mono.Security.Cryptography;
using MonoSecurity::Mono.Security.Authenticode;
using MX = MonoSecurity::Mono.Security.X509;
#else
using Mono.Security;
using Mono.Security.Cryptography;
#if !MONOTOUCH_WATCH
using Mono.Security.Authenticode;
#endif
using MX = Mono.Security.X509;
#endif
@@ -97,6 +101,15 @@ namespace System.Security.Cryptography.X509Certificates
_cert = new MX.X509Certificate (rawData);
break;
#if !MONOTOUCH_WATCH
case X509ContentType.Authenticode:
AuthenticodeDeformatter ad = new AuthenticodeDeformatter (rawData);
_cert = ad.SigningCertificate;
if (_cert == null)
goto default;
break;
#endif
default:
string msg = Locale.GetText ("Unable to decode certificate.");
throw new CryptographicException (msg);