bughz
/
TrollStore
mirror of https://github.com/opa334/TrollStore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Actually just make ChOma a submodule, much better

This commit is contained in:
opa334 2024-01-12 16:34:28 +01:00
parent 9197bd1652
commit b700590174
11 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "ChOma"]
path = ChOma
url = https://github.com/opa334/ChOma

1
ChOma Submodule

@ -0,0 +1 @@
Subproject commit b819acbad86eae7a187062d344a1cb62c60daa9b

6
Exploits/fastPathSign/Makefile
View File

@ -2,10 +2,10 @@ TARGET = fastPathSign
CC = clang CC = clang
CFLAGS = -framework Foundation -framework CoreServices -framework Security -fobjc-arc $(shell pkg-config --cflags libcrypto) -Isrc/external/include CFLAGS = -framework Foundation -framework CoreServices -framework Security -fobjc-arc $(shell pkg-config --cflags libcrypto) -I../../ChOma/src
LDFLAGS = $(shell pkg-config --libs libcrypto) -Lsrc/external/lib -lchoma LDFLAGS = $(shell pkg-config --libs libcrypto)
$(TARGET): $(wildcard src/*.m src/*.c) $(TARGET): $(wildcard src/*.m src/*.c ../../ChOma/src/*.c)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
clean: clean:

20
Exploits/fastPathSign/src/coretrust_bug.c
View File

@ -3,16 +3,16 @@
#include <stdio.h> #include <stdio.h>
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <choma/CSBlob.h> #include "CSBlob.h"
#include <choma/MachOByteOrder.h> #include "MachOByteOrder.h"
#include <choma/MachO.h> #include "MachO.h"
#include <choma/Host.h> #include "Host.h"
#include <choma/MemoryStream.h> #include "MemoryStream.h"
#include <choma/FileStream.h> #include "FileStream.h"
#include <choma/BufferedStream.h> #include "BufferedStream.h"
#include <choma/SignOSSL.h> #include "SignOSSL.h"
#include <choma/CodeDirectory.h> #include "CodeDirectory.h"
#include <choma/Base64.h> #include "Base64.h"
#include "Templates/AppStoreCodeDirectory.h" #include "Templates/AppStoreCodeDirectory.h"
#include "Templates/SignatureBlob.h" #include "Templates/SignatureBlob.h"
#include "Templates/DecryptedSignature.h" #include "Templates/DecryptedSignature.h"

2
Exploits/fastPathSign/src/external/.gitignore vendored
View File

@ -1,2 +0,0 @@
include/choma
lib/libchoma.*

8
Exploits/fastPathSign/src/main.m
View File

@ -1,9 +1,9 @@
#include "codesign.h" #include "codesign.h"
#include "coretrust_bug.h" #include "coretrust_bug.h"
#include <choma/FAT.h> #include "FAT.h"
#include <choma/MachO.h> #include "MachO.h"
#include <choma/FileStream.h> #include "FileStream.h"
#include <choma/Host.h> #include "Host.h"
#include <copyfile.h> #include <copyfile.h>
char *extract_preferred_slice(const char *fatPath) char *extract_preferred_slice(const char *fatPath)

11
Makefile
View File

@ -75,15 +75,4 @@ build_installer64e:
endif endif
update-choma:
rm -rf _build/.choma
mkdir -p _build/.choma
git clone --recursive https://github.com/opa334/ChOma _build/.choma
make -C _build/.choma install TARGET=ios INSTALL_PATH=../../RootHelper/external
rm RootHelper/external/lib/libchoma.dylib
make -C _build/.choma clean
make -C _build/.choma install INSTALL_PATH=../../Exploits/fastPathSign/src/external
rm Exploits/fastPathSign/src/external/lib/libchoma.dylib
rm -rf _build/.choma
.PHONY: $(TOPTARGETS) pre_build assemble_trollstore make_trollhelper_package make_trollhelper_embedded build_installer15 build_installer64e .PHONY: $(TOPTARGETS) pre_build assemble_trollstore make_trollhelper_package make_trollhelper_embedded build_installer15 build_installer64e

6
RootHelper/Makefile
View File

@ -7,9 +7,9 @@ include $(THEOS)/makefiles/common.mk
TOOL_NAME = trollstorehelper TOOL_NAME = trollstorehelper
trollstorehelper_FILES = $(wildcard *.m) $(wildcard ../Shared/*.m) ../Exploits/fastPathSign/src/coretrust_bug.c ../Exploits/fastPathSign/src/codesign.m trollstorehelper_FILES = $(wildcard *.m) $(wildcard ../Shared/*.m) $(wildcard ../ChOma/src/*.c) ../Exploits/fastPathSign/src/coretrust_bug.c ../Exploits/fastPathSign/src/codesign.m
trollstorehelper_CFLAGS = -fobjc-arc -I../Shared $(shell pkg-config --cflags libcrypto) -Iexternal/include -I../Exploits/fastPathSign/src trollstorehelper_CFLAGS = -fobjc-arc -I../Shared $(shell pkg-config --cflags libcrypto) -I../ChOma/src -I../Exploits/fastPathSign/src
trollstorehelper_LDFLAGS = -Lexternal/lib -lcrypto -lchoma trollstorehelper_LDFLAGS = -L../ChOma/external/ios -lcrypto
trollstorehelper_CODESIGN_FLAGS = --entitlements entitlements.plist trollstorehelper_CODESIGN_FLAGS = --entitlements entitlements.plist
trollstorehelper_INSTALL_PATH = /usr/local/bin trollstorehelper_INSTALL_PATH = /usr/local/bin
trollstorehelper_LIBRARIES = archive trollstorehelper_LIBRARIES = archive

2
RootHelper/external/.gitignore vendored
View File

@ -1,2 +0,0 @@
include/choma
lib/libchoma.*

BIN
RootHelper/external/lib/libcrypto.a vendored
View File

Binary file not shown.

8
RootHelper/main.m
View File

@ -14,10 +14,10 @@
#ifndef EMBEDDED_ROOT_HELPER #ifndef EMBEDDED_ROOT_HELPER
#import "codesign.h" #import "codesign.h"
#import "coretrust_bug.h" #import "coretrust_bug.h"
#import <choma/FAT.h> #import "FAT.h"
#import <choma/MachO.h> #import "MachO.h"
#import <choma/FileStream.h> #import "FileStream.h"
#import <choma/Host.h> #import "Host.h"
#endif #endif
#import <SpringBoardServices/SpringBoardServices.h> #import <SpringBoardServices/SpringBoardServices.h>