Skip to content

Add support for Big Sur #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Halo-Michael wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for Big Sur #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 42 additions & 18 deletions libsnappy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ kern_return_t IOObjectRelease(io_object_t object );
static char *copyBootHash(void);
#define APPLESNAP "com.apple.os.update-"

bool READ_NEW_IORegistryEntry = true;

__attribute__((aligned(4)))
typedef struct val_attrs {
uint32_t length;
Expand Down Expand Up @@ -143,12 +145,17 @@ static char *copyBootHash(void)
return NULL;
}

CFDataRef hash = (CFDataRef)IORegistryEntryCreateCFProperty(chosen, CFSTR("boot-manifest-hash"), kCFAllocatorDefault, 0);
CFDataRef hash = (CFDataRef)IORegistryEntryCreateCFProperty(chosen, CFSTR("root-snapshot-name"), kCFAllocatorDefault, 0);

if (hash == nil) {
READ_NEW_IORegistryEntry = false;
hash = (CFDataRef)IORegistryEntryCreateCFProperty(chosen, CFSTR("boot-manifest-hash"), kCFAllocatorDefault, 0);
}

IOObjectRelease(chosen);

if (hash == nil) {
fprintf(stderr, "Unable to read boot-manifest-hash\n");
fprintf(stderr, "Unable to read neither root-snapshot-name nor boot-manifest-hash\n");
return NULL;
}

Expand All @@ -160,31 +167,48 @@ static char *copyBootHash(void)

// Make a hex string out of the hash

CFIndex length = CFDataGetLength(hash) * 2 + 1;
char *manifestHash = (char*)calloc(length, sizeof(char));
char *manifestHash;

int ret = sha1_to_str(CFDataGetBytePtr(hash), CFDataGetLength(hash), manifestHash, length);
if (READ_NEW_IORegistryEntry) {
CFStringRef root_snapshot_name = CFStringCreateFromExternalRepresentation(NULL, hash, kCFStringEncodingUTF8);
CFRelease(hash);
CFIndex length = CFStringGetMaximumSizeForEncoding(CFStringGetLength(root_snapshot_name), kCFStringEncodingUTF8) + 1;
manifestHash = (char*)calloc(length, sizeof(char));

CFRelease(hash);
CFStringGetCString(root_snapshot_name, manifestHash, length, kCFStringEncodingUTF8);

if (ret != ERR_SUCCESS) {
printf("Unable to generate bootHash string\n");
free(manifestHash);
return NULL;
}
CFRelease(root_snapshot_name);
} else {
CFIndex length = CFDataGetLength(hash) * 2 + 1;
manifestHash = (char*)calloc(length, sizeof(char));

int ret = sha1_to_str(CFDataGetBytePtr(hash), CFDataGetLength(hash), manifestHash, length);

CFRelease(hash);

if (ret != ERR_SUCCESS) {
printf("Unable to generate bootHash string\n");
free(manifestHash);
return NULL;
}
}

return manifestHash;
}

char *copy_system_snapshot()
{
char *hash = copyBootHash();
if (hash == NULL) {
return NULL;
if (READ_NEW_IORegistryEntry) {
return hash;
} else {
if (hash == NULL) {
return NULL;
}
char *hashsnap = malloc(strlen(APPLESNAP) + strlen(hash) + 1);
strcpy(hashsnap, APPLESNAP);
strcpy(hashsnap + strlen(APPLESNAP), hash);
free(hash);
return hashsnap;
}
char *hashsnap = malloc(strlen(APPLESNAP) + strlen(hash) + 1);
strcpy(hashsnap, APPLESNAP);
strcpy(hashsnap + strlen(APPLESNAP), hash);
free(hash);
return hashsnap;
}
6 changes: 3 additions & 3 deletions snappy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ void usage(void)
#endif
"\t-t, --to PATH\n"
"\t-v, --revert NAME\tRevert to snapshot named NAME\n"
"\t-s, --showhash\t\tShow the name of the system snapshot for this boot-manifest-hash\n"
"\t-x, --to-system\t\tSet the target snapshot name to be the iOS system-snapshot\n"
"\t-s, --showhash\t\tShow the name of the system snapshot from IO Registry\n"
"\t-x, --to-system\t\tSet the target snapshot name to be the system-snapshot\n"
"\t-o, --orig\t\tRevert to the original pre-jailbreak snapshot\n"
);
}
Expand Down Expand Up @@ -314,7 +314,7 @@ int main(int argc, char **argv, char **envp)
printf("System Snapshot: %s\n", hash);
free(hash);
} else {
perror("Unable to get boot-manifest-hash");
perror("Unable to get neither root-snapshot-name nor boot-manifest-hash");
error=true;
}
break;
Expand Down