Mach-O/KernelCache warning cleanup

3 files changed, 8 insertions, 11 deletions

diff --git a/view/kernelcache/core/KernelCache.cpp b/view/kernelcache/core/KernelCache.cpp
index 36f3331b..cf3be5c7 100644
--- a/view/kernelcache/core/KernelCache.cpp
+++ b/view/kernelcache/core/KernelCache.cpp
@@ -131,7 +131,7 @@ void KernelCache::ProcessRelocations(Ref<BinaryView> view, linkedit_data_command
 			fixupsHeader.imports_format = parentReader.Read32();
 			fixupsHeader.symbols_format = parentReader.Read32();
 
-			LogDebug("Chained Fixups: Header @ %llx // Fixups version %lx", fixupHeaderAddress, fixupsHeader.fixups_version);
+			LogDebugF("Chained Fixups: Header @ 0x{:x}// Fixups version 0x{:x}", fixupHeaderAddress, fixupsHeader.fixups_version);
 
 			if (fixupsHeader.fixups_version > 0)
 			{
@@ -204,14 +204,14 @@ void KernelCache::ProcessRelocations(Ref<BinaryView> view, linkedit_data_command
 					break;
 				default:
 				{
-					LogError("Chained Fixups: Unknown or unsupported pointer format %d, "
-						"unable to process chains for segment at @llx", starts.pointer_format, starts.segment_offset);
+					LogErrorF("Chained Fixups: Unknown or unsupported pointer format {}, "
+						"unable to process chains for segment at 0x{:x}", starts.pointer_format, starts.segment_offset);
 					continue;
 				}
 				}
 
 				uint16_t fmt = starts.pointer_format;
-				LogDebug("Chained Fixups: Segment start @ %llx, fmt %d", starts.segment_offset, fmt);
+				LogDebugF("Chained Fixups: Segment start @ 0x{:x}, fmt {}", starts.segment_offset, fmt);
 
 				uint64_t pageStartsTableStartAddress = parentReader.GetOffset();
 				std::vector<std::vector<uint16_t>> pageStartOffsets {};
@@ -299,7 +299,7 @@ void KernelCache::ProcessRelocations(Ref<BinaryView> view, linkedit_data_command
 								bind = false;
 							}
 
-							LogTrace("Chained Fixups: @ 0x%llx ( 0x%llx ) - %d 0x%llx", chainEntryAddress,
+							LogTraceF("Chained Fixups: @ 0x{:x} ( 0x{:x} ) - {} 0x{:x}", chainEntryAddress,
 								view->GetStart() + (chainEntryAddress),
 								bind, nextEntryStrideCount);
 
@@ -354,7 +354,7 @@ void KernelCache::ProcessRelocations(Ref<BinaryView> view, linkedit_data_command
 							{
 								// Something is seriously wrong here. likely malformed binary, or our parsing failed elsewhere.
 								// This will log the pointer in mapped memory.
-								LogError("Chained Fixups: Pointer at 0x%llx left page",
+								LogErrorF("Chained Fixups: Pointer at 0x{:x} left page",
 									view->GetStart() + ((chainEntryAddress - (nextEntryStrideCount * strideSize))));
 								fixupsDone = true;
 							}
diff --git a/view/kernelcache/core/KernelCacheView.cpp b/view/kernelcache/core/KernelCacheView.cpp
index 005a4af2..43d4eb6c 100644
--- a/view/kernelcache/core/KernelCacheView.cpp
+++ b/view/kernelcache/core/KernelCacheView.cpp
@@ -899,11 +899,8 @@ bool KernelCacheView::InitController()
 
 	{
 		BinaryReader reader(GetParentView());
-		reader.Seek(0x4);
-		uint32_t cpuType = reader.Read32();
-		reader.Seek(0x10);
+		reader.Seek(0x18);
 		uint64_t ncmds = reader.Read32();
-		uint64_t sizeofcmds = reader.Read32();
 		uint64_t offset = 0x20;
 		for (uint64_t i = 0; i < ncmds; i++)
 		{
diff --git a/view/kernelcache/core/transformers/libDER/oids.c b/view/kernelcache/core/transformers/libDER/oids.c
index 444457c5..cd556a46 100644
--- a/view/kernelcache/core/transformers/libDER/oids.c
+++ b/view/kernelcache/core/transformers/libDER/oids.c
@@ -417,7 +417,7 @@ static const DERByte
     _oidAppleExtendedKeyUsageQAProfileSigning[] = { APPLE_EKU_QA_PROFILE_SIGNING },
     _oidAppleIntmMarkerAppleID[] = { APPLE_CERT_EXT_INTERMEDIATE_MARKER_APPLEID },
     _oidAppleIntmMarkerAppleID2[] = {APPLE_CERT_EXT_INTERMEDIATE_MARKER_APPLEID_2 },
-    _oidApplePushServiceClient[]   =   { APPLE_CERT_EXT_APPLE_PUSH_MARKER, 2 },
+    // _oidApplePushServiceClient[]   =   { APPLE_CERT_EXT_APPLE_PUSH_MARKER, 2 },
     _oidApplePolicyMobileStore[]  = { APPLE_CERT_POLICY_MOBILE_STORE },
     _oidApplePolicyTestMobileStore[] = { APPLE_CERT_POLICY_TEST_MOBILE_STORE },
     _oidApplePolicyEscrowService[] = { APPLE_ESCROW_POLICY_OID },