Skip to content

Commit 25bcbeb

Browse files
tihmstartihmstar
committed
prettify api
1 parent 9154c2e commit 25bcbeb

5 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎include/ra1nsn0w/ra1nsn0w_patch.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ namespace tihmstar {
2222

2323
void exportPatchesToJson(std::map<uint32_t,std::vector<patchfinder::patch>> patches, const char *outfilePath);
2424

25-
img4tool::ASN1DERElement patchIMG4(const void *buf, size_t bufSize, const char *ivstr, const char *keystr, std::string findstr, std::function<int(char *, size_t, void *)> patchfunc, void *param);
26-
tihmstar::Mem patchIMG3(const void *buf, size_t bufSize, const char *ivstr, const char *keystr, std::string findstr, std::function<int(char *, size_t, void*)> patchfunc, void *param);
25+
img4tool::ASN1DERElement patchIMG4(const void *buf, size_t bufSize, const char *ivstr, const char *keystr, std::string findstr, std::function<int(void *, size_t, void *)> patchfunc, void *param);
26+
tihmstar::Mem patchIMG3(const void *buf, size_t bufSize, const char *ivstr, const char *keystr, std::string findstr, std::function<int(void *, size_t, void*)> patchfunc, void *param);
2727
};
2828
};
2929

‎ra1nsn0w/ra1nsn0w_launch.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,9 @@ std::map<uint32_t,std::vector<patchfinder::patch>> ra1nsn0w::launchDevice(iOSDev
370370
info("Patching iBSS...");
371371
bootcfg.curPatchComponent = 'ssbi'; //ibss
372372
if (isIMG4) {
373-
piBSS = patchIMG4(ibssData.data(), ibssData.size(), iBSSKeys.iv, iBSSKeys.key, "iBoot", (int(*)(char*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
373+
piBSS = patchIMG4(ibssData.data(), ibssData.size(), iBSSKeys.iv, iBSSKeys.key, "iBoot", (int(*)(void*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
374374
}else{
375-
ibssData = patchIMG3(ibssData.data(), ibssData.size(), iBSSKeys.iv, iBSSKeys.key, "iBoot", (int(*)(char*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
375+
ibssData = patchIMG3(ibssData.data(), ibssData.size(), iBSSKeys.iv, iBSSKeys.key, "iBoot", (int(*)(void*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
376376
}
377377
}
378378

@@ -396,9 +396,9 @@ std::map<uint32_t,std::vector<patchfinder::patch>> ra1nsn0w::launchDevice(iOSDev
396396
info("Patching iBEC...");
397397
bootcfg.curPatchComponent = 'cebi'; //ibec
398398
if (isIMG4) {
399-
piBEC = patchIMG4(ibecData.data(), ibecData.size(), iBECKeys.iv, iBECKeys.key, "iBoot", (int(*)(char*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
399+
piBEC = patchIMG4(ibecData.data(), ibecData.size(), iBECKeys.iv, iBECKeys.key, "iBoot", (int(*)(void*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
400400
}else{
401-
ibecData = patchIMG3(ibecData.data(), ibecData.size(), iBECKeys.iv, iBECKeys.key, "iBoot", (int(*)(char*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
401+
ibecData = patchIMG3(ibecData.data(), ibecData.size(), iBECKeys.iv, iBECKeys.key, "iBoot", (int(*)(void*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
402402
}
403403
}
404404
}
@@ -430,9 +430,9 @@ std::map<uint32_t,std::vector<patchfinder::patch>> ra1nsn0w::launchDevice(iOSDev
430430
info("Patching kernel...\n");
431431
bootcfg.curPatchComponent = 'nrkr'; //rkrn (restore kernel)
432432
if (isIMG4) {
433-
pkernel = patchIMG4(kernelData.data(), kernelData.size(), kernelKeys.iv, kernelKeys.key, "Darwin", (int(*)(char*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
433+
pkernel = patchIMG4(kernelData.data(), kernelData.size(), kernelKeys.iv, kernelKeys.key, "Darwin", (int(*)(void*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
434434
}else{
435-
kernelData = patchIMG3(kernelData.data(), kernelData.size(), kernelKeys.iv, kernelKeys.key, "Darwin", (int(*)(char*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
435+
kernelData = patchIMG3(kernelData.data(), kernelData.size(), kernelKeys.iv, kernelKeys.key, "Darwin", (int(*)(void*,size_t,void*))patchFunciBoot, (void*)&bootcfg);
436436
}
437437
}
438438
if (isIMG4) {
@@ -452,7 +452,7 @@ std::map<uint32_t,std::vector<patchfinder::patch>> ra1nsn0w::launchDevice(iOSDev
452452

453453
//run with empty patcher function just for decryption
454454
if (isIMG4) {
455-
pdtre = patchIMG4(dtreData.data(), dtreData.size(), devicetreeKeys.iv, devicetreeKeys.key, NULL, [](char*, size_t, void*)->int{return 0;}, NULL);
455+
pdtre = patchIMG4(dtreData.data(), dtreData.size(), devicetreeKeys.iv, devicetreeKeys.key, NULL, [](void*, size_t, void*)->int{return 0;}, NULL);
456456
}
457457
}else{
458458
if (isIMG4) {

‎ra1nsn0w/ra1nsn0w_patch.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ void ra1nsn0w::exportPatchesToJson(std::map<uint32_t,std::vector<patchfinder::pa
348348
tihmstar::writeFile(outfilePath, json, jsonSize);
349349
}
350350

351-
img4tool::ASN1DERElement ra1nsn0w::patchIMG4(const void *buf, size_t bufSize, const char *ivstr, const char *keystr, std::string findstr, std::function<int(char *, size_t, void *)> patchfunc, void *param){
351+
img4tool::ASN1DERElement ra1nsn0w::patchIMG4(const void *buf, size_t bufSize, const char *ivstr, const char *keystr, std::string findstr, std::function<int(void *, size_t, void *)> patchfunc, void *param){
352352
const char *usedCompression = NULL;
353353
img4tool::ASN1DERElement hypervisor{{img4tool::ASN1DERElement::TagNULL,img4tool::ASN1DERElement::Primitive,img4tool::ASN1DERElement::Universal},NULL,0};
354354

@@ -365,7 +365,7 @@ img4tool::ASN1DERElement ra1nsn0w::patchIMG4(const void *buf, size_t bufSize, co
365365

366366
//patch here
367367
if (patchfunc) {
368-
assure(!patchfunc((char*)payload.payload(), payload.payloadSize(), param));
368+
assure(!patchfunc((void*)payload.payload(), payload.payloadSize(), param));
369369
}
370370

371371
img4tool::ASN1DERElement patchedIM4P = img4tool::getEmptyIM4PContainer(im4p[1].getStringValue().c_str(), im4p[2].getStringValue().c_str());
@@ -381,7 +381,7 @@ img4tool::ASN1DERElement ra1nsn0w::patchIMG4(const void *buf, size_t bufSize, co
381381
return img4tool::appendPayloadToIM4P(patchedIM4P, payload.payload(), payload.payloadSize(), usedCompression, hypervisor.payload(), hypervisor.payloadSize());
382382
}
383383

384-
tihmstar::Mem ra1nsn0w::patchIMG3(const void *buf, size_t bufSize, const char *ivstr, const char *keystr, std::string findstr, std::function<int(char *, size_t, void*)> patchfunc, void *param){
384+
tihmstar::Mem ra1nsn0w::patchIMG3(const void *buf, size_t bufSize, const char *ivstr, const char *keystr, std::string findstr, std::function<int(void *, size_t, void*)> patchfunc, void *param){
385385
const char *usedCompression = NULL;
386386

387387
auto payload = img3tool::getPayloadFromIMG3(buf, bufSize, ivstr, keystr, &usedCompression);
@@ -392,7 +392,7 @@ tihmstar::Mem ra1nsn0w::patchIMG3(const void *buf, size_t bufSize, const char *i
392392
}
393393
//patch here
394394
if (patchfunc) {
395-
assure(!patchfunc((char*)payload.data(), payload.size(), param));
395+
assure(!patchfunc(payload.data(), payload.size(), param));
396396
}
397397

398398
auto newpayload = img3tool::replaceDATAinIMG3({buf,bufSize}, payload, usedCompression);

‎tools/iBootPatcher/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,15 @@ int main_r(int argc, const char * argv[]) {
187187
#endif
188188
if (!patchediBoot.size()){
189189
try {
190-
auto pp = patchIMG4(iBoot.data(), iBoot.size(), keys.iv, keys.key, "iBoot", (int(*)(char*,size_t,void*))patchFunciBoot, (void*)&bcfg);
190+
auto pp = patchIMG4(iBoot.data(), iBoot.size(), keys.iv, keys.key, "iBoot", (int(*)(void*,size_t,void*))patchFunciBoot, (void*)&bcfg);
191191
patchediBoot = {(const void*)pp.buf(), pp.size()};
192192
} catch (tihmstar::exception &e) {
193193
error("Failed patching IMG4 files with error:\n%s",e.dumpStr().c_str());
194194
}
195195
}
196196
if (!patchediBoot.size()){
197197
try {
198-
patchediBoot = patchIMG3(iBoot.data(), iBoot.size(), keys.iv, keys.key, "iBoot", (int(*)(char*,size_t,void*))patchFunciBoot, (void*)&bcfg);
198+
patchediBoot = patchIMG3(iBoot.data(), iBoot.size(), keys.iv, keys.key, "iBoot", (int(*)(void*,size_t,void*))patchFunciBoot, (void*)&bcfg);
199199
} catch (tihmstar::exception &e) {
200200
error("Failed patching IMG3 files with error:\n%s",e.dumpStr().c_str());
201201
}

‎tools/kernelPatcher/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,15 @@ int main_r(int argc, const char * argv[]) {
187187
#endif
188188
if (!patchedFile.size()){
189189
try {
190-
auto pp = patchIMG4(inbuf.data(), inbuf.size(), keys.iv, keys.key, "Darwin", (int(*)(char*,size_t,void*))patchFuncKernel, (void*)&bcfg);
190+
auto pp = patchIMG4(inbuf.data(), inbuf.size(), keys.iv, keys.key, "Darwin", (int(*)(void*,size_t,void*))patchFuncKernel, (void*)&bcfg);
191191
patchedFile = {(const void*)pp.buf(), pp.size()};
192192
} catch (tihmstar::exception &e) {
193193
error("Failed patching IMG4 files with error:\n%s",e.dumpStr().c_str());
194194
}
195195
}
196196
if (!patchedFile.size()){
197197
try {
198-
patchedFile = patchIMG3(inbuf.data(), inbuf.size(), keys.iv, keys.key, "Darwin", (int(*)(char*,size_t,void*))patchFuncKernel, (void*)&bcfg);
198+
patchedFile = patchIMG3(inbuf.data(), inbuf.size(), keys.iv, keys.key, "Darwin", (int(*)(void*,size_t,void*))patchFuncKernel, (void*)&bcfg);
199199
} catch (tihmstar::exception &e) {
200200
error("Failed patching IMG3 files with error:\n%s",e.dumpStr().c_str());
201201
}

0 commit comments

Comments
 (0)