diff options
Diffstat (limited to 'src/wrapped/generated')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 7 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedlibctypes.h | 3 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappednss3types.h | 4 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 5 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 2 |
5 files changed, 20 insertions, 1 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 65bf8028..2f8acdc6 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -87,6 +87,7 @@ #() pFV #() HFi #() HFp +#() vFEi #() vFEp #() vFii #() vFiI @@ -1148,6 +1149,7 @@ #() iFpippi #() iFpippW #() iFpippp +#() iFpIppp #() iFpCCCC #() iFpuill #() iFpuipi @@ -2786,6 +2788,9 @@ wrappedlibc: - _Jv_RegisterClasses - __cxa_pure_virtual - __stack_chk_fail +- vFi: + - _exit + - exit - vFp: - _ITM_deregisterTMCloneTable - __cxa_finalize @@ -3434,6 +3439,8 @@ wrappednspr4: wrappednss3: - vFp: - PK11_SetPasswordFunc +- iFpp: + - CERT_RegisterAlternateOCSPAIAInfoCallBack wrappednssutil3: wrappedopenal: - vFv: diff --git a/src/wrapped/generated/wrappedlibctypes.h b/src/wrapped/generated/wrappedlibctypes.h index 74166f2c..2de2464a 100644 --- a/src/wrapped/generated/wrappedlibctypes.h +++ b/src/wrapped/generated/wrappedlibctypes.h @@ -12,6 +12,7 @@ #endif typedef void (*vFv_t)(void); +typedef void (*vFi_t)(int64_t); typedef void (*vFp_t)(void*); typedef int64_t (*iFv_t)(void); typedef int64_t (*iFi_t)(int64_t); @@ -88,6 +89,8 @@ typedef int64_t (*iFppipppp_t)(void*, void*, int64_t, void*, void*, void*, void* GO(_Jv_RegisterClasses, vFv_t) \ GO(__cxa_pure_virtual, vFv_t) \ GO(__stack_chk_fail, vFv_t) \ + GO(_exit, vFi_t) \ + GO(exit, vFi_t) \ GO(_ITM_deregisterTMCloneTable, vFp_t) \ GO(__cxa_finalize, vFp_t) \ GO(fork, iFv_t) \ diff --git a/src/wrapped/generated/wrappednss3types.h b/src/wrapped/generated/wrappednss3types.h index b61ede44..640f7da6 100644 --- a/src/wrapped/generated/wrappednss3types.h +++ b/src/wrapped/generated/wrappednss3types.h @@ -12,8 +12,10 @@ #endif typedef void (*vFp_t)(void*); +typedef int64_t (*iFpp_t)(void*, void*); #define SUPER() ADDED_FUNCTIONS() \ - GO(PK11_SetPasswordFunc, vFp_t) + GO(PK11_SetPasswordFunc, vFp_t) \ + GO(CERT_RegisterAlternateOCSPAIAInfoCallBack, iFpp_t) #endif // __wrappednss3TYPES_H_ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index 3bb9c270..3fcebe43 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -121,6 +121,7 @@ typedef void* (*pFp_t)(void*); typedef void* (*pFV_t)(void*); typedef unsigned __int128 (*HFi_t)(int64_t); typedef unsigned __int128 (*HFp_t)(void*); +typedef void (*vFEi_t)(x64emu_t*, int64_t); typedef void (*vFEp_t)(x64emu_t*, void*); typedef void (*vFii_t)(int64_t, int64_t); typedef void (*vFiI_t)(int64_t, int64_t); @@ -1182,6 +1183,7 @@ typedef int64_t (*iFpipip_t)(void*, int64_t, void*, int64_t, void*); typedef int64_t (*iFpippi_t)(void*, int64_t, void*, void*, int64_t); typedef int64_t (*iFpippW_t)(void*, int64_t, void*, void*, uint16_t); typedef int64_t (*iFpippp_t)(void*, int64_t, void*, void*, void*); +typedef int64_t (*iFpIppp_t)(void*, int64_t, void*, void*, void*); typedef int64_t (*iFpCCCC_t)(void*, uint8_t, uint8_t, uint8_t, uint8_t); typedef int64_t (*iFpuill_t)(void*, uint64_t, int64_t, intptr_t, intptr_t); typedef int64_t (*iFpuipi_t)(void*, uint64_t, int64_t, void*, int64_t); @@ -2254,6 +2256,7 @@ void pFp(x64emu_t *emu, uintptr_t fcn) { pFp_t fn = (pFp_t)fcn; R_RAX=(uintptr_t void pFV(x64emu_t *emu, uintptr_t fcn) { pFV_t fn = (pFV_t)fcn; R_RAX=(uintptr_t)fn((void*)(R_RSP + 8)); } void HFi(x64emu_t *emu, uintptr_t fcn) { HFi_t fn = (HFi_t)fcn; unsigned __int128 u128 = fn((int64_t)R_RDI); R_RAX=(u128&0xFFFFFFFFFFFFFFFFL); R_RDX=(u128>>64)&0xFFFFFFFFFFFFFFFFL; } void HFp(x64emu_t *emu, uintptr_t fcn) { HFp_t fn = (HFp_t)fcn; unsigned __int128 u128 = fn((void*)R_RDI); R_RAX=(u128&0xFFFFFFFFFFFFFFFFL); R_RDX=(u128>>64)&0xFFFFFFFFFFFFFFFFL; } +void vFEi(x64emu_t *emu, uintptr_t fcn) { vFEi_t fn = (vFEi_t)fcn; fn(emu, (int64_t)R_RDI); } void vFEp(x64emu_t *emu, uintptr_t fcn) { vFEp_t fn = (vFEp_t)fcn; fn(emu, (void*)R_RDI); } void vFii(x64emu_t *emu, uintptr_t fcn) { vFii_t fn = (vFii_t)fcn; fn((int64_t)R_RDI, (int64_t)R_RSI); } void vFiI(x64emu_t *emu, uintptr_t fcn) { vFiI_t fn = (vFiI_t)fcn; fn((int64_t)R_RDI, (int64_t)R_RSI); } @@ -3315,6 +3318,7 @@ void iFpipip(x64emu_t *emu, uintptr_t fcn) { iFpipip_t fn = (iFpipip_t)fcn; R_RA void iFpippi(x64emu_t *emu, uintptr_t fcn) { iFpippi_t fn = (iFpippi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8); } void iFpippW(x64emu_t *emu, uintptr_t fcn) { iFpippW_t fn = (iFpippW_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8); } void iFpippp(x64emu_t *emu, uintptr_t fcn) { iFpippp_t fn = (iFpippp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } +void iFpIppp(x64emu_t *emu, uintptr_t fcn) { iFpIppp_t fn = (iFpIppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } void iFpCCCC(x64emu_t *emu, uintptr_t fcn) { iFpCCCC_t fn = (iFpCCCC_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8); } void iFpuill(x64emu_t *emu, uintptr_t fcn) { iFpuill_t fn = (iFpuill_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8); } void iFpuipi(x64emu_t *emu, uintptr_t fcn) { iFpuipi_t fn = (iFpuipi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8); } @@ -5281,6 +5285,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &iFpippi) return 1; if (fun == &iFpippW) return 1; if (fun == &iFpippp) return 1; + if (fun == &iFpIppp) return 1; if (fun == &iFpCCCC) return 1; if (fun == &iFpuill) return 1; if (fun == &iFpuipi) return 1; diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index 5d8b6b5b..9a08256f 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -120,6 +120,7 @@ void pFp(x64emu_t *emu, uintptr_t fnc); void pFV(x64emu_t *emu, uintptr_t fnc); void HFi(x64emu_t *emu, uintptr_t fnc); void HFp(x64emu_t *emu, uintptr_t fnc); +void vFEi(x64emu_t *emu, uintptr_t fnc); void vFEp(x64emu_t *emu, uintptr_t fnc); void vFii(x64emu_t *emu, uintptr_t fnc); void vFiI(x64emu_t *emu, uintptr_t fnc); @@ -1181,6 +1182,7 @@ void iFpipip(x64emu_t *emu, uintptr_t fnc); void iFpippi(x64emu_t *emu, uintptr_t fnc); void iFpippW(x64emu_t *emu, uintptr_t fnc); void iFpippp(x64emu_t *emu, uintptr_t fnc); +void iFpIppp(x64emu_t *emu, uintptr_t fnc); void iFpCCCC(x64emu_t *emu, uintptr_t fnc); void iFpuill(x64emu_t *emu, uintptr_t fnc); void iFpuipi(x64emu_t *emu, uintptr_t fnc); |