Workaround JIT-less setup not being able to find certificate

khanhduytran0 · Apr 21, 2024 · b5b44e1 · b5b44e1
1 parent e8b3ea8
commit b5b44e1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/LCJITLessSetupViewController.m b/LCJITLessSetupViewController.m
@@ -18,12 +18,16 @@ - (void)loadView {
     self.view.backgroundColor = UIColor.systemBackgroundColor;
     self.title = @"LiveContainer JIT-less setup";
 
-    if (![LCUtils sidestoreKeychainItem:@"signingCertificate"]) {
+    NSData *certData = [LCUtils keychainItem:@"signingCertificate" ofStore:@"com.SideStore.SideStore"];
+    if (!certData) {
+        certData = [LCUtils keychainItem:@"signingCertificate" ofStore:@"com.rileytestut.AltStore"];
+    }
+    if (!certData) {
         [self showDialogTitle:@"Error" message:@"Failed to find certificate" handler:nil];
         return;
     }
 
-    [LCUtils updateCertificate];
+    LCUtils.certificateData = certData;
     [LCUtils changeMainExecutableTo:@"LiveContainer_PleaseDoNotShortenTheExecutableNameBecauseItIsUsedToReserveSpaceForOverwritingThankYou"];
 
     NSError *error;

diff --git a/LCUtils.h b/LCUtils.h
@@ -9,9 +9,9 @@
 @interface LCUtils : NSObject
 
 + (NSData *)certificateData;
-+ (void)updateCertificate;
++ (void)setCertificateData:(NSData *)certData;
 
-+ (NSData *)sidestoreKeychainItem:(NSString *)key;
++ (NSData *)keychainItem:(NSString *)key ofStore:(NSString *)store;
 + (NSProgress *)signAppBundle:(NSString *)path completionHandler:(void (^)(BOOL success, NSError *error))completionHandler;
 
 + (BOOL)isAppGroupSideStore;

diff --git a/LCUtils.m b/LCUtils.m
@@ -10,10 +10,10 @@ @implementation LCUtils
 
 #pragma mark Certificate password
 
-+ (NSData *)sidestoreKeychainItem:(NSString *)key {
++ (NSData *)keychainItem:(NSString *)key ofStore:(NSString *)store {
     NSDictionary *dict = @{
         (id)kSecClass: (id)kSecClassGenericPassword,
-        (id)kSecAttrService: @"com.SideStore.SideStore",
+        (id)kSecAttrService: store,
         (id)kSecAttrAccount: key,
         (id)kSecAttrSynchronizable: (id)kSecAttrSynchronizableAny,
         (id)kSecMatchLimit: (id)kSecMatchLimitOne,
@@ -28,8 +28,8 @@ + (NSData *)sidestoreKeychainItem:(NSString *)key {
     }
 }
 
-+ (void)updateCertificate {
-    [NSUserDefaults.standardUserDefaults setObject:[self sidestoreKeychainItem:@"signingCertificate"] forKey:@"LCCertificateData"];
++ (void)setCertificateData:(NSData *)certData {
+    [NSUserDefaults.standardUserDefaults setObject:certData forKey:@"LCCertificateData"];
 }
 
 + (NSData *)certificateData {