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 4465256b5fc55f9c52e366a391037e5095a2e66b..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 <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
 
 //
 // Macros


@@ -377,10 +377,11 @@ CFArrayRef potentialEVChainWithCertificates(CFArrayRef certificates)
 //
 static SecCertificateRef _rootCertificateWithSubjectOfCertificate(SecCertificateRef certificate)
 {
 //
 static SecCertificateRef _rootCertificateWithSubjectOfCertificate(SecCertificateRef certificate)
 {

-    if (!certificate)
+    if (!certificate) {

         return NULL;
         return NULL;

+    }

 
 

-       StLock<Mutex> _(SecTrustKeychainsGetMutex());
+    StLock<Mutex> _(SecTrustKeychainsGetMutex());

 
     // get data+length for the provided certificate
     CSSM_CL_HANDLE clHandle = 0;
 
     // get data+length for the provided certificate
     CSSM_CL_HANDLE clHandle = 0;


@@ -519,8 +520,9 @@ static SecCertificateRef _rootCertificateWithSubjectKeyIDOfCertificate(SecCertif
     SecCertificateRef resultCert = NULL;
        OSStatus status = errSecSuccess;
 
     SecCertificateRef resultCert = NULL;
        OSStatus status = errSecSuccess;
 

-    if (!certificate)
+    if (!certificate) {

         return NULL;
         return NULL;

+    }

 
        StLock<Mutex> _(SecTrustKeychainsGetMutex());
 
 
        StLock<Mutex> _(SecTrustKeychainsGetMutex());
 


@@ -557,8 +559,9 @@ CFArrayRef CF_RETURNS_RETAINED _possibleRootCertificatesForOidString(CFStringRef
 {
        StLock<Mutex> _(SecTrustKeychainsGetMutex());
 
 {
        StLock<Mutex> _(SecTrustKeychainsGetMutex());
 

-    if (!oidString)
+    if (!oidString) {

         return NULL;
         return NULL;

+    }

        CFDictionaryRef evOidDict = _evCAOidDict();
        if (!evOidDict)
                return NULL;
        CFDictionaryRef evOidDict = _evCAOidDict();
        if (!evOidDict)
                return NULL;