Update ChOma, update XPF

opa334 · Jan 1, 2025 · 55fa1d2 · 55fa1d2
1 parent ef7a592
commit 55fa1d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/BaseBin/ChOma b/BaseBin/ChOma
diff --git a/BaseBin/XPF b/BaseBin/XPF
diff --git a/BaseBin/libjailbreak/src/signatures.m b/BaseBin/libjailbreak/src/signatures.m
@@ -1,12 +1,12 @@
-#include <choma/FAT.h>
+#include <choma/Fat.h>
 #include <choma/MachO.h>
 #include <choma/Host.h>
 #include <mach-o/dyld.h>
 #include "trustcache.h"
 
 #import <Foundation/Foundation.h>
 
-MachO *ljb_fat_find_preferred_slice(FAT *fat)
+MachO *ljb_fat_find_preferred_slice(Fat *fat)
 {
 	cpu_type_t cputype;
 	cpu_subtype_t cpusubtype;
@@ -77,7 +77,7 @@ bool csd_superblob_is_adhoc_signed(CS_DecodedSuperBlob *superblob)
 			NSString *(^resolveRpaths)(NSString *) = ^NSString *(NSString *binaryPath) {
 				if (!binaryPath) return nil;
 				__block NSString *rpathResolvedPath = nil;
-				FAT *fat = fat_init_from_path(binaryPath.fileSystemRepresentation);
+				Fat *fat = fat_init_from_path(binaryPath.fileSystemRepresentation);
 				if (fat) {
 					MachO *macho = ljb_fat_find_preferred_slice(fat);
 					if (macho) {
@@ -138,7 +138,7 @@ void macho_collect_untrusted_cdhashes(const char *path, const char *callerImageP
 		};
 
 		if (!callerExecutablePath) {
-			FAT *mainFAT = fat_init_from_path(path);
+			Fat *mainFAT = fat_init_from_path(path);
 			if (mainFAT) {
 				MachO *mainMachO = NULL;
 				if (preferredArchCount > 0) {
@@ -167,7 +167,7 @@ void macho_collect_untrusted_cdhashes(const char *path, const char *callerImageP
 		__weak __block void (^binaryTrustHandler_recurse)(NSString *, NSString *, NSString *);
 		void (^binaryTrustHandler)(NSString *, NSString *, NSString *) = ^(NSString *binaryPath, NSString *sourceImagePath, NSString *sourceExecutablePath) {
 			NSString *resolvedBinaryPath = resolveDependencyPath(binaryPath, sourceImagePath, sourceExecutablePath);
-			FAT *fat = fat_init_from_path(resolvedBinaryPath.fileSystemRepresentation);
+			Fat *fat = fat_init_from_path(resolvedBinaryPath.fileSystemRepresentation);
 			if (!fat) return;
 			MachO *macho = NULL;
 			if ([binaryPath isEqualToString:sourceExecutablePath]) {
@@ -196,7 +196,7 @@ void macho_collect_untrusted_cdhashes(const char *path, const char *callerImageP
 					if (csd_superblob_is_adhoc_signed(decodedSuperblob)) {
 						isAdhocSigned = true;
 						cdhash_t cdhash;
-						if (csd_superblob_calculate_best_cdhash(decodedSuperblob, cdhash) == 0) {
+						if (csd_superblob_calculate_best_cdhash(decodedSuperblob, cdhash, NULL) == 0) {
 							if (!cdhashesContains(cdhash)) {
 								if (!is_cdhash_trustcached(cdhash)) {
 									// If something is trustcached we do not want to add it to your array
+5 −1		.gitignore
+860 −0		ChOma.xcodeproj/project.pbxproj
+7 −0		ChOma.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+67 −0		ChOma.xcodeproj/xcshareddata/xcschemes/choma.xcscheme
+79 −0		ChOma.xcodeproj/xcshareddata/xcschemes/choma_cli.xcscheme
+93 −0		ChOma.xcodeproj/xcshareddata/xcschemes/dsc_extract.xcscheme
+85 −0		ChOma.xcodeproj/xcshareddata/xcschemes/dsc_tester.xcscheme
+1 −1		Makefile
+17 −15		README.md
+33 −1		src/CSBlob.c
+4 −2		src/CSBlob.h
+195 −0		src/CachePatching.h
+206 −16		src/CodeDirectory.c
+9 −1		src/CodeDirectory.h
+232 −0		src/DER.c
+24 −0		src/DER.h
+926 −0		src/DyldSharedCache.c
+110 −0		src/DyldSharedCache.h
+508 −0		src/Entitlements.c
+9 −0		src/Entitlements.h
+0 −46		src/FAT.h
+40 −21		src/Fat.c
+54 −0		src/Fat.h
+3 −3		src/Host.c
+3 −3		src/Host.h
+255 −28		src/MachO.c
+17 −4		src/MachO.h
+31 −1		src/MachOByteOrder.h
+1 −1		src/MachOLoadCommand.c
+18 −1		src/MachOLoadCommand.h
+59 −24		src/PatchFinder.c
+2 −2		src/PatchFinder.h
+52 −17		src/PatchFinder_arm64.c
+56 −19		src/Util.c
+4 −3		src/Util.h
+127 −1		src/arm64.c
+4 −0		src/arm64.h
+617 −0		src/dyld_cache_format.h
+306 −0		src/fixup-chains.h
+11 −7		tests/choma_cli/main.c
+134 −0		tests/choma_sign/main.c
+27 −28		tests/ct_bypass/main.c
+104 −0		tests/dsc_extract/main.c
+92 −0		tests/dsc_tester/main.c
+262 −0		tests/dylib_insert/main.c
+7 −7		tests/fat_create/main.c
+3 −3		tests/kpf/main.c
+2 −1		.gitignore
+3 −2		external/include/choma/CSBlob.h
+195 −0		external/include/choma/CachePatching.h
+1 −1		external/include/choma/CodeDirectory.h
+24 −0		external/include/choma/DER.h
+79 −0		external/include/choma/DyldSharedCache.h
+9 −0		external/include/choma/Entitlements.h
+0 −46		external/include/choma/FAT.h
+51 −0		external/include/choma/Fat.h
+3 −3		external/include/choma/Host.h
+15 −3		external/include/choma/MachO.h
+1 −1		external/include/choma/MachOLoadCommand.h
+2 −2		external/include/choma/PatchFinder.h
+2 −1		external/include/choma/Util.h
+2 −0		external/include/choma/arm64.h
+617 −0		external/include/choma/dyld_cache_format.h
+306 −0		external/include/choma/fixup-chains.h
+3 −2		external/ios/include/choma/CSBlob.h
+195 −0		external/ios/include/choma/CachePatching.h
+1 −1		external/ios/include/choma/CodeDirectory.h
+24 −0		external/ios/include/choma/DER.h
+79 −0		external/ios/include/choma/DyldSharedCache.h
+9 −0		external/ios/include/choma/Entitlements.h
+0 −46		external/ios/include/choma/FAT.h
+51 −0		external/ios/include/choma/Fat.h
+3 −3		external/ios/include/choma/Host.h
+15 −3		external/ios/include/choma/MachO.h
+1 −1		external/ios/include/choma/MachOLoadCommand.h
+2 −2		external/ios/include/choma/PatchFinder.h
+2 −1		external/ios/include/choma/Util.h
+2 −0		external/ios/include/choma/arm64.h
+617 −0		external/ios/include/choma/dyld_cache_format.h
+306 −0		external/ios/include/choma/fixup-chains.h
+ −		external/ios/lib/libchoma.a
+ −		external/ios/lib/libchoma.dylib
+ −		external/lib/libchoma.a
+ −		external/lib/libchoma.dylib
+9 −3		src/cli/main.c
+63 −2		src/common.c
+27 −5		src/non_ppl.c
+4 −4		src/ppl.c
+34 −19		src/xpf.c
+2 −2		src/xpf.h