stephen/StikDebug
1
0
Fork 0
mirror of https://github.com/StikDebug/StikDebug.git synced 2026-10-15 20:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change profile decoding

Browse source
This commit is contained in:
Stephen B 2025-12-03 20:36:59 -05:00
parent f7a512853b
commit df2fb37475
1 changed files with 37 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

105
StikJIT/idevice/profiles.m
View file

@ -6,7 +6,6 @@
// //
#include "profiles.h" #include "profiles.h"
@import Foundation; @import Foundation;
@import Security;
NSError* makeError(int code, NSString* msg) { NSError* makeError(int code, NSString* msg) {
return [NSError errorWithDomain:@"profiles" code:code userInfo:@{NSLocalizedDescriptionKey: msg}]; return [NSError errorWithDomain:@"profiles" code:code userInfo:@{NSLocalizedDescriptionKey: msg}];
@ -91,87 +90,57 @@ bool addProfile(IdeviceProviderHandle* provider, NSData* profile, NSError** erro
return true; return true;
} }
typedef CFTypeRef CMSDecoderRef;
OSStatus CMSDecoderCreate(CMSDecoderRef * cmsDecoderOut);
OSStatus CMSDecoderUpdateMessage(CMSDecoderRef cmsDecoder, const void * msgBytes, size_t msgBytesLen);
OSStatus CMSDecoderFinalizeMessage(CMSDecoderRef cmsDecoder);
OSStatus CMSDecoderCopyContent(CMSDecoderRef cmsDecoder, CFDataRef * contentOut);
OSStatus CMSDecoderCopyAllCerts(CMSDecoderRef cmsDecoder, CFArrayRef * certsOut);
// Helper to convert OSStatus -> NSError
static NSError *NSErrorFromOSStatus(OSStatus status, NSString *message) {
if (status == errSecSuccess) return nil;
NSDictionary *userInfo = @{ NSLocalizedDescriptionKey: message ?: @"Security error",
@"OSStatus" : @(status) };
return [NSError errorWithDomain:NSOSStatusErrorDomain code:status userInfo:userInfo];
}
@implementation CMSDecoderHelper @implementation CMSDecoderHelper
+ (NSData*)decodeCMSData:(NSData *)cmsData + (NSData*)decodeCMSData:(NSData *)cmsData
// outCerts:(NSArray<id> * _Nullable * _Nullable)outCerts // outCerts:(NSArray<id> * _Nullable * _Nullable)outCerts
error:(NSError * _Nullable * _Nullable)error error:(NSError * _Nullable * _Nullable)error
{ {
if (!cmsData) { if (!cmsData || cmsData.length == 0) {
if (error) *error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSURLErrorBadURL userInfo:@{NSLocalizedDescriptionKey: @"cmsData is nil"}]; if (error) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain
code:NSURLErrorBadURL
userInfo:@{NSLocalizedDescriptionKey: @"Invalid or empty CMS payload"}];
}
return nil; return nil;
} }
CMSDecoderRef decoder = NULL; NSData *xmlStart = [@"<?xml" dataUsingEncoding:NSASCIIStringEncoding];
OSStatus status = CMSDecoderCreate(&decoder); NSData *plistEnd = [@"</plist>" dataUsingEncoding:NSASCIIStringEncoding];
if (status != errSecSuccess || decoder == NULL) { NSData *binaryMagic = [@"bplist00" dataUsingEncoding:NSASCIIStringEncoding];
if (error) *error = NSErrorFromOSStatus(status, @"Failed to create CMS decoder");
return nil; if (xmlStart && plistEnd) {
NSRange searchRange = NSMakeRange(0, cmsData.length);
NSRange startRange = [cmsData rangeOfData:xmlStart options:0 range:searchRange];
if (startRange.location != NSNotFound) {
NSUInteger remainingLength = cmsData.length - startRange.location;
NSRange endSearchRange = NSMakeRange(startRange.location, remainingLength);
NSRange endRange = [cmsData rangeOfData:plistEnd options:0 range:endSearchRange];
if (endRange.location != NSNotFound) {
NSUInteger plistStart = startRange.location;
NSUInteger plistEndIndex = NSMaxRange(endRange);
if (plistEndIndex > plistStart && plistEndIndex <= cmsData.length) {
NSRange plistRange = NSMakeRange(plistStart, plistEndIndex - plistStart);
return [cmsData subdataWithRange:plistRange];
}
}
}
} }
// Feed data to decoder if (binaryMagic) {
status = CMSDecoderUpdateMessage(decoder, cmsData.bytes, cmsData.length); NSRange binaryRange = [cmsData rangeOfData:binaryMagic options:0 range:NSMakeRange(0, cmsData.length)];
if (status != errSecSuccess) { if (binaryRange.location != NSNotFound) {
if (error) *error = NSErrorFromOSStatus(status, @"Failed to update CMS decoder with message bytes"); NSRange plistRange = NSMakeRange(binaryRange.location, cmsData.length - binaryRange.location);
CFRelease(decoder); return [cmsData subdataWithRange:plistRange];
return nil; }
} }
// Finalize (parse) the message if (error) {
status = CMSDecoderFinalizeMessage(decoder); *error = [NSError errorWithDomain:NSCocoaErrorDomain
if (status != errSecSuccess) { code:NSFileReadUnknownError
if (error) *error = NSErrorFromOSStatus(status, @"Failed to finalize CMS message"); userInfo:@{NSLocalizedDescriptionKey: @"Unable to extract plist from CMS payload"}];
CFRelease(decoder);
return nil;
} }
return nil;
// Extract the content (the inner payload). This may be NULL if content is detached.
CFDataRef contentData = NULL;
status = CMSDecoderCopyContent(decoder, &contentData);
if (status != errSecSuccess && status != errSecItemNotFound) {
// errSecItemNotFound could mean no content (detached signature)
if (error) *error = NSErrorFromOSStatus(status, @"Failed to copy CMS content");
if (contentData) CFRelease(contentData);
CFRelease(decoder);
return nil;
}
// // Extract embedded certificates (if any)
// CFArrayRef certsArray = NULL;
// status = CMSDecoderCopyAllCerts(decoder, &certsArray);
// if (status == errSecSuccess && certsArray) {
// // certsArray contains SecCertificateRef items
// NSArray *certs = (__bridge_transfer NSArray *)certsArray;
// if (outCerts) *outCerts = certs;
// } else {
// // no certs or error
// if (status != errSecSuccess && status != errSecItemNotFound) {
// if (error) *error = NSErrorFromOSStatus(status, @"Failed to copy embedded certificates (if any)");
// CFRelease(decoder);
// return NO;
// }
// if (outCerts) *outCerts = @[]; // empty
// }
CFRelease(decoder);
return (__bridge NSData *)(contentData);
} }
@end @end