Security-58286.260.20.tar.gz

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

diff --git a/OSX/libsecurity_keychain/lib/SecTrustOSXEntryPoints.cpp b/OSX/libsecurity_keychain/lib/SecTrustOSXEntryPoints.cpp
index ffe7e3a1eb0066abbf59fdb536bd2271d79b2138..49b9e3240a166ca0fd2b284a2250451411d8cc5f 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecTrustOSXEntryPoints.cpp
+++ b/OSX/libsecurity_keychain/lib/SecTrustOSXEntryPoints.cpp
@@ -28,6 +28,12 @@
 
 #include "SecTrustOSXEntryPoints.h"
 
+#include <CoreFoundation/CoreFoundation.h>
+#include <dispatch/dispatch.h>
+#include <AssertMacros.h>
+#include <notify.h>
+#include <mach/mach_time.h>
+
 #include <Security/Security.h>
 #include <Security/cssmtype.h>
 #include <Security/SecKeychain.h>
@@ -42,11 +48,6 @@
 #include <security_ocspd/ocspdClient.h>
 #include <security_ocspd/ocspdUtils.h>
 
-#include <CoreFoundation/CoreFoundation.h>
-#include <dispatch/dispatch.h>
-#include <AssertMacros.h>
-#include <notify.h>
-
 
 void SecTrustLegacySourcesListenForKeychainEvents(void) {
     /* Register for CertificateTrustNotification */
@@ -123,7 +124,7 @@ OSStatus SecTrustLegacyCRLStatus(SecCertificateRef cert, CFArrayRef chain, CFURL
 
     /* serialNumber is a CSSM_DATA with the value from the TBS Certificate. */
     CSSM_DATA serialNumber = { 0, NULL };
-    serialData = SecCertificateCopySerialNumber(cert, NULL);
+    serialData = SecCertificateCopySerialNumberData(cert, NULL);
     if (serialData) {
         serialNumber.Data = (uint8_t *)CFDataGetBytePtr(serialData);
         serialNumber.Length = CFDataGetLength(serialData);
@@ -229,6 +230,7 @@ static void async_ocspd_complete(async_ocspd_t *ocspd) {
 bool SecTrustLegacyCRLFetch(async_ocspd_t *ocspd,
                        CFURLRef currCRLDP, CFAbsoluteTime verifyTime,
                        SecCertificateRef cert, CFArrayRef chain) {
+    ocspd->start_time = mach_absolute_time();
     dispatch_async(ocspd->queue, ^ {
         OSStatus status = fetchCRL(currCRLDP, verifyTime);
         switch (status) {