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

@ -26,8 +26,12 @@
#if MONO_SECURITY_ALIAS
extern alias MonoSecurity;
using MonoSecurity::Mono.Security;
using MonoSecurity::Mono.Security.Authenticode;
#else
using Mono.Security;
#if !MONOTOUCH_WATCH
using Mono.Security.Authenticode;
#endif
#endif
using System;
@ -126,7 +130,17 @@ namespace Mono
return X509ContentType.Cert;
}
return X509ContentType.Unknown;
#if MONOTOUCH_WATCH
return X509ContentType.Unknown;
#else
try {
AuthenticodeDeformatter ad = new AuthenticodeDeformatter (rawData);
return X509ContentType.Authenticode;
} catch {
return X509ContentType.Unknown;
}
#endif
}
public X509ContentType GetCertContentType (string fileName)