certInKeychain returns a bool

Author: Xayton

certificates/certificates.h

@@ -2,6 +2,6 @@ const char *getDefaultBrowserName();
 
 const char *installCert(const char *path);
 const char *uninstallCert();
-const char *certInKeychain();
+const bool certInKeychain();
 
 const char *getExpirationDate(long *expirationDate);

certificates/certificates.m

@@ -8,6 +8,7 @@
     return [errString cStringUsingEncoding:[NSString defaultCStringEncoding]];
 }
 
+// Returns a string describing the name of the default browser set for the user, nil in case of error.
 const char *getDefaultBrowserName() {
     NSURL *defaultBrowserURL = [[NSWorkspace sharedWorkspace] URLForApplicationToOpenURL:[NSURL URLWithString:@"http://"]];
     if (defaultBrowserURL) {
@@ -87,23 +88,16 @@
     return "";
 }
 
-const char *certInKeychain() {
-    // Each line is a key-value of the dictionary. Note: the the inverted order, value first then key.
-    NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys:
-        (id)kSecClassCertificate, kSecClass,
-        CFSTR("Arduino"), kSecAttrLabel,
-        kSecMatchLimitOne, kSecMatchLimit,
-        kCFBooleanTrue, kSecReturnAttributes,
-        nil];
+const bool certInKeychain() {
+    // Create a key-value dictionary used to query the Keychain and look for the "Arduino" root certificate.
+    NSDictionary *getquery = @{
+                (id)kSecClass:     (id)kSecClassCertificate,
+                (id)kSecAttrLabel: @"Arduino",
+                (id)kSecReturnRef: @YES,
+            };
 
-    OSStatus err = noErr;
-    // Use this function to check for errors
-    err = SecItemCopyMatching((CFDictionaryRef)dict, nil);
-    NSString *exists = @"false";
-    if (err == noErr) {
-        exists = @"true";
-    }
-    return [exists cStringUsingEncoding:[NSString defaultCStringEncoding]];
+    OSStatus err = SecItemCopyMatching((CFDictionaryRef)getquery, nil);
+    return (err == noErr); // No error means the certificate was found, otherwise err will be "errSecItemNotFound".
 }
 
 // Returns the expiration date "kSecOIDX509V1ValidityNotAfter" of the Arduino certificate.

certificates/install_darwin.go

@@ -96,8 +96,7 @@ func GetDefaultBrowserName() string {
 // CertInKeychain checks if the certificate is stored inside the keychain
 func CertInKeychain() bool {
 	log.Infof("Checking if the Arduino certificate is in the keychain")
-	p := C.certInKeychain()
-	s := C.GoString(p)
 
-	return s == "true"
+	certInKeychain := C.certInKeychain()
+	return bool(certInKeychain)
 }