diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2022-09-10 12:32:24 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2022-09-10 12:32:24 +0200 |
| commit | a78d5e2636e7aabe61465d74046f64d3559ebf3c (patch) | |
| tree | d44b89bcbd67c3a54abd91df6484c2aad49d1e49 /src | |
| parent | b6d2e3fb55c6f699ce506e98eb3b11c6ba1b495f (diff) | |
| download | box64-a78d5e2636e7aabe61465d74046f64d3559ebf3c.tar.gz box64-a78d5e2636e7aabe61465d74046f64d3559ebf3c.zip | |
Added a few libnss3 wrapped functions
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 1 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 3 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 1 | ||||
| -rwxr-xr-x | src/wrapped/wrappednss3_private.h | 6 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 4059c4c9..c41b850e 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -234,6 +234,7 @@ #() pFiu #() pFip #() pFiV +#() pFII #() pFui #() pFuC #() pFuu diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index d539d772..1179a98b 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -268,6 +268,7 @@ typedef void* (*pFiI_t)(int64_t, int64_t); typedef void* (*pFiu_t)(int64_t, uint64_t); typedef void* (*pFip_t)(int64_t, void*); typedef void* (*pFiV_t)(int64_t, void*); +typedef void* (*pFII_t)(int64_t, int64_t); typedef void* (*pFui_t)(uint64_t, int64_t); typedef void* (*pFuC_t)(uint64_t, uint8_t); typedef void* (*pFuu_t)(uint64_t, uint64_t); @@ -2432,6 +2433,7 @@ void pFiI(x64emu_t *emu, uintptr_t fcn) { pFiI_t fn = (pFiI_t)fcn; R_RAX=(uintpt void pFiu(x64emu_t *emu, uintptr_t fcn) { pFiu_t fn = (pFiu_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (uint64_t)R_RSI); } void pFip(x64emu_t *emu, uintptr_t fcn) { pFip_t fn = (pFip_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI); } void pFiV(x64emu_t *emu, uintptr_t fcn) { pFiV_t fn = (pFiV_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)(R_RSP + 8)); } +void pFII(x64emu_t *emu, uintptr_t fcn) { pFII_t fn = (pFII_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI); } void pFui(x64emu_t *emu, uintptr_t fcn) { pFui_t fn = (pFui_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (int64_t)R_RSI); } void pFuC(x64emu_t *emu, uintptr_t fcn) { pFuC_t fn = (pFuC_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint8_t)R_RSI); } void pFuu(x64emu_t *emu, uintptr_t fcn) { pFuu_t fn = (pFuu_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); } @@ -4573,6 +4575,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &pFiI) return 1; if (fun == &pFiu) return 1; if (fun == &pFip) return 1; + if (fun == &pFII) return 1; if (fun == &pFui) return 1; if (fun == &pFuC) return 1; if (fun == &pFuu) return 1; diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index 9de50b6a..0ca0fd5c 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -267,6 +267,7 @@ void pFiI(x64emu_t *emu, uintptr_t fnc); void pFiu(x64emu_t *emu, uintptr_t fnc); void pFip(x64emu_t *emu, uintptr_t fnc); void pFiV(x64emu_t *emu, uintptr_t fnc); +void pFII(x64emu_t *emu, uintptr_t fnc); void pFui(x64emu_t *emu, uintptr_t fnc); void pFuC(x64emu_t *emu, uintptr_t fnc); void pFuu(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappednss3_private.h b/src/wrapped/wrappednss3_private.h index b0a45a6d..d97d0373 100755 --- a/src/wrapped/wrappednss3_private.h +++ b/src/wrapped/wrappednss3_private.h @@ -56,7 +56,7 @@ GO(CERT_CheckCertValidTimes, iFpIi) //GO(CERT_CreateOCSPSingleResponseUnknown, //GO(CERT_CreateRDN, //GO(CERT_CreateSubjectCertList, -//GO(CERT_CreateValidity, +GO(CERT_CreateValidity, pFII) //GO(CERT_CRLCacheRefreshIssuer, //DATA(CERT_CrlTemplate, GO(CERT_DecodeAltNameExtension, pFpp) @@ -91,7 +91,7 @@ GO(CERT_DestroyCertList, vFp) //GO(CERT_DestroyOCSPResponse, //GO(CERT_DestroyOidSequence, //GO(CERT_DestroyUserNotice, -//GO(CERT_DestroyValidity, +GO(CERT_DestroyValidity, vFp) //GO(CERT_DisableOCSPChecking, //GO(CERT_DisableOCSPDefaultResponder, //GO(CERT_DistNamesFromCertList, @@ -616,7 +616,7 @@ GO(PK11_SignatureLen, iFp) //GO(PK11_SignWithMechanism, //GO(PK11_SignWithSymKey, //GO(PK11_SymKeyFromHandle, -//GO(PK11_TokenExists, +GO(PK11_TokenExists, iFi) //GO(PK11_TokenKeyGen, //GO(PK11_TokenKeyGenWithFlags, //GO(PK11_TokenRefresh, |