Skip to content

[security] Add new SecCertificateCopyKey and SecTrustEvaluateWithError API with unit tests #4784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spouliot merged 4 commits into from
Sep 11, 2018
Merged

[security] Add new SecCertificateCopyKey and SecTrustEvaluateWithError API with unit tests #4784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
973a05c
[security] Add new SecCertificateCopyKey and SecTrustEvaluateWithErro…
Sep 11, 2018
4c148f2
Merge branch 'xcode10' into xcode10-security-api
spouliot Sep 11, 2018
0da70c1
merge
Sep 11, 2018
2e27f3b
Merge branch 'xcode10-security-api' of github.com:spouliot/xamarin-ma…
Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/Security/Certificate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ internal static bool Equals (SecCertificate first, SecCertificate second)
[DllImport (Constants.SecurityLibrary)]
extern static /* CFDictionaryRef */ IntPtr SecCertificateCopyValues (/* SecCertificateRef */ IntPtr certificate, /* CFArrayRef */ IntPtr keys, /* CFErrorRef _Nullable * */ IntPtr error);

[Deprecated (PlatformName.MacOSX, 10,14, message: "Use 'GetKey' instead.")]
public NSData GetPublicKey ()
{
if (handle == IntPtr.Zero)
Expand Down Expand Up @@ -270,12 +271,26 @@ public NSData GetPublicKey ()
static extern /* __nullable SecKeyRef */ IntPtr SecCertificateCopyPublicKey (IntPtr /* SecCertificateRef */ certificate);

[iOS (10,3)]
[Deprecated (PlatformName.iOS, 12,0, message: "Use 'GetKey' instead.")]
[Deprecated (PlatformName.TvOS, 12,0, message: "Use 'GetKey' instead.")]
[Deprecated (PlatformName.WatchOS, 5,0, message: "Use 'GetKey' instead.")]
public SecKey GetPublicKey ()
{
IntPtr data = SecCertificateCopyPublicKey (handle);
return (data == IntPtr.Zero) ? null : new SecKey (data, true);
}
#endif
[TV (12,0)][Mac (10,14, onlyOn64: true)][iOS (12,0)][Watch (5,0)]
[DllImport (Constants.SecurityLibrary)]
static extern IntPtr /* SecKeyRef* */ SecCertificateCopyKey (IntPtr /* SecKeyRef* */ key);

[TV (12,0)][Mac (10,14, onlyOn64: true)][iOS (12,0)][Watch (5,0)]
public SecKey GetKey ()
{
var key = SecCertificateCopyKey (handle);
return key == IntPtr.Zero ? null : new SecKey (key, true);
}

[iOS (10,3)] // [Mac (10,5)]
[DllImport (Constants.SecurityLibrary)]
static extern /* OSStatus */ int SecCertificateCopyCommonName (IntPtr /* SecCertificateRef */ certificate, out IntPtr /* CFStringRef * __nonnull CF_RETURNS_RETAINED */ commonName);
Expand Down
12 changes: 12 additions & 0 deletions src/Security/SecTrust.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,18 @@ public SecTrustResult GetTrustResult ()
return trust_result;
}

[Watch (5,0)][TV (12,0)][Mac (10,14, onlyOn64: true)][iOS (12,0)]
[DllImport (Constants.SecurityLibrary)]
static extern bool SecTrustEvaluateWithError (/* SecTrustRef */ IntPtr trust, out /* CFErrorRef** */ IntPtr error);

[Watch (5,0)][TV (12,0)][Mac (10,14, onlyOn64: true)][iOS (12,0)]
public bool Evaluate (out NSError error)
{
var result = SecTrustEvaluateWithError (handle, out var err);
error = err == IntPtr.Zero ? null : new NSError (err);
return result;
}

[iOS (7,0)][Mac (10,9)]
[DllImport (Constants.SecurityLibrary)]
extern static IntPtr /* CFDictionaryRef */ SecTrustCopyResult (IntPtr /* SecTrustRef */ trust);
Expand Down
3 changes: 3 additions & 0 deletions tests/monotouch-test/Security/CertificateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,9 @@ void CheckMailGoogleCom (SecCertificate cert, int expectedRetainCount)
Assert.That (cert.GetSerialNumber (out err).Description, Is.EqualTo ("<2b9f7ee5 ca25a625 14204782 753a9bb9>"), "GetSerialNumber/NSError");
Assert.Null (err, "err") ;
}
if (TestRuntime.CheckXcodeVersion (10,0)) {
Assert.NotNull (cert.GetKey (), "GetKey");
}
}

[Test]
Expand Down
8 changes: 8 additions & 0 deletions tests/monotouch-test/Security/TrustTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,10 @@ void Trust_NoRoot (SecTrust trust, SecPolicy policy)
using (SecKey pkey = trust.GetPublicKey ()) {
Assert.That (CFGetRetainCount (pkey.Handle), Is.GreaterThanOrEqualTo ((nint) 1), "RetainCount(pkey)");
}
if (TestRuntime.CheckXcodeVersion (10,0)) {
Assert.False (trust.Evaluate (out var error), "Evaluate");
Assert.NotNull (error, "error");
}
}

[Test]
Expand Down Expand Up @@ -358,6 +362,10 @@ void Trust_FullChain (SecTrust trust, SecPolicy policy, X509CertificateCollectio
// since we modified the `trust` instance it's result was invalidated (marked as unspecified on iOS 11)
Assert.That (trust.GetTrustResult (), Is.EqualTo (trust_result), "GetTrustResult-2");
}
if (TestRuntime.CheckXcodeVersion (10,0)) {
Assert.True (trust.Evaluate (out var error), "Evaluate");
Assert.Null (error, "error");
}
}

[Test]
Expand Down
2 changes: 0 additions & 2 deletions tests/xtro-sharpie/iOS-Security.todo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@
!missing-pinvoke! sec_protocol_metadata_create_secret_with_context is not bound
!missing-pinvoke! sec_protocol_options_set_challenge_block is not bound
!missing-pinvoke! sec_protocol_options_set_verify_block is not bound
!missing-pinvoke! SecCertificateCopyKey is not bound
!missing-pinvoke! SecTrustEvaluateWithError is not bound
2 changes: 0 additions & 2 deletions tests/xtro-sharpie/macOS-Security.todo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@
!missing-pinvoke! sec_protocol_metadata_create_secret_with_context is not bound
!missing-pinvoke! sec_protocol_options_set_challenge_block is not bound
!missing-pinvoke! sec_protocol_options_set_verify_block is not bound
!missing-pinvoke! SecCertificateCopyKey is not bound
!missing-pinvoke! SecTrustEvaluateWithError is not bound
2 changes: 0 additions & 2 deletions tests/xtro-sharpie/tvOS-Security.todo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@
!missing-pinvoke! sec_protocol_metadata_create_secret_with_context is not bound
!missing-pinvoke! sec_protocol_options_set_challenge_block is not bound
!missing-pinvoke! sec_protocol_options_set_verify_block is not bound
!missing-pinvoke! SecCertificateCopyKey is not bound
!missing-pinvoke! SecTrustEvaluateWithError is not bound
2 changes: 0 additions & 2 deletions tests/xtro-sharpie/watchOS-Security.todo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@
!missing-pinvoke! sec_protocol_metadata_create_secret_with_context is not bound
!missing-pinvoke! sec_protocol_options_set_challenge_block is not bound
!missing-pinvoke! sec_protocol_options_set_verify_block is not bound
!missing-pinvoke! SecCertificateCopyKey is not bound
!missing-pinvoke! SecTrustEvaluateWithError is not bound