diff options
| author | Martin Baulig <martin.baulig@xamarin.com> | 2015-10-30 19:41:09 +0300 |
|---|---|---|
| committer | Martin Baulig <martin.baulig@xamarin.com> | 2015-10-30 19:41:09 +0300 |
| commit | 10c67fe6bdf9e23012d32ceb2c2db7360fd26ff0 (patch) | |
| tree | 6e09e1e0e4881640497059ce20a84da86c99ec83 /mcs/class/System/System.Security.Cryptography.X509Certificates | |
| parent | 0eb394dab54d177420747de0dc2cf7c47eaaeade (diff) | |
[System]: Cleanup 'ChainValidationHelper', moving the actual validation code into a new class.
The actual validation code now lives in 'SystemCertificateValidator', whereas
'ChainValidationHelper' contains all the glue code which deals with 'ServicePointManager',
user-supplied callbacks, etc.
Diffstat (limited to 'mcs/class/System/System.Security.Cryptography.X509Certificates')
| -rw-r--r-- | mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs index b2ecd95b45a..6cb1c239e8b 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs @@ -21,12 +21,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // #if SECURITY_DEP +#if MONO_X509_ALIAS +extern alias PrebuiltSystem; +#endif -#if MONOTOUCH || MONODROID -using MSX = Mono.Security.X509; +#if MONO_X509_ALIAS +using XX509CertificateCollection = PrebuiltSystem::System.Security.Cryptography.X509Certificates.X509CertificateCollection; #else -extern alias MonoSecurity; -using MSX = MonoSecurity::Mono.Security.X509; +using XX509CertificateCollection = System.Security.Cryptography.X509Certificates.X509CertificateCollection; #endif using System; @@ -93,7 +95,7 @@ namespace System.Security.Cryptography.X509Certificates { } } - public static SecTrustResult TrustEvaluateSsl (X509Certificate2Collection certificates, string host) + public static SecTrustResult TrustEvaluateSsl (XX509CertificateCollection certificates, string host) { if (certificates == null) return SecTrustResult.Deny; @@ -105,7 +107,7 @@ namespace System.Security.Cryptography.X509Certificates { } } - static SecTrustResult _TrustEvaluateSsl (X509Certificate2Collection certificates, string hostName) + static SecTrustResult _TrustEvaluateSsl (XX509CertificateCollection certificates, string hostName) { int certCount = certificates.Count; IntPtr [] cfDataPtrs = new IntPtr [certCount]; @@ -118,7 +120,7 @@ namespace System.Security.Cryptography.X509Certificates { try { for (int i = 0; i < certCount; i++) - cfDataPtrs [i] = MakeCFData (certificates [i].RawData); + cfDataPtrs [i] = MakeCFData (certificates [i].GetRawCertData ()); for (int i = 0; i < certCount; i++){ secCerts [i] = SecCertificateCreateWithData (IntPtr.Zero, cfDataPtrs [i]); |