about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2021-05-23 21:59:33 +0200
committerptitSeb <sebastien.chev@gmail.com>2021-05-23 21:59:33 +0200
commitcb73a9a6bce62c41900c1441bed0f2c5e78a4473 (patch)
tree8ad78318c326c8bed3d27d5841eaa6967eba118e /src
parent5199df9b61a852c72b9ea2c09e4ac3be68ce3f9a (diff)
downloadbox64-cb73a9a6bce62c41900c1441bed0f2c5e78a4473.tar.gz
box64-cb73a9a6bce62c41900c1441bed0f2c5e78a4473.zip
Added a few more wrapped functions to libc and libcrypto
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/generated/functions_list.txt1
-rw-r--r--src/wrapped/generated/wrapper.c3
-rw-r--r--src/wrapped/generated/wrapper.h1
-rwxr-xr-xsrc/wrapped/wrappedcrypto_private.h4
-rwxr-xr-xsrc/wrapped/wrappedlibc_private.h8
5 files changed, 11 insertions, 6 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 9a49e687..2043e218 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -554,6 +554,7 @@
 #() lFpili
 #() lFpilp
 #() lFppii
+#() LFippL
 #() LFpuuu
 #() LFpLLp
 #() LFpLpp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index a6001235..3d82d599 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -588,6 +588,7 @@ typedef intptr_t (*lFipLl_t)(int64_t, void*, uintptr_t, intptr_t);
 typedef intptr_t (*lFpili_t)(void*, int64_t, intptr_t, int64_t);
 typedef intptr_t (*lFpilp_t)(void*, int64_t, intptr_t, void*);
 typedef intptr_t (*lFppii_t)(void*, void*, int64_t, int64_t);
+typedef uintptr_t (*LFippL_t)(int64_t, void*, void*, uintptr_t);
 typedef uintptr_t (*LFpuuu_t)(void*, uint64_t, uint64_t, uint64_t);
 typedef uintptr_t (*LFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
 typedef uintptr_t (*LFpLpp_t)(void*, uintptr_t, void*, void*);
@@ -1821,6 +1822,7 @@ void lFipLl(x64emu_t *emu, uintptr_t fcn) { lFipLl_t fn = (lFipLl_t)fcn; R_RAX=(
 void lFpili(x64emu_t *emu, uintptr_t fcn) { lFpili_t fn = (lFpili_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (intptr_t)R_RDX, (int64_t)R_RCX); }
 void lFpilp(x64emu_t *emu, uintptr_t fcn) { lFpilp_t fn = (lFpilp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
 void lFppii(x64emu_t *emu, uintptr_t fcn) { lFppii_t fn = (lFppii_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
+void LFippL(x64emu_t *emu, uintptr_t fcn) { LFippL_t fn = (LFippL_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void LFpuuu(x64emu_t *emu, uintptr_t fcn) { LFpuuu_t fn = (LFpuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX); }
 void LFpLLp(x64emu_t *emu, uintptr_t fcn) { LFpLLp_t fn = (LFpLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void LFpLpp(x64emu_t *emu, uintptr_t fcn) { LFpLpp_t fn = (LFpLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -2982,6 +2984,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFpili) return 1;
 	if (fun == &lFpilp) return 1;
 	if (fun == &lFppii) return 1;
+	if (fun == &LFippL) return 1;
 	if (fun == &LFpuuu) return 1;
 	if (fun == &LFpLLp) return 1;
 	if (fun == &LFpLpp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index fcd80506..bc3d8a46 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -584,6 +584,7 @@ void lFipLl(x64emu_t *emu, uintptr_t fnc);
 void lFpili(x64emu_t *emu, uintptr_t fnc);
 void lFpilp(x64emu_t *emu, uintptr_t fnc);
 void lFppii(x64emu_t *emu, uintptr_t fnc);
+void LFippL(x64emu_t *emu, uintptr_t fnc);
 void LFpuuu(x64emu_t *emu, uintptr_t fnc);
 void LFpLLp(x64emu_t *emu, uintptr_t fnc);
 void LFpLpp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedcrypto_private.h b/src/wrapped/wrappedcrypto_private.h
index f9a783a5..9681274c 100755
--- a/src/wrapped/wrappedcrypto_private.h
+++ b/src/wrapped/wrappedcrypto_private.h
@@ -2603,7 +2603,7 @@ GO(OpenSSL_add_all_ciphers, vFv)
 //GO(OPENSSL_asc2uni, 
 //GO(OPENSSL_atomic_add, 
 //GO(OPENSSL_cleanse, 
-//GO(OPENSSL_config, 
+GO(OPENSSL_config, vFp)
 //GO(OPENSSL_cpuid_setup, 
 //GO(OpenSSLDie, 
 //GO(OPENSSL_DIR_end, 
@@ -2619,7 +2619,7 @@ GO(OpenSSL_add_all_ciphers, vFv)
 //GO(OPENSSL_issetugid, 
 //GO(OPENSSL_load_builtin_modules, 
 //GO(OPENSSL_memcmp, 
-//GO(OPENSSL_no_config, 
+GO(OPENSSL_no_config, vFv)
 //GO(OPENSSL_rdtsc, 
 //GO(OPENSSL_showfatal, 
 //GO(OPENSSL_stderr, 
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index c87009e2..de8e8226 100755
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -434,7 +434,7 @@ GOW(ftell, lFp)
 GOW(ftello, lFp)
 GO(__ftello64, IFp)
 GOW(ftello64, IFp)
-//GO(ftime, 
+GO(ftime, iFp)
 GO(ftok, iFpi)
 GOW(ftruncate, iFil)
 GOW(ftruncate64, iFiI)
@@ -1494,10 +1494,10 @@ GOW(recvfrom, lFipLipp)
 GO(recvmmsg, iFipuip)
 GOW(recvmsg, lFipi)
 //GOW(re_exec, 
-//GOW(regcomp, 
-//GOW(regerror, 
+GOW(regcomp, iFppi)
+GOW(regerror, LFippL)
 GO(regexec, iFppLpi)
-//GOW(regfree, 
+GOW(regfree, vFp)
 GOM(__register_atfork, iFEpppp)
 //GOW(register_printf_function, 
 //GOW(register_printf_modifier,