Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / TrustAdditions.cpp

diff --git a/OSX/libsecurity_keychain/lib/TrustAdditions.cpp b/OSX/libsecurity_keychain/lib/TrustAdditions.cpp
index b816318344d867ce8020ba8c24d7460aba22a6fb..0710cadb3a325ccb48fab9ead2715879558ab558 100644 (file)
--- a/OSX/libsecurity_keychain/lib/TrustAdditions.cpp
+++ b/OSX/libsecurity_keychain/lib/TrustAdditions.cpp
@@ -47,9 +47,9 @@
 #include <Security/cssmtype.h>
 #include <Security/cssmapplePriv.h>            // for CSSM_APPLE_TP_OCSP_OPTIONS, CSSM_APPLE_TP_OCSP_OPT_FLAGS
 
-#include "SecTrustPriv.h"
-#include "SecTrustSettings.h"
-#include "SecTrustSettingsPriv.h"
+#include <Security/SecTrustPriv.h>
+#include <Security/SecTrustSettings.h>
+#include <Security/SecTrustSettingsPriv.h>
 
 //
 // Macros
@@ -377,10 +377,11 @@ CFArrayRef potentialEVChainWithCertificates(CFArrayRef certificates)
 //
 static SecCertificateRef _rootCertificateWithSubjectOfCertificate(SecCertificateRef certificate)
 {
-    if (!certificate)
+    if (!certificate) {
         return NULL;
+    }
 
-       StLock<Mutex> _(SecTrustKeychainsGetMutex());
+    StLock<Mutex> _(SecTrustKeychainsGetMutex());
 
     // get data+length for the provided certificate
     CSSM_CL_HANDLE clHandle = 0;
@@ -416,7 +417,6 @@ static SecCertificateRef _rootCertificateWithSubjectOfCertificate(SecCertificate
     SecKeyRef keyRef = NULL;
     SecCertificateRef resultCert = NULL;
        // note: Sec* APIs are not re-entrant due to the API lock
-       // status = SecCertificateCopyPublicKey(certificate, &keyRef);
        BEGIN_SECAPI_INTERNAL_CALL
        keyRef = Certificate::required(certificate)->publicKey()->handle();
        END_SECAPI_INTERNAL_CALL
@@ -520,8 +520,9 @@ static SecCertificateRef _rootCertificateWithSubjectKeyIDOfCertificate(SecCertif
     SecCertificateRef resultCert = NULL;
        OSStatus status = errSecSuccess;
 
-    if (!certificate)
+    if (!certificate) {
         return NULL;
+    }
 
        StLock<Mutex> _(SecTrustKeychainsGetMutex());
 
@@ -558,8 +559,9 @@ CFArrayRef CF_RETURNS_RETAINED _possibleRootCertificatesForOidString(CFStringRef
 {
        StLock<Mutex> _(SecTrustKeychainsGetMutex());
 
-    if (!oidString)
+    if (!oidString) {
         return NULL;
+    }
        CFDictionaryRef evOidDict = _evCAOidDict();
        if (!evOidDict)
                return NULL;