diff --git a/src/emu/x64printer.c b/src/emu/x64printer.c index 125218ce6d..7ee28d3e75 100644 --- a/src/emu/x64printer.c +++ b/src/emu/x64printer.c @@ -847,6 +847,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX); } else if (w == vFLup) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); + } else if (w == vFLpi) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); } else if (w == vFLpL) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); } else if (w == vFLpp) { @@ -1959,6 +1961,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); } else if (w == vFpppp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); + } else if (w == vFpppV) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); } else if (w == cFpiii) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); } else if (w == cFpipp) { @@ -2893,6 +2897,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); } else if (w == vFEpppu) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); + } else if (w == vFEpppL) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); } else if (w == vFEpppp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); } else if (w == vFiiiii) { @@ -3089,6 +3095,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[0].f[0], emu->xmm[1].f[0]); } else if (w == vFpiipp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); + } else if (w == vFpiipV) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); } else if (w == vFpiuuu) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); } else if (w == vFpiUUu) { @@ -3431,6 +3439,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); } else if (w == iFpipip) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); + } else if (w == iFpiplp) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (void*)R_R8); } else if (w == iFpippi) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); } else if (w == iFpippW) { @@ -4407,6 +4417,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); } else if (w == iFEpilpV) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); + } else if (w == iFEpipip) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); } else if (w == iFEpippi) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); } else if (w == iFEpIppp) { @@ -4885,6 +4897,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); } else if (w == LFpLLLLL) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); + } else if (w == LFppipLp) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); } else if (w == LFpplplp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8, (void*)R_R9); } else if (w == LFppLLpL) { @@ -5769,6 +5783,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIu32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } else if (w == vFELpAippp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); + } else if (w == vFEpuppppV) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, (void*)(R_RSP + 8)); } else if (w == vFEppupppp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } else if (w == vFEppLippp) { @@ -6359,6 +6375,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } else if (w == iFEpiiiiipi) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); + } else if (w == iFEppiipppp) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } else if (w == iFEppuppppp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } else if (w == iFEpppupppp) { @@ -6525,6 +6543,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } else if (w == vFEpppuipppp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); + } else if (w == vFEppplliupi) { + snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIi64 ", %" PRIi32 ", %" PRIu32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); } else if (w == vFEpppLuLpLp) { snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu32 ", %" PRIu64 ", %" PRIp ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); } else if (w == vFEppppppLpp) { diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index b6727b0a93..bebace49c3 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -473,6 +473,7 @@ #() vFllp #() vFlpp #() vFLup +#() vFLpi #() vFLpL #() vFLpp #() vFpcu @@ -1096,6 +1097,7 @@ #() vFpppl #() vFpppL #() vFpppp +#() vFpppV #() vFSppi #() vFHHpi #() cFpiii @@ -1623,6 +1625,7 @@ #() vFEppLp #() vFEpppi #() vFEpppu +#() vFEpppL #() vFEpppp #() vFiiiii #() vFiiiiu @@ -1721,6 +1724,7 @@ #() vFpiiup #() vFpiiff #() vFpiipp +#() vFpiipV #() vFpiuuu #() vFpiUUu #() vFpiUUp @@ -1892,6 +1896,7 @@ #() iFpipiu #() iFpipiL #() iFpipip +#() iFpiplp #() iFpippi #() iFpippW #() iFpippL @@ -2414,6 +2419,7 @@ #() iFEpiipp #() iFEpiipV #() iFEpilpV +#() iFEpipip #() iFEpippi #() iFEpIppp #() iFEpuipp @@ -2663,6 +2669,7 @@ #() LFplplpl #() LFpLippp #() LFpLLLLL +#() LFppipLp #() LFpplplp #() LFppLLpL #() LFppLpLi @@ -3136,6 +3143,7 @@ #() vFELippppV #() vFELupippp #() vFELpAippp +#() vFEpuppppV #() vFEppupppp #() vFEppLippp #() vFEppLpLpp @@ -3446,6 +3454,7 @@ #() vFppppppppL #() vFppppppppp #() iFEpiiiiipi +#() iFEppiipppp #() iFEppuppppp #() iFEpppupppp #() iFEppplPPPP @@ -3539,6 +3548,7 @@ #() vFEiuppppppp #() vFEpuppppppp #() vFEpppuipppp +#() vFEppplliupi #() vFEpppLuLpLp #() vFEppppppLpp #() vFiiiiiiiiii @@ -3939,6 +3949,7 @@ #() iFEv -> iFE #() lFEv -> lFE #() pFEv -> pFE +#() vFvLpi -> vFLpi #() iFEvpp -> iFEpp #() pFEppv -> pFEpp #() iFEpvpp -> iFEppp @@ -4081,15 +4092,25 @@ wrappedcrypto3: - vFp: - CRYPTO_set_id_callback - CRYPTO_set_locking_callback + - OSSL_PARAM_construct_end - pFp: - OPENSSL_sk_new - X509V3_EXT_get - vFpp: + - ERR_print_errors_cb - OPENSSL_sk_pop_free - X509_STORE_CTX_set_verify_cb - X509_STORE_set_verify_cb +- iFpp: + - BIO_meth_set_gets + - UI_method_set_closer + - UI_method_set_opener + - UI_method_set_reader + - UI_method_set_writer - vFppp: - EVP_MD_do_all_provided + - OSSL_PARAM_construct_int + - OSSL_PARAM_construct_uint - iFppp: - ASN1_i2d_bio - iFppV: @@ -4100,11 +4121,17 @@ wrappedcrypto3: - ERR_set_error - vFiipA: - ERR_vset_error +- vFpppL: + - OSSL_PARAM_construct_octet_string + - OSSL_PARAM_construct_utf8_string - pFiLpp: - RSA_generate_key - pFpppp: - ASN1_d2i_bio + - PEM_X509_INFO_read_bio - PEM_read_DHparams + - PEM_read_PUBKEY + - PEM_read_PrivateKey - PEM_read_bio_DHparams - PEM_read_bio_DSAPrivateKey - PEM_read_bio_DSA_PUBKEY @@ -4123,6 +4150,8 @@ wrappedcrypto3: - PEM_read_bio_X509_REQ - iFpiipp: - ENGINE_ctrl +- pFppppp: + - OSSL_STORE_open - iFpplppi: - ENGINE_ctrl_cmd - iFppppipp: @@ -4131,6 +4160,8 @@ wrappedcrypto3: - PEM_write_bio_PrivateKey - PEM_write_bio_PrivateKey_traditional - PEM_write_bio_RSAPrivateKey +- pFpppppppp: + - OSSL_STORE_open_ex wrappedcuda: - uFpp: - cuGraphHostNodeGetParams @@ -4547,10 +4578,14 @@ wrappedglib2: - g_async_queue_push_sorted - g_queue_insert_sorted - g_source_set_callback +- vFpppV: + - g_propagate_prefixed_error - iFpLpV: - g_snprintf - iFpLpA: - g_vsnprintf +- iFpppp: + - g_ptr_array_find_with_equal_func - uFiupp: - g_unix_fd_add - uFippp: @@ -4601,6 +4636,8 @@ wrappedglib2: - g_io_add_watch_full - pFppLipp: - g_variant_new_from_data +- vFpuppppV: + - g_log_structured_standard - pFppLiiup: - g_thread_create_full - iFpppupppp: @@ -4710,6 +4747,8 @@ wrappedgobject2: wrappedgomp: - vFppuu: - GOMP_parallel +- vFppplliupi: + - GOMP_task wrappedgssapi: wrappedgssapikrb5: wrappedgstallocators: @@ -5261,6 +5300,8 @@ wrappedlibc: - vFppL: - _ITM_memcpyRnWt - _ITM_memcpyRtWn +- vFppV: + - argp_error - iFiiu: - pidfd_getfd - iFiip: @@ -5414,6 +5455,8 @@ wrappedlibc: - ptrace - lFppLL: - __readlink_chk +- vFpiipV: + - argp_failure - vFpLLpp: - qsort_r - iFiipup: @@ -6023,8 +6066,13 @@ wrappedlibsqlite3: - sqlite3_mprintf - pFpA: - sqlite3_vmprintf +- iFpipip: + - sqlite3_bind_blob + - sqlite3_bind_text - iFppppp: - sqlite3_exec +- iFppiipppp: + - sqlite3_create_function wrappedlibssh2: - iFppup: - libssh2_userauth_keyboard_interactive_ex @@ -6067,6 +6115,7 @@ wrappedlibssl3: - SSL_CTX_set_cookie_generate_cb - SSL_CTX_set_cookie_verify_cb - SSL_CTX_set_default_passwd_cb + - SSL_CTX_set_info_callback - SSL_CTX_set_keylog_callback - SSL_CTX_set_msg_callback - SSL_CTX_set_psk_client_callback diff --git a/src/wrapped/generated/wrappedcrypto3types.h b/src/wrapped/generated/wrappedcrypto3types.h index 4afc1054cc..0e2d0d6352 100644 --- a/src/wrapped/generated/wrappedcrypto3types.h +++ b/src/wrapped/generated/wrappedcrypto3types.h @@ -14,35 +14,53 @@ typedef void (*vFp_t)(void*); typedef void* (*pFp_t)(void*); typedef void (*vFpp_t)(void*, void*); +typedef int32_t (*iFpp_t)(void*, void*); typedef void (*vFppp_t)(void*, void*, void*); typedef int32_t (*iFppp_t)(void*, void*, void*); typedef int32_t (*iFppV_t)(void*, void*, ...); typedef void* (*pFppp_t)(void*, void*, void*); typedef void (*vFiipV_t)(int32_t, int32_t, void*, ...); typedef void (*vFiipA_t)(int32_t, int32_t, void*, va_list); +typedef void (*vFpppL_t)(void*, void*, void*, uintptr_t); typedef void* (*pFiLpp_t)(int32_t, uintptr_t, void*, void*); typedef void* (*pFpppp_t)(void*, void*, void*, void*); typedef int32_t (*iFpiipp_t)(void*, int32_t, int32_t, void*, void*); +typedef void* (*pFppppp_t)(void*, void*, void*, void*, void*); typedef int32_t (*iFpplppi_t)(void*, void*, intptr_t, void*, void*, int32_t); typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*); +typedef void* (*pFpppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*); #define SUPER() ADDED_FUNCTIONS() \ GO(CRYPTO_set_id_callback, vFp_t) \ GO(CRYPTO_set_locking_callback, vFp_t) \ + GO(OSSL_PARAM_construct_end, vFp_t) \ GO(OPENSSL_sk_new, pFp_t) \ GO(X509V3_EXT_get, pFp_t) \ + GO(ERR_print_errors_cb, vFpp_t) \ GO(OPENSSL_sk_pop_free, vFpp_t) \ GO(X509_STORE_CTX_set_verify_cb, vFpp_t) \ GO(X509_STORE_set_verify_cb, vFpp_t) \ + GO(BIO_meth_set_gets, iFpp_t) \ + GO(UI_method_set_closer, iFpp_t) \ + GO(UI_method_set_opener, iFpp_t) \ + GO(UI_method_set_reader, iFpp_t) \ + GO(UI_method_set_writer, iFpp_t) \ GO(EVP_MD_do_all_provided, vFppp_t) \ + GO(OSSL_PARAM_construct_int, vFppp_t) \ + GO(OSSL_PARAM_construct_uint, vFppp_t) \ GO(ASN1_i2d_bio, iFppp_t) \ GO(BIO_printf, iFppV_t) \ GO(OPENSSL_sk_deep_copy, pFppp_t) \ GO(ERR_set_error, vFiipV_t) \ GO(ERR_vset_error, vFiipA_t) \ + GO(OSSL_PARAM_construct_octet_string, vFpppL_t) \ + GO(OSSL_PARAM_construct_utf8_string, vFpppL_t) \ GO(RSA_generate_key, pFiLpp_t) \ GO(ASN1_d2i_bio, pFpppp_t) \ + GO(PEM_X509_INFO_read_bio, pFpppp_t) \ GO(PEM_read_DHparams, pFpppp_t) \ + GO(PEM_read_PUBKEY, pFpppp_t) \ + GO(PEM_read_PrivateKey, pFpppp_t) \ GO(PEM_read_bio_DHparams, pFpppp_t) \ GO(PEM_read_bio_DSAPrivateKey, pFpppp_t) \ GO(PEM_read_bio_DSA_PUBKEY, pFpppp_t) \ @@ -60,11 +78,13 @@ typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void* GO(PEM_read_bio_X509_CRL, pFpppp_t) \ GO(PEM_read_bio_X509_REQ, pFpppp_t) \ GO(ENGINE_ctrl, iFpiipp_t) \ + GO(OSSL_STORE_open, pFppppp_t) \ GO(ENGINE_ctrl_cmd, iFpplppi_t) \ GO(PEM_write_bio_DSAPrivateKey, iFppppipp_t) \ GO(PEM_write_bio_ECPrivateKey, iFppppipp_t) \ GO(PEM_write_bio_PrivateKey, iFppppipp_t) \ GO(PEM_write_bio_PrivateKey_traditional, iFppppipp_t) \ - GO(PEM_write_bio_RSAPrivateKey, iFppppipp_t) + GO(PEM_write_bio_RSAPrivateKey, iFppppipp_t) \ + GO(OSSL_STORE_open_ex, pFpppppppp_t) #endif // __wrappedcrypto3TYPES_H_ diff --git a/src/wrapped/generated/wrappedglib2types.h b/src/wrapped/generated/wrappedglib2types.h index 88b59c6f33..35a05112cf 100644 --- a/src/wrapped/generated/wrappedglib2types.h +++ b/src/wrapped/generated/wrappedglib2types.h @@ -39,8 +39,10 @@ typedef void (*vFpipV_t)(void*, int32_t, void*, ...); typedef void (*vFpipA_t)(void*, int32_t, void*, va_list); typedef void (*vFpupp_t)(void*, uint32_t, void*, void*); typedef void (*vFpppp_t)(void*, void*, void*, void*); +typedef void (*vFpppV_t)(void*, void*, void*, ...); typedef int32_t (*iFpLpV_t)(void*, uintptr_t, void*, ...); typedef int32_t (*iFpLpA_t)(void*, uintptr_t, void*, va_list); +typedef int32_t (*iFpppp_t)(void*, void*, void*, void*); typedef uint32_t (*uFiupp_t)(int32_t, uint32_t, void*, void*); typedef uint32_t (*uFippp_t)(int32_t, void*, void*, void*); typedef uint32_t (*uFpipp_t)(void*, int32_t, void*, void*); @@ -62,6 +64,7 @@ typedef int32_t (*iFpupppp_t)(void*, uint32_t, void*, void*, void*, void*); typedef uint32_t (*uFiiuppp_t)(int32_t, int32_t, uint32_t, void*, void*, void*); typedef uint32_t (*uFpiuppp_t)(void*, int32_t, uint32_t, void*, void*, void*); typedef void* (*pFppLipp_t)(void*, void*, uintptr_t, int32_t, void*, void*); +typedef void (*vFpuppppV_t)(void*, uint32_t, void*, void*, void*, void*, ...); typedef void* (*pFppLiiup_t)(void*, void*, uintptr_t, int32_t, int32_t, uint32_t, void*); typedef int32_t (*iFpppupppp_t)(void*, void*, void*, uint32_t, void*, void*, void*, void*); typedef int32_t (*iFpppupppppp_t)(void*, void*, void*, uint32_t, void*, void*, void*, void*, void*, void*); @@ -163,8 +166,10 @@ typedef int32_t (*iFpppuppppppp_t)(void*, void*, void*, uint32_t, void*, void*, GO(g_async_queue_push_sorted, vFpppp_t) \ GO(g_queue_insert_sorted, vFpppp_t) \ GO(g_source_set_callback, vFpppp_t) \ + GO(g_propagate_prefixed_error, vFpppV_t) \ GO(g_snprintf, iFpLpV_t) \ GO(g_vsnprintf, iFpLpA_t) \ + GO(g_ptr_array_find_with_equal_func, iFpppp_t) \ GO(g_unix_fd_add, uFiupp_t) \ GO(g_idle_add_full, uFippp_t) \ GO(g_log_set_handler, uFpipp_t) \ @@ -194,6 +199,7 @@ typedef int32_t (*iFpppuppppppp_t)(void*, void*, void*, uint32_t, void*, void*, GO(g_unix_fd_add_full, uFiiuppp_t) \ GO(g_io_add_watch_full, uFpiuppp_t) \ GO(g_variant_new_from_data, pFppLipp_t) \ + GO(g_log_structured_standard, vFpuppppV_t) \ GO(g_thread_create_full, pFppLiiup_t) \ GO(g_spawn_async, iFpppupppp_t) \ GO(g_spawn_sync, iFpppupppppp_t) \ diff --git a/src/wrapped/generated/wrappedgomptypes.h b/src/wrapped/generated/wrappedgomptypes.h index c3d6bac87a..5262f35062 100644 --- a/src/wrapped/generated/wrappedgomptypes.h +++ b/src/wrapped/generated/wrappedgomptypes.h @@ -12,8 +12,10 @@ #endif typedef void (*vFppuu_t)(void*, void*, uint32_t, uint32_t); +typedef void (*vFppplliupi_t)(void*, void*, void*, intptr_t, intptr_t, int32_t, uint32_t, void*, int32_t); #define SUPER() ADDED_FUNCTIONS() \ - GO(GOMP_parallel, vFppuu_t) + GO(GOMP_parallel, vFppuu_t) \ + GO(GOMP_task, vFppplliupi_t) #endif // __wrappedgompTYPES_H_ diff --git a/src/wrapped/generated/wrappedlibctypes.h b/src/wrapped/generated/wrappedlibctypes.h index 8483025f54..b25bcb6dfc 100644 --- a/src/wrapped/generated/wrappedlibctypes.h +++ b/src/wrapped/generated/wrappedlibctypes.h @@ -50,6 +50,7 @@ typedef void (*vFipA_t)(int32_t, void*, va_list); typedef void (*vFpii_t)(void*, int32_t, int32_t); typedef void (*vFpup_t)(void*, uint32_t, void*); typedef void (*vFppL_t)(void*, void*, uintptr_t); +typedef void (*vFppV_t)(void*, void*, ...); typedef int32_t (*iFiiu_t)(int32_t, int32_t, uint32_t); typedef int32_t (*iFiip_t)(int32_t, int32_t, void*); typedef int32_t (*iFiiN_t)(int32_t, int32_t, ...); @@ -96,6 +97,7 @@ typedef int32_t (*iFpppp_t)(void*, void*, void*, void*); typedef intptr_t (*lFippL_t)(int32_t, void*, void*, uintptr_t); typedef intptr_t (*lFuipp_t)(uint32_t, int32_t, void*, void*); typedef intptr_t (*lFppLL_t)(void*, void*, uintptr_t, uintptr_t); +typedef void (*vFpiipV_t)(void*, int32_t, int32_t, void*, ...); typedef void (*vFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*); typedef int32_t (*iFiipup_t)(int32_t, int32_t, void*, uint32_t, void*); typedef int32_t (*iFiippi_t)(int32_t, int32_t, void*, void*, int32_t); @@ -230,6 +232,7 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void* GO(_ITM_addUserCommitAction, vFpup_t) \ GO(_ITM_memcpyRnWt, vFppL_t) \ GO(_ITM_memcpyRtWn, vFppL_t) \ + GO(argp_error, vFppV_t) \ GO(pidfd_getfd, iFiiu_t) \ GO(__fxstat, iFiip_t) \ GO(__fxstat64, iFiip_t) \ @@ -337,6 +340,7 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void* GO(readlinkat, lFippL_t) \ GO(ptrace, lFuipp_t) \ GO(__readlink_chk, lFppLL_t) \ + GO(argp_failure, vFpiipV_t) \ GO(qsort_r, vFpLLpp_t) \ GO(__xmknodat, iFiipup_t) \ GO(__fxstatat, iFiippi_t) \ diff --git a/src/wrapped/generated/wrappedlibsqlite3types.h b/src/wrapped/generated/wrappedlibsqlite3types.h index d36376dcc4..ca8c351fa7 100644 --- a/src/wrapped/generated/wrappedlibsqlite3types.h +++ b/src/wrapped/generated/wrappedlibsqlite3types.h @@ -14,12 +14,17 @@ typedef void* (*pFp_t)(void*); typedef void* (*pFpV_t)(void*, ...); typedef void* (*pFpA_t)(void*, va_list); +typedef int32_t (*iFpipip_t)(void*, int32_t, void*, int32_t, void*); typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*); +typedef int32_t (*iFppiipppp_t)(void*, void*, int32_t, int32_t, void*, void*, void*, void*); #define SUPER() ADDED_FUNCTIONS() \ GO(sqlite3_database_file_object, pFp_t) \ GO(sqlite3_mprintf, pFpV_t) \ GO(sqlite3_vmprintf, pFpA_t) \ - GO(sqlite3_exec, iFppppp_t) + GO(sqlite3_bind_blob, iFpipip_t) \ + GO(sqlite3_bind_text, iFpipip_t) \ + GO(sqlite3_exec, iFppppp_t) \ + GO(sqlite3_create_function, iFppiipppp_t) #endif // __wrappedlibsqlite3TYPES_H_ diff --git a/src/wrapped/generated/wrappedlibssl3types.h b/src/wrapped/generated/wrappedlibssl3types.h index e7446cb61e..b698a18bdb 100644 --- a/src/wrapped/generated/wrappedlibssl3types.h +++ b/src/wrapped/generated/wrappedlibssl3types.h @@ -28,6 +28,7 @@ typedef int32_t (*iFlpppp_t)(intptr_t, void*, void*, void*, void*); GO(SSL_CTX_set_cookie_generate_cb, vFpp_t) \ GO(SSL_CTX_set_cookie_verify_cb, vFpp_t) \ GO(SSL_CTX_set_default_passwd_cb, vFpp_t) \ + GO(SSL_CTX_set_info_callback, vFpp_t) \ GO(SSL_CTX_set_keylog_callback, vFpp_t) \ GO(SSL_CTX_set_msg_callback, vFpp_t) \ GO(SSL_CTX_set_psk_client_callback, vFpp_t) \ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index 2be771d30c..4789cfb4d3 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -507,6 +507,7 @@ typedef void (*vFlip_t)(intptr_t, int32_t, void*); typedef void (*vFllp_t)(intptr_t, intptr_t, void*); typedef void (*vFlpp_t)(intptr_t, void*, void*); typedef void (*vFLup_t)(uintptr_t, uint32_t, void*); +typedef void (*vFLpi_t)(uintptr_t, void*, int32_t); typedef void (*vFLpL_t)(uintptr_t, void*, uintptr_t); typedef void (*vFLpp_t)(uintptr_t, void*, void*); typedef void (*vFpcu_t)(void*, int8_t, uint32_t); @@ -1126,6 +1127,7 @@ typedef void (*vFpppd_t)(void*, void*, void*, double); typedef void (*vFpppl_t)(void*, void*, void*, intptr_t); typedef void (*vFpppL_t)(void*, void*, void*, uintptr_t); typedef void (*vFpppp_t)(void*, void*, void*, void*); +typedef void (*vFpppV_t)(void*, void*, void*, void*); typedef void (*vFSppi_t)(void*, void*, void*, int32_t); typedef void (*vFHHpi_t)(unsigned __int128, unsigned __int128, void*, int32_t); typedef int8_t (*cFpiii_t)(void*, int32_t, int32_t, int32_t); @@ -1651,6 +1653,7 @@ typedef void (*vFEppup_t)(x64emu_t*, void*, void*, uint32_t, void*); typedef void (*vFEppLp_t)(x64emu_t*, void*, void*, uintptr_t, void*); typedef void (*vFEpppi_t)(x64emu_t*, void*, void*, void*, int32_t); typedef void (*vFEpppu_t)(x64emu_t*, void*, void*, void*, uint32_t); +typedef void (*vFEpppL_t)(x64emu_t*, void*, void*, void*, uintptr_t); typedef void (*vFEpppp_t)(x64emu_t*, void*, void*, void*, void*); typedef void (*vFiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t); typedef void (*vFiiiiu_t)(int32_t, int32_t, int32_t, int32_t, uint32_t); @@ -1749,6 +1752,7 @@ typedef void (*vFpiiuu_t)(void*, int32_t, int32_t, uint32_t, uint32_t); typedef void (*vFpiiup_t)(void*, int32_t, int32_t, uint32_t, void*); typedef void (*vFpiiff_t)(void*, int32_t, int32_t, float, float); typedef void (*vFpiipp_t)(void*, int32_t, int32_t, void*, void*); +typedef void (*vFpiipV_t)(void*, int32_t, int32_t, void*, void*); typedef void (*vFpiuuu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t); typedef void (*vFpiUUu_t)(void*, int32_t, uint64_t, uint64_t, uint32_t); typedef void (*vFpiUUp_t)(void*, int32_t, uint64_t, uint64_t, void*); @@ -1920,6 +1924,7 @@ typedef int32_t (*iFpipii_t)(void*, int32_t, void*, int32_t, int32_t); typedef int32_t (*iFpipiu_t)(void*, int32_t, void*, int32_t, uint32_t); typedef int32_t (*iFpipiL_t)(void*, int32_t, void*, int32_t, uintptr_t); typedef int32_t (*iFpipip_t)(void*, int32_t, void*, int32_t, void*); +typedef int32_t (*iFpiplp_t)(void*, int32_t, void*, intptr_t, void*); typedef int32_t (*iFpippi_t)(void*, int32_t, void*, void*, int32_t); typedef int32_t (*iFpippW_t)(void*, int32_t, void*, void*, uint16_t); typedef int32_t (*iFpippL_t)(void*, int32_t, void*, void*, uintptr_t); @@ -2442,6 +2447,7 @@ typedef int32_t (*iFEpiipi_t)(x64emu_t*, void*, int32_t, int32_t, void*, int32_t typedef int32_t (*iFEpiipp_t)(x64emu_t*, void*, int32_t, int32_t, void*, void*); typedef int32_t (*iFEpiipV_t)(x64emu_t*, void*, int32_t, int32_t, void*, void*); typedef int32_t (*iFEpilpV_t)(x64emu_t*, void*, int32_t, intptr_t, void*, void*); +typedef int32_t (*iFEpipip_t)(x64emu_t*, void*, int32_t, void*, int32_t, void*); typedef int32_t (*iFEpippi_t)(x64emu_t*, void*, int32_t, void*, void*, int32_t); typedef int32_t (*iFEpIppp_t)(x64emu_t*, void*, int64_t, void*, void*, void*); typedef int32_t (*iFEpuipp_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*); @@ -2690,6 +2696,7 @@ typedef uintptr_t (*LFpipipi_t)(void*, int32_t, void*, int32_t, void*, int32_t); typedef uintptr_t (*LFplplpl_t)(void*, intptr_t, void*, intptr_t, void*, intptr_t); typedef uintptr_t (*LFpLippp_t)(void*, uintptr_t, int32_t, void*, void*, void*); typedef uintptr_t (*LFpLLLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t); +typedef uintptr_t (*LFppipLp_t)(void*, void*, int32_t, void*, uintptr_t, void*); typedef uintptr_t (*LFpplplp_t)(void*, void*, intptr_t, void*, intptr_t, void*); typedef uintptr_t (*LFppLLpL_t)(void*, void*, uintptr_t, uintptr_t, void*, uintptr_t); typedef uintptr_t (*LFppLpLi_t)(void*, void*, uintptr_t, void*, uintptr_t, int32_t); @@ -3163,6 +3170,7 @@ typedef int32_t (*iWpppuppp_t)(void*, void*, void*, uint32_t, void*, void*, void typedef void (*vFELippppV_t)(x64emu_t*, uintptr_t, int32_t, void*, void*, void*, void*, void*); typedef void (*vFELupippp_t)(x64emu_t*, uintptr_t, uint32_t, void*, int32_t, void*, void*, void*); typedef void (*vFELpAippp_t)(x64emu_t*, uintptr_t, void*, void*, int32_t, void*, void*, void*); +typedef void (*vFEpuppppV_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*, void*); typedef void (*vFEppupppp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*, void*, void*); typedef void (*vFEppLippp_t)(x64emu_t*, void*, void*, uintptr_t, int32_t, void*, void*, void*); typedef void (*vFEppLpLpp_t)(x64emu_t*, void*, void*, uintptr_t, void*, uintptr_t, void*, void*); @@ -3472,6 +3480,7 @@ typedef void (*vFpppppppLL_t)(void*, void*, void*, void*, void*, void*, void*, u typedef void (*vFppppppppL_t)(void*, void*, void*, void*, void*, void*, void*, void*, uintptr_t); typedef void (*vFppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*); typedef int32_t (*iFEpiiiiipi_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t); +typedef int32_t (*iFEppiipppp_t)(x64emu_t*, void*, void*, int32_t, int32_t, void*, void*, void*, void*); typedef int32_t (*iFEppuppppp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*, void*, void*, void*); typedef int32_t (*iFEpppupppp_t)(x64emu_t*, void*, void*, void*, uint32_t, void*, void*, void*, void*); typedef int32_t (*iFEppplPPPP_t)(x64emu_t*, void*, void*, void*, intptr_t, void*, void*, void*, void*); @@ -3565,6 +3574,7 @@ typedef int32_t (*iWppppupiii_t)(void*, void*, void*, void*, uint32_t, void*, in typedef void (*vFEiuppppppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*, void*, void*, void*, void*); typedef void (*vFEpuppppppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*, void*, void*, void*); typedef void (*vFEpppuipppp_t)(x64emu_t*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*); +typedef void (*vFEppplliupi_t)(x64emu_t*, void*, void*, void*, intptr_t, intptr_t, int32_t, uint32_t, void*, int32_t); typedef void (*vFEpppLuLpLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, uint32_t, uintptr_t, void*, uintptr_t, void*); typedef void (*vFEppppppLpp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, uintptr_t, void*, void*); typedef void (*vFiiiiiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t); @@ -4483,6 +4493,7 @@ void vFlip(x64emu_t *emu, uintptr_t fcn) { vFlip_t fn = (vFlip_t)fcn; fn((intptr void vFllp(x64emu_t *emu, uintptr_t fcn) { vFllp_t fn = (vFllp_t)fcn; fn((intptr_t)R_RDI, (intptr_t)R_RSI, (void*)R_RDX); } void vFlpp(x64emu_t *emu, uintptr_t fcn) { vFlpp_t fn = (vFlpp_t)fcn; fn((intptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX); } void vFLup(x64emu_t *emu, uintptr_t fcn) { vFLup_t fn = (vFLup_t)fcn; fn((uintptr_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); } +void vFLpi(x64emu_t *emu, uintptr_t fcn) { vFLpi_t fn = (vFLpi_t)fcn; fn((uintptr_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); } void vFLpL(x64emu_t *emu, uintptr_t fcn) { vFLpL_t fn = (vFLpL_t)fcn; fn((uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); } void vFLpp(x64emu_t *emu, uintptr_t fcn) { vFLpp_t fn = (vFLpp_t)fcn; fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX); } void vFpcu(x64emu_t *emu, uintptr_t fcn) { vFpcu_t fn = (vFpcu_t)fcn; fn((void*)R_RDI, (int8_t)R_RSI, (uint32_t)R_RDX); } @@ -5102,6 +5113,7 @@ void vFpppd(x64emu_t *emu, uintptr_t fcn) { vFpppd_t fn = (vFpppd_t)fcn; fn((voi void vFpppl(x64emu_t *emu, uintptr_t fcn) { vFpppl_t fn = (vFpppl_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX); } void vFpppL(x64emu_t *emu, uintptr_t fcn) { vFpppL_t fn = (vFpppL_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); } void vFpppp(x64emu_t *emu, uintptr_t fcn) { vFpppp_t fn = (vFpppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); } +void vFpppV(x64emu_t *emu, uintptr_t fcn) { vFpppV_t fn = (vFpppV_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); } void vFSppi(x64emu_t *emu, uintptr_t fcn) { vFSppi_t fn = (vFSppi_t)fcn; fn(io_convert((void*)R_RDI), (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); } void vFHHpi(x64emu_t *emu, uintptr_t fcn) { vFHHpi_t fn = (vFHHpi_t)fcn; fn((unsigned __int128)R_RDI + ((unsigned __int128)R_RSI << 64), (unsigned __int128)R_RDX + ((unsigned __int128)R_RCX << 64), (void*)R_R8, (int32_t)R_R9); } void cFpiii(x64emu_t *emu, uintptr_t fcn) { cFpiii_t fn = (cFpiii_t)fcn; R_RAX=(uint8_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); } @@ -5627,6 +5639,7 @@ void vFEppup(x64emu_t *emu, uintptr_t fcn) { vFEppup_t fn = (vFEppup_t)fcn; fn(e void vFEppLp(x64emu_t *emu, uintptr_t fcn) { vFEppLp_t fn = (vFEppLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); } void vFEpppi(x64emu_t *emu, uintptr_t fcn) { vFEpppi_t fn = (vFEpppi_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); } void vFEpppu(x64emu_t *emu, uintptr_t fcn) { vFEpppu_t fn = (vFEpppu_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); } +void vFEpppL(x64emu_t *emu, uintptr_t fcn) { vFEpppL_t fn = (vFEpppL_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); } void vFEpppp(x64emu_t *emu, uintptr_t fcn) { vFEpppp_t fn = (vFEpppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); } void vFiiiii(x64emu_t *emu, uintptr_t fcn) { vFiiiii_t fn = (vFiiiii_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); } void vFiiiiu(x64emu_t *emu, uintptr_t fcn) { vFiiiiu_t fn = (vFiiiiu_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); } @@ -5725,6 +5738,7 @@ void vFpiiuu(x64emu_t *emu, uintptr_t fcn) { vFpiiuu_t fn = (vFpiiuu_t)fcn; fn(( void vFpiiup(x64emu_t *emu, uintptr_t fcn) { vFpiiup_t fn = (vFpiiup_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); } void vFpiiff(x64emu_t *emu, uintptr_t fcn) { vFpiiff_t fn = (vFpiiff_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[0].f[0], emu->xmm[1].f[0]); } void vFpiipp(x64emu_t *emu, uintptr_t fcn) { vFpiipp_t fn = (vFpiipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); } +void vFpiipV(x64emu_t *emu, uintptr_t fcn) { vFpiipV_t fn = (vFpiipV_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); } void vFpiuuu(x64emu_t *emu, uintptr_t fcn) { vFpiuuu_t fn = (vFpiuuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); } void vFpiUUu(x64emu_t *emu, uintptr_t fcn) { vFpiUUu_t fn = (vFpiUUu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint32_t)R_R8); } void vFpiUUp(x64emu_t *emu, uintptr_t fcn) { vFpiUUp_t fn = (vFpiUUp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); } @@ -5896,6 +5910,7 @@ void iFpipii(x64emu_t *emu, uintptr_t fcn) { iFpipii_t fn = (iFpipii_t)fcn; R_RA void iFpipiu(x64emu_t *emu, uintptr_t fcn) { iFpipiu_t fn = (iFpipiu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); } void iFpipiL(x64emu_t *emu, uintptr_t fcn) { iFpipiL_t fn = (iFpipiL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); } void iFpipip(x64emu_t *emu, uintptr_t fcn) { iFpipip_t fn = (iFpipip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); } +void iFpiplp(x64emu_t *emu, uintptr_t fcn) { iFpiplp_t fn = (iFpiplp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (void*)R_R8); } void iFpippi(x64emu_t *emu, uintptr_t fcn) { iFpippi_t fn = (iFpippi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); } void iFpippW(x64emu_t *emu, uintptr_t fcn) { iFpippW_t fn = (iFpippW_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8); } void iFpippL(x64emu_t *emu, uintptr_t fcn) { iFpippL_t fn = (iFpippL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); } @@ -6418,6 +6433,7 @@ void iFEpiipi(x64emu_t *emu, uintptr_t fcn) { iFEpiipi_t fn = (iFEpiipi_t)fcn; R void iFEpiipp(x64emu_t *emu, uintptr_t fcn) { iFEpiipp_t fn = (iFEpiipp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); } void iFEpiipV(x64emu_t *emu, uintptr_t fcn) { iFEpiipV_t fn = (iFEpiipV_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); } void iFEpilpV(x64emu_t *emu, uintptr_t fcn) { iFEpilpV_t fn = (iFEpilpV_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); } +void iFEpipip(x64emu_t *emu, uintptr_t fcn) { iFEpipip_t fn = (iFEpipip_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); } void iFEpippi(x64emu_t *emu, uintptr_t fcn) { iFEpippi_t fn = (iFEpippi_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); } void iFEpIppp(x64emu_t *emu, uintptr_t fcn) { iFEpIppp_t fn = (iFEpIppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } void iFEpuipp(x64emu_t *emu, uintptr_t fcn) { iFEpuipp_t fn = (iFEpuipp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); } @@ -6666,6 +6682,7 @@ void LFpipipi(x64emu_t *emu, uintptr_t fcn) { LFpipipi_t fn = (LFpipipi_t)fcn; R void LFplplpl(x64emu_t *emu, uintptr_t fcn) { LFplplpl_t fn = (LFplplpl_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (intptr_t)R_R9); } void LFpLippp(x64emu_t *emu, uintptr_t fcn) { LFpLippp_t fn = (LFpLippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); } void LFpLLLLL(x64emu_t *emu, uintptr_t fcn) { LFpLLLLL_t fn = (LFpLLLLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); } +void LFppipLp(x64emu_t *emu, uintptr_t fcn) { LFppipLp_t fn = (LFppipLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); } void LFpplplp(x64emu_t *emu, uintptr_t fcn) { LFpplplp_t fn = (LFpplplp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8, (void*)R_R9); } void LFppLLpL(x64emu_t *emu, uintptr_t fcn) { LFppLLpL_t fn = (LFppLLpL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9); } void LFppLpLi(x64emu_t *emu, uintptr_t fcn) { LFppLpLi_t fn = (LFppLpLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (int32_t)R_R9); } @@ -7139,6 +7156,7 @@ void iWpppuppp(x64emu_t *emu, uintptr_t fcn) { iWpppuppp_t fn = (iWpppuppp_t)fcn void vFELippppV(x64emu_t *emu, uintptr_t fcn) { vFELippppV_t fn = (vFELippppV_t)fcn; fn(emu, (uintptr_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, (void*)(R_RSP + 8)); } void vFELupippp(x64emu_t *emu, uintptr_t fcn) { vFELupippp_t fn = (vFELupippp_t)fcn; fn(emu, (uintptr_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } void vFELpAippp(x64emu_t *emu, uintptr_t fcn) { vFELpAippp_t fn = (vFELpAippp_t)fcn; fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } +void vFEpuppppV(x64emu_t *emu, uintptr_t fcn) { vFEpuppppV_t fn = (vFEpuppppV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, (void*)(R_RSP + 8)); } void vFEppupppp(x64emu_t *emu, uintptr_t fcn) { vFEppupppp_t fn = (vFEppupppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } void vFEppLippp(x64emu_t *emu, uintptr_t fcn) { vFEppLippp_t fn = (vFEppLippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } void vFEppLpLpp(x64emu_t *emu, uintptr_t fcn) { vFEppLpLpp_t fn = (vFEppLpLpp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); } @@ -7448,6 +7466,7 @@ void vFpppppppLL(x64emu_t *emu, uintptr_t fcn) { vFpppppppLL_t fn = (vFpppppppLL void vFppppppppL(x64emu_t *emu, uintptr_t fcn) { vFppppppppL_t fn = (vFppppppppL_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24)); } void vFppppppppp(x64emu_t *emu, uintptr_t fcn) { vFppppppppp_t fn = (vFppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } void iFEpiiiiipi(x64emu_t *emu, uintptr_t fcn) { iFEpiiiiipi_t fn = (iFEpiiiiipi_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); } +void iFEppiipppp(x64emu_t *emu, uintptr_t fcn) { iFEppiipppp_t fn = (iFEppiipppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } void iFEppuppppp(x64emu_t *emu, uintptr_t fcn) { iFEppuppppp_t fn = (iFEppuppppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } void iFEpppupppp(x64emu_t *emu, uintptr_t fcn) { iFEpppupppp_t fn = (iFEpppupppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); } void iFEppplPPPP(x64emu_t *emu, uintptr_t fcn) { iFEppplPPPP_t fn = (iFEppplPPPP_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); } @@ -7541,6 +7560,7 @@ void iWppppupiii(x64emu_t *emu, uintptr_t fcn) { iWppppupiii_t fn = (iWppppupiii void vFEiuppppppp(x64emu_t *emu, uintptr_t fcn) { vFEiuppppppp_t fn = (vFEiuppppppp_t)fcn; fn(emu, (int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } void vFEpuppppppp(x64emu_t *emu, uintptr_t fcn) { vFEpuppppppp_t fn = (vFEpuppppppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } void vFEpppuipppp(x64emu_t *emu, uintptr_t fcn) { vFEpppuipppp_t fn = (vFEpppuipppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } +void vFEppplliupi(x64emu_t *emu, uintptr_t fcn) { vFEppplliupi_t fn = (vFEppplliupi_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); } void vFEpppLuLpLp(x64emu_t *emu, uintptr_t fcn) { vFEpppLuLpLp_t fn = (vFEpppLuLpLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); } void vFEppppppLpp(x64emu_t *emu, uintptr_t fcn) { vFEppppppLpp_t fn = (vFEppppppLpp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); } void vFiiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFiiiiiiiiii_t fn = (vFiiiiiiiiii_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); } @@ -8031,6 +8051,7 @@ void vFEv(x64emu_t *emu, uintptr_t fcn) { vFE_t fn = (vFE_t)fcn; fn(emu); } void iFEv(x64emu_t *emu, uintptr_t fcn) { iFE_t fn = (iFE_t)fcn; R_RAX=(uint32_t)fn(emu); } void lFEv(x64emu_t *emu, uintptr_t fcn) { lFE_t fn = (lFE_t)fcn; R_RAX=(intptr_t)fn(emu); } void pFEv(x64emu_t *emu, uintptr_t fcn) { pFE_t fn = (pFE_t)fcn; R_RAX=(uintptr_t)fn(emu); } +void vFvLpi(x64emu_t *emu, uintptr_t fcn) { vFLpi_t fn = (vFLpi_t)fcn; fn((uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); } void iFEvpp(x64emu_t *emu, uintptr_t fcn) { iFEpp_t fn = (iFEpp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RSI, (void*)R_RDX); } void pFEppv(x64emu_t *emu, uintptr_t fcn) { pFEpp_t fn = (pFEpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI); } void iFEpvpp(x64emu_t *emu, uintptr_t fcn) { iFEppp_t fn = (iFEppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RDX, (void*)R_RCX); } @@ -8396,6 +8417,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &vFllp) return 1; if (fun == &vFlpp) return 1; if (fun == &vFLup) return 1; + if (fun == &vFLpi) return 1; if (fun == &vFLpL) return 1; if (fun == &vFLpp) return 1; if (fun == &vFpcu) return 1; @@ -9532,6 +9554,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &iFpipiu) return 1; if (fun == &iFpipiL) return 1; if (fun == &iFpipip) return 1; + if (fun == &iFpiplp) return 1; if (fun == &iFpippi) return 1; if (fun == &iFpippW) return 1; if (fun == &iFpippL) return 1; @@ -10175,6 +10198,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &LFplplpl) return 1; if (fun == &LFpLippp) return 1; if (fun == &LFpLLLLL) return 1; + if (fun == &LFppipLp) return 1; if (fun == &LFpplplp) return 1; if (fun == &LFppLLpL) return 1; if (fun == &LFppLpLi) return 1; @@ -10664,6 +10688,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &vFllp) return 1; if (fun == &vFlpp) return 1; if (fun == &vFLup) return 33; + if (fun == &vFLpi) return 65; if (fun == &vFLpL) return 1; if (fun == &vFLpp) return 1; if (fun == &vFpcu) return 97; @@ -11800,6 +11825,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &iFpipiu) return 417; if (fun == &iFpipiL) return 161; if (fun == &iFpipip) return 161; + if (fun == &iFpiplp) return 33; if (fun == &iFpippi) return 289; if (fun == &iFpippW) return 33; if (fun == &iFpippL) return 33; @@ -12443,6 +12469,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &LFplplpl) return 1; if (fun == &LFpLippp) return 65; if (fun == &LFpLLLLL) return 1; + if (fun == &LFppipLp) return 65; if (fun == &LFpplplp) return 1; if (fun == &LFppLLpL) return 1; if (fun == &LFppLpLi) return 513; @@ -12932,6 +12959,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &vFllp) return 1; if (fun == &vFlpp) return 1; if (fun == &vFLup) return 33; + if (fun == &vFLpi) return 65; if (fun == &vFLpL) return 1; if (fun == &vFLpp) return 1; if (fun == &vFpcu) return 97; @@ -14068,6 +14096,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &iFpipiu) return 417; if (fun == &iFpipiL) return 161; if (fun == &iFpipip) return 161; + if (fun == &iFpiplp) return 33; if (fun == &iFpippi) return 289; if (fun == &iFpippW) return 33; if (fun == &iFpippL) return 33; @@ -14711,6 +14740,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &LFplplpl) return 1; if (fun == &LFpLippp) return 65; if (fun == &LFpLLLLL) return 1; + if (fun == &LFppipLp) return 65; if (fun == &LFpplplp) return 1; if (fun == &LFppLLpL) return 1; if (fun == &LFppLpLi) return 513; diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index aca0b7dbb1..da17e20db9 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -510,6 +510,7 @@ void vFlip(x64emu_t *emu, uintptr_t fnc); void vFllp(x64emu_t *emu, uintptr_t fnc); void vFlpp(x64emu_t *emu, uintptr_t fnc); void vFLup(x64emu_t *emu, uintptr_t fnc); +void vFLpi(x64emu_t *emu, uintptr_t fnc); void vFLpL(x64emu_t *emu, uintptr_t fnc); void vFLpp(x64emu_t *emu, uintptr_t fnc); void vFpcu(x64emu_t *emu, uintptr_t fnc); @@ -1133,6 +1134,7 @@ void vFpppd(x64emu_t *emu, uintptr_t fnc); void vFpppl(x64emu_t *emu, uintptr_t fnc); void vFpppL(x64emu_t *emu, uintptr_t fnc); void vFpppp(x64emu_t *emu, uintptr_t fnc); +void vFpppV(x64emu_t *emu, uintptr_t fnc); void vFSppi(x64emu_t *emu, uintptr_t fnc); void vFHHpi(x64emu_t *emu, uintptr_t fnc); void cFpiii(x64emu_t *emu, uintptr_t fnc); @@ -1660,6 +1662,7 @@ void vFEppup(x64emu_t *emu, uintptr_t fnc); void vFEppLp(x64emu_t *emu, uintptr_t fnc); void vFEpppi(x64emu_t *emu, uintptr_t fnc); void vFEpppu(x64emu_t *emu, uintptr_t fnc); +void vFEpppL(x64emu_t *emu, uintptr_t fnc); void vFEpppp(x64emu_t *emu, uintptr_t fnc); void vFiiiii(x64emu_t *emu, uintptr_t fnc); void vFiiiiu(x64emu_t *emu, uintptr_t fnc); @@ -1758,6 +1761,7 @@ void vFpiiuu(x64emu_t *emu, uintptr_t fnc); void vFpiiup(x64emu_t *emu, uintptr_t fnc); void vFpiiff(x64emu_t *emu, uintptr_t fnc); void vFpiipp(x64emu_t *emu, uintptr_t fnc); +void vFpiipV(x64emu_t *emu, uintptr_t fnc); void vFpiuuu(x64emu_t *emu, uintptr_t fnc); void vFpiUUu(x64emu_t *emu, uintptr_t fnc); void vFpiUUp(x64emu_t *emu, uintptr_t fnc); @@ -1929,6 +1933,7 @@ void iFpipii(x64emu_t *emu, uintptr_t fnc); void iFpipiu(x64emu_t *emu, uintptr_t fnc); void iFpipiL(x64emu_t *emu, uintptr_t fnc); void iFpipip(x64emu_t *emu, uintptr_t fnc); +void iFpiplp(x64emu_t *emu, uintptr_t fnc); void iFpippi(x64emu_t *emu, uintptr_t fnc); void iFpippW(x64emu_t *emu, uintptr_t fnc); void iFpippL(x64emu_t *emu, uintptr_t fnc); @@ -2451,6 +2456,7 @@ void iFEpiipi(x64emu_t *emu, uintptr_t fnc); void iFEpiipp(x64emu_t *emu, uintptr_t fnc); void iFEpiipV(x64emu_t *emu, uintptr_t fnc); void iFEpilpV(x64emu_t *emu, uintptr_t fnc); +void iFEpipip(x64emu_t *emu, uintptr_t fnc); void iFEpippi(x64emu_t *emu, uintptr_t fnc); void iFEpIppp(x64emu_t *emu, uintptr_t fnc); void iFEpuipp(x64emu_t *emu, uintptr_t fnc); @@ -2700,6 +2706,7 @@ void LFpipipi(x64emu_t *emu, uintptr_t fnc); void LFplplpl(x64emu_t *emu, uintptr_t fnc); void LFpLippp(x64emu_t *emu, uintptr_t fnc); void LFpLLLLL(x64emu_t *emu, uintptr_t fnc); +void LFppipLp(x64emu_t *emu, uintptr_t fnc); void LFpplplp(x64emu_t *emu, uintptr_t fnc); void LFppLLpL(x64emu_t *emu, uintptr_t fnc); void LFppLpLi(x64emu_t *emu, uintptr_t fnc); @@ -3173,6 +3180,7 @@ void iWpppuppp(x64emu_t *emu, uintptr_t fnc); void vFELippppV(x64emu_t *emu, uintptr_t fnc); void vFELupippp(x64emu_t *emu, uintptr_t fnc); void vFELpAippp(x64emu_t *emu, uintptr_t fnc); +void vFEpuppppV(x64emu_t *emu, uintptr_t fnc); void vFEppupppp(x64emu_t *emu, uintptr_t fnc); void vFEppLippp(x64emu_t *emu, uintptr_t fnc); void vFEppLpLpp(x64emu_t *emu, uintptr_t fnc); @@ -3483,6 +3491,7 @@ void vFpppppppLL(x64emu_t *emu, uintptr_t fnc); void vFppppppppL(x64emu_t *emu, uintptr_t fnc); void vFppppppppp(x64emu_t *emu, uintptr_t fnc); void iFEpiiiiipi(x64emu_t *emu, uintptr_t fnc); +void iFEppiipppp(x64emu_t *emu, uintptr_t fnc); void iFEppuppppp(x64emu_t *emu, uintptr_t fnc); void iFEpppupppp(x64emu_t *emu, uintptr_t fnc); void iFEppplPPPP(x64emu_t *emu, uintptr_t fnc); @@ -3576,6 +3585,7 @@ void iWppppupiii(x64emu_t *emu, uintptr_t fnc); void vFEiuppppppp(x64emu_t *emu, uintptr_t fnc); void vFEpuppppppp(x64emu_t *emu, uintptr_t fnc); void vFEpppuipppp(x64emu_t *emu, uintptr_t fnc); +void vFEppplliupi(x64emu_t *emu, uintptr_t fnc); void vFEpppLuLpLp(x64emu_t *emu, uintptr_t fnc); void vFEppppppLpp(x64emu_t *emu, uintptr_t fnc); void vFiiiiiiiiii(x64emu_t *emu, uintptr_t fnc); @@ -3986,6 +3996,7 @@ void vFEv(x64emu_t *emu, uintptr_t fnc); void iFEv(x64emu_t *emu, uintptr_t fnc); void lFEv(x64emu_t *emu, uintptr_t fnc); void pFEv(x64emu_t *emu, uintptr_t fnc); +void vFvLpi(x64emu_t *emu, uintptr_t fnc); void iFEvpp(x64emu_t *emu, uintptr_t fnc); void pFEppv(x64emu_t *emu, uintptr_t fnc); void iFEpvpp(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappedcrypto3.c b/src/wrapped/wrappedcrypto3.c index fcadae8681..990e42a3d0 100644 --- a/src/wrapped/wrappedcrypto3.c +++ b/src/wrapped/wrappedcrypto3.c @@ -222,6 +222,30 @@ static void* find_passphrase_Fct(void* fct) return NULL; } +// BIO_meth_set_gets +#define GO(A) \ +static uintptr_t my3_BIO_meth_set_gets_fct_##A = 0; \ +static int my3_BIO_meth_set_gets_##A(void* a, void* b, int c) \ +{ \ + return (int)RunFunctionFmt(my3_BIO_meth_set_gets_fct_##A, "ppi", a, b, c); \ +} +SUPER() +#undef GO +static void* find_BIO_meth_set_gets_Fct(void* fct) +{ + if(!fct) return NULL; + void* p; + if((p = GetNativeFnc((uintptr_t)fct))) return p; + #define GO(A) if(my3_BIO_meth_set_gets_fct_##A == (uintptr_t)fct) return my3_BIO_meth_set_gets_##A; + SUPER() + #undef GO + #define GO(A) if(my3_BIO_meth_set_gets_fct_##A == 0) {my3_BIO_meth_set_gets_fct_##A = (uintptr_t)fct; return my3_BIO_meth_set_gets_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for libcrypto3 BIO_meth_set_gets callback\n"); + return NULL; +} + // rsakeygen #define GO(A) \ static uintptr_t my3_rsakeygen_fct_##A = 0; \ @@ -366,6 +390,92 @@ static void* find_verify_cb_Fct(void* fct) return NULL; } +// err_print_errors_cb +#define GO(A) \ +static uintptr_t my3_err_print_errors_cb_fct_##A = 0; \ +static int my3_err_print_errors_cb_##A(const char* str, size_t len, void* u) \ +{ \ + return (int)RunFunctionFmt(my3_err_print_errors_cb_fct_##A, "pLp", str, len, u); \ +} +SUPER() +#undef GO +static void* find_err_print_errors_cb_Fct(void* fct) +{ + if(!fct) return NULL; + void* p; + if((p = GetNativeFnc((uintptr_t)fct))) return p; + #define GO(A) if(my3_err_print_errors_cb_fct_##A == (uintptr_t)fct) return my3_err_print_errors_cb_##A; + SUPER() + #undef GO + #define GO(A) if(my3_err_print_errors_cb_fct_##A == 0) {my3_err_print_errors_cb_fct_##A = (uintptr_t)fct; return my3_err_print_errors_cb_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for libcrypto err_print_errors_cb callback\n"); + return NULL; +} + +// ui_opener +#define GO(A) \ +static uintptr_t my3_ui_opener_fct_##A = 0; \ +static int my3_ui_opener_##A(void *ui) \ +{ \ + return (int)RunFunctionFmt(my3_ui_opener_fct_##A, "p", ui); \ +} +SUPER() +#undef GO +static void* find_ui_opener_Fct(void *fct) +{ + if(!fct) return NULL; + void* p; + if((p = GetNativeFnc((uintptr_t)fct))) return p; + #define GO(A) if(my3_ui_opener_fct_##A == (uintptr_t)fct) return my3_ui_opener_##A; + SUPER() + #undef GO + #define GO(A) if(my3_ui_opener_fct_##A ==0) {my3_ui_opener_fct_##A = (uintptr_t)fct; return my3_ui_opener_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for libcrypto ui_opener callback\n"); + return NULL; +} + + +// ui_writer +#define GO(A) \ +static uintptr_t my3_ui_writer_fct_##A = 0; \ +static int my3_ui_writer_##A(void *ui) \ +{ \ + return (int)RunFunctionFmt(my3_ui_writer_fct_##A, "p", ui); \ +} +SUPER() +#undef GO +static void* find_ui_writer_Fct(void *fct) +{ + if(!fct) return NULL; + void* p; + if((p = GetNativeFnc((uintptr_t)fct))) return p; + #define GO(A) if(my3_ui_writer_fct_##A == (uintptr_t)fct) return my3_ui_writer_##A; + SUPER() + #undef GO + #define GO(A) if(my3_ui_writer_fct_##A ==0) {my3_ui_writer_fct_##A = (uintptr_t)fct; return my3_ui_writer_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for libcrypto ui_writer callback\n"); + return NULL; +} + +EXPORT int my3_UI_method_set_opener(x64emu_t* emu, void* method, void* opener) { + return my->UI_method_set_opener(method, find_ui_opener_Fct(opener)); +} +EXPORT int my3_UI_method_set_closer(x64emu_t* emu, void* method, void* closer) { + return my->UI_method_set_closer(method, find_ui_opener_Fct(closer)); +} +EXPORT int my3_UI_method_set_reader(x64emu_t* emu, void* method, void* reader) { + return my->UI_method_set_reader(method, find_ui_writer_Fct(reader)); +} +EXPORT int my3_UI_method_set_writer(x64emu_t* emu, void* method, void* writer) { + return my->UI_method_set_writer(method, find_ui_writer_Fct(writer)); +} + // do_all_provided_cb #define GO(A) \ static uintptr_t my3_do_all_provided_cb_fct_##A = 0; \ @@ -390,7 +500,6 @@ static void* find_do_all_provided_cb_Fct(void* fct) return NULL; } -#undef SUPER EXPORT int32_t my3_ENGINE_ctrl(x64emu_t* emu, void* e, int32_t cmd, int32_t i, void* p, void* f) { @@ -524,6 +633,18 @@ EXPORT void* my3_PEM_read_bio_X509_CERT_PAIR(x64emu_t* emu, void* bp, void* x, v return my->PEM_read_bio_X509_CERT_PAIR(bp, x, find_pem_password_cb_Fct(cb), u); } +EXPORT void my3_ERR_print_errors_cb(x64emu_t* emu, void* cb, void* u) +{ + (void)emu; + my->ERR_print_errors_cb(find_err_print_errors_cb_Fct(cb), u); +} + +EXPORT void* my3_PEM_X509_INFO_read_bio(x64emu_t* emu, void* bp, void* sk, void* cb, void* u) +{ + (void)emu; + return my->PEM_X509_INFO_read_bio(bp, sk, find_pem_password_cb_Fct(cb), u); +} + EXPORT void my3_X509_STORE_CTX_set_verify_cb(x64emu_t* emu, void* ctx, void* cb) { (void)emu; @@ -570,11 +691,94 @@ EXPORT int my3_BIO_printf(x64emu_t* emu, void* bio, void* fmt, uintptr_t* b) return my->BIO_vprintf(bio, fmt, VARARGS); } +EXPORT int my3_BIO_meth_set_gets(x64emu_t* emu, void* biom, void* cb) +{ + (void)emu; + return my->BIO_meth_set_gets(biom, find_BIO_meth_set_gets_Fct(cb)); +} + +EXPORT void my3_OSSL_PARAM_construct_end(x64emu_t* emu, void* ret) +{ + (void)emu; + my->OSSL_PARAM_construct_end(ret); +} + +EXPORT void my3_OSSL_PARAM_construct_int(x64emu_t* emu, void* ret, void* key, void* buf) +{ + (void)emu; + my->OSSL_PARAM_construct_int(ret, key, buf); +} + +EXPORT void my3_OSSL_PARAM_construct_uint(x64emu_t* emu, void* ret, void* key, void* buf) +{ + (void)emu; + my->OSSL_PARAM_construct_uint(ret, key, buf); +} + +EXPORT void my3_OSSL_PARAM_construct_octet_string(x64emu_t* emu, void* ret, void* key, void* buf, size_t bsize) +{ + (void)emu; + my->OSSL_PARAM_construct_octet_string(ret, key, buf, bsize); +} + +EXPORT void my3_OSSL_PARAM_construct_utf8_string(x64emu_t* emu, void* ret, void* key, void* buf, size_t bsize) +{ + (void)emu; + my->OSSL_PARAM_construct_utf8_string(ret, key, buf, bsize); +} + +#define GO(A) \ +static uintptr_t my3_OSSL_STORE_post_process_info_fct_##A = 0; \ +static void* my3_OSSL_STORE_post_process_info_##A(void* info, void* data) \ +{ \ + return (void*)RunFunctionFmt(my3_OSSL_STORE_post_process_info_fct_##A, "pp", info, data); \ +} +SUPER() +#undef GO +static void* find_OSSL_STORE_post_process_info(void* fct) +{ + if (!fct) return NULL; + void* p; + if((p = GetNativeFnc((uintptr_t)fct))) return p; + #define GO(A) if(my3_OSSL_STORE_post_process_info_fct_##A == (uintptr_t)fct) return my3_OSSL_STORE_post_process_info_##A; + SUPER() + #undef GO + #define GO(A) if(my3_OSSL_STORE_post_process_info_fct_##A == 0) {my3_OSSL_STORE_post_process_info_fct_##A = (uintptr_t)fct; return my3_OSSL_STORE_post_process_info_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for libcrypto OSSL_STORE_post_process_info callback\n"); + return NULL; +} + +EXPORT void* my3_OSSL_STORE_open(x64emu_t* emu, void* uri, void *ui_method, void *ui_data, void* post_process, void* post_process_data) +{ + (void)emu; + return my->OSSL_STORE_open(uri, ui_method, ui_data, find_OSSL_STORE_post_process_info(post_process), post_process_data); +} + +EXPORT void* my3_OSSL_STORE_open_ex(x64emu_t* emu, void* uri, void* libctx, void* propq, void* ui_method, void* ui_data, void* params, void* post_process, void* post_process_data) +{ + (void)emu; + return my->OSSL_STORE_open_ex(uri, libctx, propq, ui_method, ui_data, params, find_OSSL_STORE_post_process_info(post_process), post_process_data); +} + EXPORT void* my3_PEM_read_DHparams(x64emu_t* emu, void* fp, void* x, void* cb, void* u) { return my->PEM_read_DHparams(fp, x, find_pem_password_cb_Fct(cb), u); } +EXPORT void* my3_PEM_read_PrivateKey(x64emu_t* emu, void* fp, void* x, void* cb, void* u) +{ + (void)emu; + return my->PEM_read_PrivateKey(fp, x, find_pem_password_cb_Fct(cb), u); +} + +EXPORT void* my3_PEM_read_PUBKEY(x64emu_t* emu, void* fp, void* x, void* cb, void* u) +{ + (void)emu; + return my->PEM_read_PUBKEY(fp, x, find_pem_password_cb_Fct(cb), u); +} + EXPORT void my3_EVP_MD_do_all_provided(x64emu_t* emu, void* ctx, void* cb, void* arg) { my->EVP_MD_do_all_provided(ctx, find_do_all_provided_cb_Fct(cb), arg); diff --git a/src/wrapped/wrappedcrypto3_private.h b/src/wrapped/wrappedcrypto3_private.h index 5675431e15..8d632b0741 100644 --- a/src/wrapped/wrappedcrypto3_private.h +++ b/src/wrapped/wrappedcrypto3_private.h @@ -316,6 +316,7 @@ GO(BIO_indent, iFpii) GO(BIO_int_ctrl, lFpili) GO(BIO_method_name, pFp) GO(BIO_method_type, iFp) +GOM(BIO_meth_set_gets, iFEpp) GO(BIO_new, pFp) GO(BIO_new_accept, pFp) GO(BIO_new_bio_pair, iFpLpL) @@ -439,6 +440,7 @@ GO(BN_get0_nist_prime_384, pFv) GO(BN_get0_nist_prime_521, pFv) GO(BN_get_params, iFi) GO(BN_get_word, LFp) +GO(BN_get_flags, iFpi) GO(BN_GF2m_add, iFppp) GO(BN_GF2m_arr2poly, iFpp) GO(BN_GF2m_mod, iFppp) @@ -542,6 +544,7 @@ GO(BN_set_bit, iFpi) GO(BN_set_negative, vFpi) GO(BN_set_params, vFiiii) GO(BN_set_word, iFpL) +GO(BN_set_flags, vFpi) GO(BN_sqr, iFppp) //GO(bn_sqr_comba4, //GO(bn_sqr_comba8, @@ -820,6 +823,7 @@ GO(CRYPTO_add_lock, iFpiipi) //GO(CRYPTO_cfb128_1_encrypt, //GO(CRYPTO_cfb128_8_encrypt, //GO(CRYPTO_cfb128_encrypt, +GO(CRYPTO_clear_free, vFvLpi) GO(CRYPTO_cleanup_all_ex_data, vFv) //GO(CRYPTO_ctr128_encrypt, //GO(CRYPTO_ctr128_encrypt_ctr32, @@ -966,7 +970,7 @@ GO(d2i_DSA_PUBKEY_bio, pFpp) GO(d2i_DSA_PUBKEY_fp, pFpp) //GO(d2i_DSAPublicKey, //GO(d2i_DSA_SIG, -//GO(d2i_ECDSA_SIG, +GO(d2i_ECDSA_SIG, pFppl) //GO(d2i_ECParameters, //GO(d2i_ECPKParameters, //GO(d2i_ECPKPARAMETERS, @@ -1223,9 +1227,9 @@ GO(DSA_set0_pqg, iFppp) //GO(DSA_set_default_method, //GO(DSA_set_ex_data, //GO(DSA_set_method, -//GO(DSA_SIG_free, +GO(DSA_SIG_free, vFp) GO(DSA_sign, iFipippp) -//GO(DSA_SIG_new, +GO(DSA_SIG_new, pFv) //GO(DSA_sign_setup, GO(DSA_size, iFp) GO(DSA_up_ref, iFp) @@ -1292,6 +1296,7 @@ GO(ECDSA_do_verify, iFpipp) //GO(ECDSA_set_method, GO(ECDSA_SIG_free, vFp) GO(ECDSA_sign, iFipippp) +GO(DSA_SIG_set0, iFppp) GO(ECDSA_SIG_get0, vFppp) GO(ECDSA_SIG_new, pFv) GO(ECDSA_SIG_set0, iFppp) @@ -1417,6 +1422,7 @@ GO(EC_GROUP_get_seed_len, LFp) GO(EC_GROUP_method_of, pFp) GO(EC_GROUP_new, pFp) GO(EC_GROUP_new_by_curve_name, pFi) +GO(EC_GROUP_new_by_curve_name_ex, pFppi) GO(EC_GROUP_new_curve_GF2m, pFpppp) GO(EC_GROUP_new_curve_GFp, pFpppp) GO(EC_GROUP_new_from_ecparameters, pFp) @@ -1481,16 +1487,16 @@ GO(EC_POINT_get_Jprojective_coordinates_GFp, iFpppppp) //GO(EC_POINT_hex2point, //GO(EC_POINT_invert, //GO(EC_POINT_is_at_infinity, -//GO(EC_POINT_is_on_curve, +GO(EC_POINT_is_on_curve, iFppp) //GO(EC_POINT_make_affine, GO(EC_POINT_method_of, pFp) GO(EC_POINT_mul, iFpppppp) GO(EC_POINT_new, pFp) -//GO(EC_POINT_oct2point, +GO(EC_POINT_oct2point, iFpppLp) //GO(EC_POINT_point2buf, //GO(EC_POINT_point2bn, //GO(EC_POINT_point2hex, -//GO(EC_POINT_point2oct, +GO(EC_POINT_point2oct, LFppipLp) GO(EC_POINT_set_affine_coordinates, iFppppp) GO(EC_POINT_set_affine_coordinates_GF2m, iFppppp) GO(EC_POINT_set_affine_coordinates_GFp, iFppppp) @@ -1671,6 +1677,7 @@ GO(ERR_func_error_string, pFu) GO(ERR_get_error, LFv) GO(ERR_get_error_line, LFpp) GO(ERR_get_error_line_data, LFpppp) +GO(ERR_get_error_all, LFppppp) //GO(ERR_get_err_state_table, //GO(ERR_get_implementation, //GO(ERR_get_next_error_library, @@ -1716,8 +1723,8 @@ GO(ERR_peek_last_error_line, LFpp) GO(ERR_peek_last_error_line_data, LFpppp) GO(ERR_pop_to_mark, iFp) //GO(ERR_print_errors, -//GO(ERR_print_errors_cb, -//GO(ERR_print_errors_fp, +GOM(ERR_print_errors_cb, vFEpp) +GO(ERR_print_errors_fp, iFp) GO(ERR_put_error, vFiiipi) GO(ERR_reason_error_string, pFu) //GO(ERR_release_err_state_table, @@ -1753,6 +1760,7 @@ GO(EVP_aes_128_cfb8, pFv) GO(EVP_aes_128_ctr, pFv) GO(EVP_aes_128_ecb, pFv) GO(EVP_aes_128_gcm, pFv) +GO(EVP_aes_128_ocb, pFv) GO(EVP_aes_128_ofb, pFv) GO(EVP_aes_128_wrap, pFv) GO(EVP_aes_128_xts, pFv) @@ -1765,6 +1773,7 @@ GO(EVP_aes_192_cfb8, pFv) GO(EVP_aes_192_ctr, pFv) GO(EVP_aes_192_ecb, pFv) GO(EVP_aes_192_gcm, pFv) +GO(EVP_aes_192_ocb, pFv) GO(EVP_aes_192_ofb, pFv) GO(EVP_aes_192_wrap, pFv) GO(EVP_aes_256_cbc, pFv) @@ -1778,6 +1787,7 @@ GO(EVP_aes_256_cfb8, pFv) GO(EVP_aes_256_ctr, pFv) GO(EVP_aes_256_ecb, pFv) GO(EVP_aes_256_gcm, pFv) +GO(EVP_aes_256_ocb, pFv) GO(EVP_aes_256_ofb, pFv) GO(EVP_aes_256_wrap, pFv) GO(EVP_aes_256_xts, pFv) @@ -1823,7 +1833,11 @@ GO(EVP_CIPHER_CTX_copy, iFpp) GO(EVP_CIPHER_CTX_ctrl, iFpiip) //GO(EVP_CIPHER_CTX_flags, GO(EVP_CIPHER_CTX_free, vFp) +GO(EVP_CIPHER_CTX_get0_cipher, pFp) GO(EVP_CIPHER_CTX_get_app_data, pFp) +GO(EVP_CIPHER_CTX_get_block_size, iFp) +GO(EVP_CIPHER_CTX_get_iv_length, iFp) +GO(EVP_CIPHER_CTX_get_key_length, iFp) GO(EVP_CIPHER_CTX_get_original_iv, iFppL) GO(EVP_CIPHER_CTX_get_updated_iv, iFppL) GO(EVP_CIPHER_CTX_init, vFp) @@ -1843,9 +1857,14 @@ GO(EVP_CIPHER_CTX_test_flags, iFpi) GO(EVP_CipherFinal, iFppp) GO(EVP_CipherFinal_ex, iFppp) //GO(EVP_CIPHER_flags, +GO(EVP_CIPHER_fetch, pFppp) +GO(EVP_CIPHER_free, vFp) GO(EVP_CIPHER_get_asn1_iv, iFpp) +GO(EVP_CIPHER_get_iv_length, iFp) +GO(EVP_CIPHER_get_key_length, iFp) GO(EVP_CipherInit, iFppppi) GO(EVP_CipherInit_ex, iFpppppi) +GO(EVP_CipherInit_ex2, iFppppip) //GO(EVP_CIPHER_iv_length, //GO(EVP_CIPHER_key_length, //GO(EVP_CIPHER_nid, @@ -1896,6 +1915,7 @@ GO(EVP_DigestInit_ex, iFppp) GO(EVP_DigestSign, iFppppL) GO(EVP_DigestSignFinal, iFppp) GO(EVP_DigestSignInit, iFppppp) +GO(EVP_DigestSignUpdate, iFppL) GO(EVP_DigestUpdate, iFppL) GO(EVP_DigestVerify, iFppLpL) GO(EVP_DigestVerifyUpdate, iFppL) @@ -1918,10 +1938,14 @@ GO(EVP_get_cipherbyname, pFp) GO(EVP_get_digestbyname, pFp) GO(EVP_get_pw_prompt, pFv) //GO(EVP_idea_cbc, -//GO(EVP_idea_cfb, -//GO(EVP_idea_cfb64, +GO(EVP_idea_cfb64, pFv) //GO(EVP_idea_ecb, //GO(EVP_idea_ofb, +GO(EVP_KDF_CTX_free, vFp) +GO(EVP_KDF_CTX_new, pFp) +GO(EVP_KDF_derive, iFppLp) +GO(EVP_KDF_fetch, pFppp) +GO(EVP_KDF_free, vFp) GO(EVP_MAC_CTX_free, vFp) GO(EVP_MAC_CTX_new, pFp) GO(EVP_MAC_fetch, pFppp) @@ -1954,6 +1978,7 @@ GOM(EVP_MD_do_all_provided, vFEppp) GO(EVP_MD_fetch, pFppp) //GO(EVP_MD_flags, GO(EVP_MD_free, vFp) +GO(EVP_MD_get0_name, pFp) GO(EVP_MD_get_block_size, iFp) GO(EVP_MD_get_flags, LFp) GO(EVP_MD_get_size, iFp) @@ -2000,6 +2025,7 @@ GO(EVP_PKEY_assign, iFpip) //GO(EVP_PKEY_bits, GO(EVP_PKEY_cmp, iFpp) GO(EVP_PKEY_cmp_parameters, iFpp) +GO(EVP_PKEY_eq, iFpp) GO(EVP_PKEY_copy_parameters, iFpp) GO(EVP_PKEY_CTX_ctrl, iFpiiiip) GO(EVP_PKEY_CTX_ctrl_str, iFppp) @@ -2014,10 +2040,13 @@ GO(EVP_PKEY_CTX_get_keygen_info, iFpi) GO(EVP_PKEY_CTX_get_operation, iFp) GO(EVP_PKEY_CTX_new, pFpp) GO(EVP_PKEY_CTX_new_id, pFip) +GO(EVP_PKEY_CTX_new_from_name, pFppp) +GO(EVP_PKEY_CTX_new_from_pkey, pFppp) GO(EVP_PKEY_CTX_set0_keygen_info, vFppi) GO(EVP_PKEY_CTX_set_app_data, vFpp) //GOM(EVP_PKEY_CTX_set_cb, vFEpp) GO(EVP_PKEY_CTX_set_data, vFpp) +GO(EVP_PKEY_CTX_set_params, iFpp) GO(EVP_PKEY_CTX_set_rsa_keygen_bits, iFpi) GO(EVP_PKEY_CTX_set_rsa_oaep_md, iFpp) GO(EVP_PKEY_CTX_set_rsa_padding, iFpi) @@ -2035,9 +2064,13 @@ GO(EVP_PKEY_encrypt, iFppppL) GO(EVP_PKEY_encrypt_init, iFp) GO(EVP_PKEY_encrypt_old, iFppip) GO(EVP_PKEY_free, vFp) +GO(EVP_PKEY_fromdata_init, iFp) +GO(EVP_PKEY_fromdata, iFppip) +GO(EVP_PKEY_todata, iFpip) GO(EVP_PKEY_get0, pFp) GO(EVP_PKEY_get0_asn1, pFp) GO(EVP_PKEY_get0_RSA, pFp) +GO(EVP_PKEY_get0_type_name, pFp) GO(EVP_PKEY_get1_DH, pFp) GO(EVP_PKEY_get1_DSA, pFp) GO(EVP_PKEY_get1_EC_KEY, pFp) @@ -2047,8 +2080,15 @@ GO(EVP_PKEY_get1_RSA, pFp) //GO(EVP_PKEY_get_attr_by_OBJ, //GO(EVP_PKEY_get_attr_count, GO(EVP_PKEY_get_base_id, iFp) +GO(EVP_PKEY_get_id, iFp) +GO(EVP_PKEY_get_security_bits, iFp) GO(EVP_PKEY_get_bits, iFp) GO(EVP_PKEY_get_default_digest_nid, iFpp) +GO(EVP_PKEY_get_group_name, iFppLp) +GO(EVP_PKEY_CTX_set0_rsa_oaep_label, iFppi) +GO(EVP_PKEY_CTX_set_ec_paramgen_curve_nid, iFpi) +GO(EVP_PKEY_get_bn_param, iFppp) +GO(EVP_PKEY_get_utf8_string_param, iFppppL) GO(EVP_PKEY_get_raw_private_key, iFppp) GO(EVP_PKEY_get_raw_public_key, iFppp) GO(EVP_PKEY_new_raw_private_key, pFippL) @@ -2056,6 +2096,7 @@ GO(EVP_PKEY_new_raw_public_key, pFippL) GO(EVP_PKEY_get_size, iFp) //GO(EVP_PKEY_id, GO(EVP_PKEY_keygen, iFpp) +GO(EVP_PKEY_generate, iFpp) GO(EVP_PKEY_keygen_init, iFp) GO(EVP_PKEY_meth_add0, iFp) GO(EVP_PKEY_meth_copy, vFpp) @@ -2080,6 +2121,7 @@ GO(EVP_PKEY_meth_new, pFii) GO(EVP_PKEY_missing_parameters, iFp) GO(EVP_PKEY_new, pFv) GO(EVP_PKEY_new_mac_key, pFippi) +GO(EVP_PKEY_Q_keygen, pFpppL) GO(EVP_PKEY_param_check, iFp) GO(EVP_PKEY_paramgen, iFpp) GO(EVP_PKEY_paramgen_init, iFp) @@ -2130,6 +2172,7 @@ GO(EVP_sha224, pFv) GO(EVP_sha256, pFv) GO(EVP_sha384, pFv) GO(EVP_sha512, pFv) +GO(EVP_sha512_256, pFv) GO(EVP_SignFinal, iFpppp) GO(EVP_VerifyFinal, iFppup) GO(EVP_VerifyInit, iFpp) @@ -2245,8 +2288,8 @@ GO(i2d_DSA_PUBKEY, iFpp) GO(i2d_DSA_PUBKEY_bio, iFpp) GO(i2d_DSA_PUBKEY_fp, iFpp) //GO(i2d_DSAPublicKey, -//GO(i2d_DSA_SIG, -//GO(i2d_ECDSA_SIG, +GO(i2d_DSA_SIG, iFpp) +GO(i2d_ECDSA_SIG, iFpp) //GO(i2d_ECParameters, //GO(i2d_ECPKParameters, //GO(i2d_ECPKPARAMETERS, @@ -2574,7 +2617,7 @@ GO(OCSP_CERTID_free, vFp) //GO(OCSP_CERTID_new, //GO(OCSP_CERTSTATUS_free, //GO(OCSP_CERTSTATUS_new, -//GO(OCSP_cert_status_str, +GO(OCSP_cert_status_str, pFl) GO(OCSP_cert_to_id, pFppp) GO(OCSP_check_nonce, iFpp) GO(OCSP_check_validity, iFppll) @@ -2582,7 +2625,7 @@ GO(OCSP_check_validity, iFppll) //GO(OCSP_CRLID_free, //GO(OCSP_crlID_new, //GO(OCSP_CRLID_new, -//GO(OCSP_crl_reason_str, +GO(OCSP_crl_reason_str, pFl) GO(OCSP_id_cmp, iFpp) GO(OCSP_id_get0_info, iFppppp) //GO(OCSP_id_issuer_cmp, @@ -2648,7 +2691,7 @@ GO(OCSP_response_get1_basic, pFp) GO(OCSP_RESPONSE_new, pFv) //GO(OCSP_RESPONSE_print, GO(OCSP_response_status, iFp) -//GO(OCSP_response_status_str, +GO(OCSP_response_status_str, pFl) //GO(OCSP_REVOKEDINFO_free, //GO(OCSP_REVOKEDINFO_new, //GO(OCSP_sendreq_bio, @@ -2755,7 +2798,41 @@ GO(OpenSSL_version_num, LFv) //GO(_ossl_old_des_string_to_2keys, //GO(_ossl_old_des_string_to_key, //GO(_ossl_old_des_xcbc_encrypt, +GO(OSSL_EC_curve_nid2name, pFi) +GO(OSSL_LIB_CTX_free, vFp) +GO(OSSL_LIB_CTX_new, pFv) +GO(OSSL_LIB_CTX_load_config, iFpp) +GO(OSSL_PARAM_BLD_free, vFp) +GO(OSSL_PARAM_BLD_new, pFv) +GO(OSSL_PARAM_BLD_push_BN, iFppp) +GO(OSSL_PARAM_BLD_push_octet_string, iFpppL) +GO(OSSL_PARAM_BLD_push_utf8_string, iFpppL) +GO(OSSL_PARAM_BLD_to_param, pFp) +GOM(OSSL_PARAM_construct_end, vFEp) +GOM(OSSL_PARAM_construct_int, vFEppp) +GOM(OSSL_PARAM_construct_octet_string, vFEpppL) +GOM(OSSL_PARAM_construct_uint, vFEppp) +GOM(OSSL_PARAM_construct_utf8_string, vFEpppL) +GO(OSSL_PARAM_free, vFp) +GO(OSSL_PARAM_get_BN, iFpp) +GO(OSSL_PARAM_get_octet_string_ptr, iFppp) +GO(OSSL_PARAM_locate, pFpp) +GO(OSSL_PARAM_locate_const, pFpp) +GO(OSSL_PARAM_merge, pFpp) +GO(OSSL_PROVIDER_available, iFpp) +GO(OSSL_PROVIDER_load, pFpp) +GO(OSSL_PROVIDER_unload, iFp) GO(OSSL_PROVIDER_try_load, pFppi) +GOM(OSSL_STORE_open, pFEppppp) +GOM(OSSL_STORE_open_ex, pFEpppppppp) +GO(OSSL_STORE_load, pFp) +GO(OSSL_STORE_close, iFp) +GO(OSSL_STORE_expect, iFpi) +GO(OSSL_STORE_INFO_get1_CERT, pFp) +GO(OSSL_STORE_INFO_get1_PKEY, pFp) +GO(OSSL_STORE_INFO_get1_PUBKEY, pFp) +GO(OSSL_STORE_INFO_get_type, iFp) +GO(OSSL_STORE_INFO_free, vFp) //GO(OTHERNAME_cmp, //GO(OTHERNAME_free, //GO(OTHERNAME_new, @@ -2787,7 +2864,7 @@ GOM(PEM_read_bio_DSA_PUBKEY, pFEpppp) GOM(PEM_read_bio_ECPrivateKey, pFEpppp) GOM(PEM_read_bio_EC_PUBKEY, pFEpppp) //GO(PEM_read_bio_NETSCAPE_CERT_SEQUENCE, -//GO(PEM_read_bio_Parameters, +GO(PEM_read_bio_Parameters, pFpp) GOM(PEM_read_bio_PKCS7, pFEpppp) //GO(PEM_read_bio_PKCS8, //GO(PEM_read_bio_PKCS8_PRIV_KEY_INFO, @@ -2813,8 +2890,8 @@ GOM(PEM_read_DHparams, pFEpppp) //GO(PEM_read_PKCS7, //GO(PEM_read_PKCS8, //GO(PEM_read_PKCS8_PRIV_KEY_INFO, -//GO(PEM_read_PrivateKey, -//GO(PEM_read_PUBKEY, +GOM(PEM_read_PrivateKey, pFEpppp) +GOM(PEM_read_PUBKEY, pFEpppp) //GO(PEM_read_RSAPrivateKey, //GO(PEM_read_RSA_PUBKEY, //GO(PEM_read_RSAPublicKey, @@ -2889,7 +2966,7 @@ GO(PEM_write_bio_X509_REQ, iFpp) //GO(PEM_write_X509_REQ, //GO(PEM_write_X509_REQ_NEW, //GO(PEM_X509_INFO_read, -//GO(PEM_X509_INFO_read_bio, +GOM(PEM_X509_INFO_read_bio, pFEpppp) //GO(PEM_X509_INFO_write_bio, //GO(pitem_free, //GO(pitem_new, @@ -2983,7 +3060,7 @@ GO(PKCS5_v2_PBE_keyivgen, iFppipppi) //GO(PKCS7_ENCRYPT_new, //GO(PKCS7_ENVELOPE_free, //GO(PKCS7_ENVELOPE_new, -//GO(PKCS7_final, +GO(PKCS7_final, iFpppi) GO(PKCS7_free, vFp) //GO(PKCS7_get0_signers, //GO(PKCS7_get_attribute, @@ -3106,7 +3183,7 @@ GO(RSA_bits, iFp) //GO(RSA_blinding_off, //GO(RSA_blinding_on, GO(RSA_check_key, iFp) -//GO(RSA_flags, +GO(RSA_flags, iFp) GO(RSA_free, vFp) GOM(RSA_generate_key, pFEiLpp) GO(RSA_generate_key_ex, iFpipp) @@ -3401,9 +3478,9 @@ GO(UI_add_input_string, iFppipii) GO(UI_add_user_data, pFpp) //GO(UI_add_verify_string, GO(UI_construct_prompt, pFppp) -//GO(UI_create_method, +GO(UI_create_method, pFp) //GO(UI_ctrl, -//GO(UI_destroy_method, +GO(UI_destroy_method, vFp) GO(UI_dup_error_string, iFpp) GO(UI_dup_info_string, iFpp) GO(UI_dup_input_boolean, iFpppppip) @@ -3419,23 +3496,23 @@ GO(UI_get0_user_data, pFp) GO(UI_get_default_method, pFv) //GO(UI_get_ex_data, //GO(UI_get_ex_new_index, -//GO(UI_get_input_flags, +GO(UI_get_input_flags, iFp) GO(UI_get_method, pFp) //GO(UI_get_result_maxsize, //GO(UI_get_result_minsize, -//GO(UI_get_string_type, -//GO(UI_method_get_closer, +GO(UI_get_string_type, iFp) +GO(UI_method_get_closer, pFp) //GO(UI_method_get_flusher, -//GO(UI_method_get_opener, +GO(UI_method_get_opener, pFp) //GO(UI_method_get_prompt_constructor, -//GO(UI_method_get_reader, -//GO(UI_method_get_writer, -//GO(UI_method_set_closer, +GO(UI_method_get_reader, pFp) +GO(UI_method_get_writer, pFp) +GOM(UI_method_set_closer, iFEpp) //GO(UI_method_set_flusher, -//GO(UI_method_set_opener, +GOM(UI_method_set_opener, iFEpp) //GO(UI_method_set_prompt_constructor, -//GO(UI_method_set_reader, -//GO(UI_method_set_writer, +GOM(UI_method_set_reader, iFEpp) +GOM(UI_method_set_writer, iFEpp) GO(UI_new, pFv) GO(UI_new_method, pFp) GO(UI_OpenSSL, pFv) @@ -3443,7 +3520,7 @@ GO(UI_process, iFp) GO(UI_set_default_method, vFp) //GO(UI_set_ex_data, GO(UI_set_method, pFpp) -//GO(UI_set_result, +GO(UI_set_result, iFppp) //GO(UI_UTIL_read_pw, //GO(UI_UTIL_read_pw_string, //GO(USERNOTICE_free, @@ -3467,7 +3544,7 @@ GO(X509_add1_ext_i2d, iFpipiL) //GO(X509_ALGOR_cmp, //GO(X509_ALGOR_dup, //GO(X509_ALGOR_free, -//GO(X509_ALGOR_get0, +GO(X509_ALGOR_get0, vFpppp) //GO(X509_ALGOR_new, //GO(X509_ALGOR_set0, //GO(X509_ALGOR_set_md, @@ -3577,8 +3654,10 @@ GO(X509_EXTENSION_set_object, iFpp) //GO(X509_find_by_subject, GO(X509_free, vFp) GO(X509_get0_pubkey_bitstr, pFp) -//GO(X509_get0_signature, +GO(X509_get0_signature, vFppp) +GO(X509_get0_extensions, pFp) GO(X509_get0_tbs_sigalg, pFp) +GO(X509_get0_subject_key_id, pFp) //GO(X509_get1_email, //GO(X509_get1_ocsp, //GO(X509_get_default_cert_area, @@ -3603,7 +3682,7 @@ GO(X509_get0_notBefore, pFp) GO(X509_get0_pubkey, pFp) GO(X509_get0_serialNumber, pFp) GO(X509_get_serialNumber, pFp) -//GO(X509_get_signature_nid, +GO(X509_get_signature_nid, iFp) GO(X509_get_subject_name, pFp) GO(X509_get_version, lFp) GO(X509_get_X509_PUBKEY, pFp) @@ -3627,7 +3706,7 @@ GO(X509_load_crl_file, iFppi) //GO(X509_LOOKUP_by_fingerprint, //GO(X509_LOOKUP_by_issuer_serial, //GO(X509_LOOKUP_by_subject, -//GO(X509_LOOKUP_ctrl, +GO(X509_LOOKUP_ctrl, iFpiplp) GO(X509_LOOKUP_file, pFv) //GO(X509_LOOKUP_free, GO(X509_LOOKUP_hash_dir, pFv) @@ -3641,7 +3720,7 @@ GO(X509_NAME_add_entry_by_txt, iFppipiii) //GO(X509_NAME_cmp, //GO(X509_NAME_delete_entry, //GO(X509_NAME_digest, -//GO(X509_NAME_dup, +GO(X509_NAME_dup, pFp) GO(X509_NAME_entry_count, iFp) GO(X509_NAME_ENTRY_create_by_NID, pFpiipi) GO(X509_NAME_ENTRY_create_by_OBJ, pFppipi) @@ -3702,11 +3781,11 @@ GO(X509_print_ex, iFppLL) GO(X509_print_ex_fp, iFppLL) GO(X509_print_fp, iFpp) //GO(X509_pubkey_digest, -//GO(X509_PUBKEY_free, +GO(X509_PUBKEY_free, vFp) GO(X509_PUBKEY_get, pFp) GO(X509_PUBKEY_get0_param, iFppppp) //GO(X509_PUBKEY_new, -//GO(X509_PUBKEY_set, +GO(X509_PUBKEY_set, iFpp) //GO(X509_PUBKEY_set0_param, //GO(X509_PURPOSE_add, //GO(X509_PURPOSE_cleanup, @@ -3790,6 +3869,7 @@ GO(X509_sign_ctx, iFpp) GO(X509_STORE_add_cert, iFpp) GO(X509_STORE_add_crl, iFpp) GO(X509_STORE_add_lookup, pFpp) +GO(X509_STORE_up_ref, iFp) GO(X509_STORE_CTX_cleanup, vFp) GO(X509_STORE_CTX_free, vFp) //GO(X509_STORE_CTX_get0_current_crl, @@ -3874,7 +3954,7 @@ GO(X509_subject_name_hash_old, LFp) GO(X509_up_ref, iFp) GO(X509V3_add1_i2d, iFpipiL) //GO(X509v3_add_ext, -//GO(X509V3_add_standard_extensions, +GO(X509V3_add_standard_extensions, iFv) //GO(X509V3_add_value, //GO(X509V3_add_value_bool, //GO(X509V3_add_value_bool_nf, @@ -3961,3 +4041,6 @@ GO(X509_VERIFY_PARAM_set_time, vFpl) //GO(X9_62_CHARACTERISTIC_TWO_new, //GO(X9_62_PENTANOMIAL_free, //GO(X9_62_PENTANOMIAL_new, +GO(EVP_PKEY_new_raw_private_key_ex, pFppppL) +GO(OSSL_PARAM_BLD_push_uint32, iFppu) +GO(RAND_bytes_ex, iFppLu) diff --git a/src/wrapped/wrappedglib2.c b/src/wrapped/wrappedglib2.c index 5da756add5..ffc86a4886 100644 --- a/src/wrapped/wrappedglib2.c +++ b/src/wrapped/wrappedglib2.c @@ -1140,6 +1140,11 @@ EXPORT void my_g_ptr_array_foreach(x64emu_t* emu, void* array, void* func, void* my->g_ptr_array_foreach(array, findGFuncFct(func), data); } +EXPORT int my_g_ptr_array_find_with_equal_func(x64emu_t* emu, void* haystack, void* needle, void* equal_func, void* index_) +{ + return my->g_ptr_array_find_with_equal_func(haystack, needle, findEqualFct(equal_func), index_); +} + EXPORT void* my_g_thread_create(x64emu_t* emu, void* func, void* data, int joinable, void* error) { void* et = NULL; @@ -1374,6 +1379,13 @@ EXPORT void* my_g_error_new_valist(x64emu_t* emu, uint32_t domain, int code, voi return my->g_error_new_valist(domain, code, fmt, VARARGS); } +EXPORT void my_g_propagate_prefixed_error(x64emu_t* emu, void* dest, void* src, void* fmt, uintptr_t* b) +{ + myStackAlign(emu, fmt, b, emu->scratch, R_EAX, 3); + PREPARE_VALIST; + my->g_propagate_prefixed_error(dest, src, fmt, VARARGS); +} + EXPORT int my_g_fprintf(x64emu_t* emu, void* f, void* fmt, uintptr_t* b) { myStackAlign(emu, fmt, b, emu->scratch, R_EAX, 3); @@ -1397,6 +1409,13 @@ EXPORT void my_g_log(x64emu_t* emu, void* domain, int level, void* fmt, uintptr_ my->g_logv(domain, level, fmt, VARARGS); } +EXPORT void my_g_log_structured_standard(x64emu_t* emu, void* log_domain, uint32_t log_level, void* file, void* line, void* func, void* fmt, uintptr_t* b) +{ + myStackAlign(emu, fmt, b, emu->scratch, R_EAX, 6); + PREPARE_VALIST; + my->g_log_structured_standard(log_domain, log_level, file, line, func, fmt, VARARGS); +} + EXPORT int my_g_printf(x64emu_t* emu, void* fmt, uintptr_t* b) { myStackAlign(emu, fmt, b, emu->scratch, R_EAX, 1); diff --git a/src/wrapped/wrappedglib2_private.h b/src/wrapped/wrappedglib2_private.h index 15087b6261..a4bba07ce4 100644 --- a/src/wrapped/wrappedglib2_private.h +++ b/src/wrapped/wrappedglib2_private.h @@ -620,6 +620,7 @@ GO(g_log_writer_default, iFipLp) GO(g_log_writer_is_journald, iFi) GOM(g_logv, vFEpipA) GO(g_log_structured_array, vFipL) +GOM(g_log_structured_standard, vFEpuppppV) GO(g_lstat, iFpp) GO(g_main_context_acquire, iFp) GO(g_main_context_add_poll, vFppi) @@ -823,9 +824,11 @@ GOM(g_private_new, pFEp) GO(g_private_replace, vFpp) GO(g_private_set, vFpp) GO(g_propagate_error, vFpp) -//GOM(g_propagate_prefixed_error, vFpppV) +GOM(g_propagate_prefixed_error, vFpppV) GO(g_ptr_array_add, vFpp) +GO(g_ptr_array_extend_and_steal, vFpp) GOM(g_ptr_array_foreach, vFEppp) +GOM(g_ptr_array_find_with_equal_func, iFEpppp) GO(g_ptr_array_free, pFpi) GO(g_ptr_array_insert, vFpip) GO(g_ptr_array_new, pFv) @@ -1407,6 +1410,9 @@ GO(g_unix_set_fd_nonblocking, iFiip) GO(g_unlink, iFp) GO(g_unsetenv, vFp) GO(g_uri_escape_string, pFppi) +GO(g_uri_get_host, pFp) +GO(g_uri_get_port, iFp) +GO(g_uri_get_scheme, pFp) GO(g_uri_list_extract_uris, pFp) GO(g_uri_parse, pFpup) GO(g_uri_parse_scheme, pFp) diff --git a/src/wrapped/wrappedgomp.c b/src/wrapped/wrappedgomp.c index 679b1a94a7..e711db70c9 100644 --- a/src/wrapped/wrappedgomp.c +++ b/src/wrapped/wrappedgomp.c @@ -56,6 +56,29 @@ static void* find_parallel_Fct(void* fct) return NULL; } + +// task_cpy +#define GO(A) \ +static uintptr_t my_task_cpy_fct_##A = 0; \ +static void my_task_cpy_##A(void* a, void* b) \ +{ \ + RunFunctionFmt(my_task_cpy_fct_##A, "pp", a, b); \ +} +SUPER() +#undef GO +static void* find_task_cpy_Fct(void* fct) +{ + if(!fct) return fct; + #define GO(A) if(my_task_cpy_fct_##A == (uintptr_t)fct) return my_task_cpy_##A; + SUPER() + #undef GO + #define GO(A) if(my_task_cpy_fct_##A == 0) {my_task_cpy_fct_##A = (uintptr_t)fct; return my_task_cpy_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for libgomp Boxed task_cpy callback\n"); + return NULL; +} + #undef SUPER EXPORT void my_GOMP_parallel(x64emu_t* emu, void* f, void* data, unsigned num_threads, uint32_t flags) @@ -63,4 +86,10 @@ EXPORT void my_GOMP_parallel(x64emu_t* emu, void* f, void* data, unsigned num_th my->GOMP_parallel(find_parallel_Fct(f), data, num_threads, flags); } +EXPORT void my_GOMP_task(x64emu_t* emu, void* fn, void *data, void* cpyfn, long arg_size, + long arg_align, int if_clause, unsigned flags, void **depend, int priority) +{ + my->GOMP_task(find_parallel_Fct(fn), data, find_task_cpy_Fct(cpyfn),arg_size, arg_align, if_clause, flags, depend, priority); +} + #include "wrappedlib_init.h" diff --git a/src/wrapped/wrappedgomp_private.h b/src/wrapped/wrappedgomp_private.h index 3751590852..7de432daec 100644 --- a/src/wrapped/wrappedgomp_private.h +++ b/src/wrapped/wrappedgomp_private.h @@ -136,8 +136,8 @@ GO(GOMP_atomic_end, vFv) GO(GOMP_atomic_start, vFv) GO(GOMP_barrier, vFv) -//GO(GOMP_barrier_cancel, -//GO(GOMP_cancel, +GO(GOMP_barrier_cancel, iFv) +GO(GOMP_cancel, iFii) //GO(GOMP_cancellation_point, GO(GOMP_critical_end, vFv) GO(GOMP_critical_name_end, vFp) @@ -269,7 +269,7 @@ GO(GOMP_single_start, iFv) //GO(GOMP_target_ext, //GO(GOMP_target_update, //GO(GOMP_target_update_ext, -//GO(GOMP_task, +GOM(GOMP_task, vFEppplliupi) //GO(GOMP_taskgroup_end, //GO(GOMP_taskgroup_reduction_register, //GO(GOMP_taskgroup_reduction_unregister, diff --git a/src/wrapped/wrappedgssapikrb5_private.h b/src/wrapped/wrappedgssapikrb5_private.h index 1329530f8d..d6173d6cf7 100644 --- a/src/wrapped/wrappedgssapikrb5_private.h +++ b/src/wrapped/wrappedgssapikrb5_private.h @@ -133,7 +133,7 @@ GO(gss_release_buffer_set, uFpp) GO(gss_release_cred, uFpp) GO(gss_release_iov_buffer, uFppi) GO(gss_release_name, uFpp) -//GO(gss_release_oid, +GO(gss_release_oid, uFpp) GO(gss_release_oid_set, uFpp) //GO(gss_seal, //GO(gss_set_cred_option, @@ -162,4 +162,4 @@ GO(gss_wrap_iov, uFppiuppi) //GO(gss_wrap_size_limit, //DATAB(krb5_gss_dbg_client_expcreds, //GO(krb5_gss_register_acceptor_identity, -//GO(krb5_gss_use_kdc_context, \ No newline at end of file +//GO(krb5_gss_use_kdc_context, diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index 6fa1471856..af10a03b99 100644 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -2,7 +2,22 @@ #define _FILE_OFFSET_BITS 64 #define _GNU_SOURCE /* See feature_test_macros(7) */ #if !defined(TERMUX) && !defined(ANDROID) -#include +# if defined(__has_include) +# if __has_include() +# include +# define HAVE_ARGP 1 +# endif +# else +# include +# define HAVE_ARGP 1 +# endif +#endif +#ifndef HAVE_ARGP +struct argp; +struct argp_state; +#endif +#ifdef STATICBUILD +extern int _nl_msg_cat_cntr __attribute__((weak)); #endif #include #include @@ -486,11 +501,12 @@ static void* find_argp_parser_Fct(void* fct) EXPORT int my_argp_parse(x64emu_t* emu, struct argp* argp, int argc, char** argv, int flags, int* index, void* input) { -#if !defined(TERMUX) && !defined(ANDROID) +#if defined(HAVE_ARGP) void* fct = (void*)argp->parser; if (fct) argp->parser = find_argp_parser_Fct(fct); return argp_parse(argp, argc, argv, flags, index, input); #else + (void)emu; (void)argp; (void)argc; (void)argv; (void)flags; (void)index; (void)input; printf_log(LOG_NONE, "Warning: unsupported argp_parse called, expecting failure\n"); return -1; #endif @@ -1180,6 +1196,20 @@ EXPORT int my_swscanf(x64emu_t* emu, void* stream, void* fmt, uint64_t* b) return vswscanf(stream, fmt, VARARGS); } +EXPORT void my_argp_error(x64emu_t *emu, void* state, void* fmt, void* b) { +#if defined(HAVE_ARGP) + if(!fmt) { + argp_error(state, NULL); + return; + } + myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 2); + PREPARE_VALIST; + argp_error(state, fmt, VARARGS); +#else + (void)emu; (void)state; (void)fmt; (void)b; +#endif +} + EXPORT void my_error(x64emu_t *emu, int status, int errnum, void* fmt, void* b) { myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 3); PREPARE_VALIST; @@ -1251,6 +1281,21 @@ EXPORT void my_vwarnx(x64emu_t* emu, void* fmt, x64_va_list_t b) { #endif return vwarnx(fmt, VARARGS); } + +EXPORT void my_argp_failure(x64emu_t* emu, void* state, int status, int errnum, void* fmt, void* b) { +#if defined(HAVE_ARGP) + if(!fmt) { + argp_failure(state, status, errnum, NULL); + return; + } + myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 4); + PREPARE_VALIST; + argp_failure(state, status, errnum, fmt, VARARGS); +#else + (void)emu; (void)state; (void)status; (void)errnum; (void)fmt; (void)b; +#endif +} + EXPORT void my_warn(x64emu_t *emu, void* fmt, void* b) { myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 1); PREPARE_VALIST; diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h index a406b3a09f..4a28f40334 100644 --- a/src/wrapped/wrappedlibc_private.h +++ b/src/wrapped/wrappedlibc_private.h @@ -23,8 +23,8 @@ GOW(alphasort64, iFpp) //GO(__arch_prctl, //GOW(arch_prctl, //DATA(argp_err_exit_status, 4) -//GOWM(argp_error, vFppV) -//GOWM(argp_failure, vFpiipV) +GOWM(argp_error, vFppV) +GOWM(argp_failure, vFpiipV) //GOWM(argp_help, vFpSup) GOWM(argp_parse, iFEpipupp) //DATAB(argp_program_bug_address, 8) @@ -1401,7 +1401,7 @@ GO(nice, iFi) GO(nl_langinfo, pFi) GO(__nl_langinfo_l, pFip) GOW(nl_langinfo_l, pFip) -//DATAB(_nl_msg_cat_cntr, +DATAB(_nl_msg_cat_cntr, 4) GO(nrand48, lFp) GOW(nrand48_r, iFppp) //GO(__nss_configure_lookup, diff --git a/src/wrapped/wrappedlibpthread_private.h b/src/wrapped/wrappedlibpthread_private.h index d81391b04c..ae9543583d 100644 --- a/src/wrapped/wrappedlibpthread_private.h +++ b/src/wrapped/wrappedlibpthread_private.h @@ -133,7 +133,7 @@ GOM(pthread_getattr_np, iFELp) GOM(pthread_getattr_default_np, iFEp) GOM(pthread_setattr_default_np, iFEp) #endif -//GO(pthread_getconcurrency, iFv) +GO(pthread_getconcurrency, iFv) GO(pthread_getcpuclockid, iFLp) GO(pthread_getschedparam, iFLpp) GO(__pthread_getspecific, pFL) diff --git a/src/wrapped/wrappedlibsqlite3.c b/src/wrapped/wrappedlibsqlite3.c index 2ca6f08c91..f870a02780 100644 --- a/src/wrapped/wrappedlibsqlite3.c +++ b/src/wrapped/wrappedlibsqlite3.c @@ -80,13 +80,97 @@ static void *find_sqlite3_exec_fct(void *fct) { printf_log(LOG_NONE, "Warning, no more slot for sqlite3_exec callback\n"); return NULL; } -#undef SUPER - EXPORT int my_sqlite3_exec(x64emu_t* emu, void *db, char *sql, void* callback, void* data, char **errmsg) { return my->sqlite3_exec(db, sql, find_sqlite3_exec_fct(callback), data, errmsg); } +// sqlite3_destroy ... +#define GO(A) \ +static uintptr_t my_sqlite3_destroy_fct_##A = 0; \ +static void my_sqlite3_destroy_##A(void* p) { \ + RunFunctionFmt(my_sqlite3_destroy_fct_##A, "p", p); \ +} +SUPER() +#undef GO +static void *find_sqlite3_destroy_fct(void *fct) { + if (!fct) return NULL; + if(fct == (void*)-1) return fct; + if (GetNativeFnc((uintptr_t)fct)) return GetNativeFnc((uintptr_t)fct); + #define GO(A) if (my_sqlite3_destroy_fct_##A == (uintptr_t)fct) return my_sqlite3_destroy_##A; + SUPER() + #undef GO + #define GO(A) if (my_sqlite3_destroy_fct_##A == 0) {my_sqlite3_destroy_fct_##A = (uintptr_t)fct; return my_sqlite3_destroy_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for sqlite3_destroy callback\n"); + return NULL; +} + +EXPORT int my_sqlite3_bind_blob(x64emu_t* emu, void* stmt, int idx, void* data, int n, void* dtor) { + return my->sqlite3_bind_blob(stmt, idx, data, n, find_sqlite3_destroy_fct(dtor)); +} + +EXPORT int my_sqlite3_bind_text(x64emu_t* emu, void* stmt, int idx, void* text, int n, void* dtor) { + return my->sqlite3_bind_text(stmt, idx, text, n, find_sqlite3_destroy_fct(dtor)); +} + +// sqlite3_func ... +#define GO(A) \ +static uintptr_t my_sqlite3_func_fct_##A = 0; \ +static void my_sqlite3_func_##A(void* ctx, int argc, void* argv) { \ + RunFunctionFmt(my_sqlite3_func_fct_##A, "pip", ctx, argc, argv); \ +} +SUPER() +#undef GO + +static void* find_sqlite3_func_fct(void* fct) { + if (!fct) return NULL; + if (GetNativeFnc((uintptr_t)fct)) return GetNativeFnc((uintptr_t)fct); + #define GO(A) if (my_sqlite3_func_fct_##A == (uintptr_t)fct) return my_sqlite3_func_##A; + SUPER() + #undef GO + #define GO(A) if (my_sqlite3_func_fct_##A == 0) { my_sqlite3_func_fct_##A = (uintptr_t)fct; return my_sqlite3_func_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for sqlite3 func callback\n"); + return NULL; +} + +// salite_final +#define GO(A) \ +static uintptr_t my_sqlite3_final_fct_##A = 0; \ +static void my_sqlite3_final_##A(void* ctx) { \ + RunFunctionFmt(my_sqlite3_final_fct_##A, "p", ctx); \ +} +SUPER() +#undef GO + +static void* find_sqlite3_final_fct(void* fct) { + if (!fct) return NULL; + if (GetNativeFnc((uintptr_t)fct)) return GetNativeFnc((uintptr_t)fct); + #define GO(A) if (my_sqlite3_final_fct_##A == (uintptr_t)fct) return my_sqlite3_final_##A; + SUPER() + #undef GO + #define GO(A) if (my_sqlite3_final_fct_##A == 0) { my_sqlite3_final_fct_##A = (uintptr_t)fct; return my_sqlite3_final_##A; } + SUPER() + #undef GO + printf_log(LOG_NONE, "Warning, no more slot for sqlite3 final callback\n"); + return NULL; +} + +EXPORT int my_sqlite3_create_function(x64emu_t* emu, + void* db, void* name, int nArg, int eTextRep, void* pApp, + void* xFunc, void* xStep, void* xFinal) +{ + return my->sqlite3_create_function( + db, name, nArg, eTextRep, pApp, + find_sqlite3_func_fct(xFunc), + find_sqlite3_func_fct(xStep), + find_sqlite3_final_fct(xFinal) + ); +} + EXPORT void* my_sqlite3_vmprintf(x64emu_t *emu, void* fmt, x64_va_list_t b) { (void)emu; #ifdef CONVERT_VALIST diff --git a/src/wrapped/wrappedlibsqlite3_private.h b/src/wrapped/wrappedlibsqlite3_private.h index a3cd085e41..dce5f404e4 100644 --- a/src/wrapped/wrappedlibsqlite3_private.h +++ b/src/wrapped/wrappedlibsqlite3_private.h @@ -9,7 +9,7 @@ GO(sqlite3_backup_finish, iFp) GO(sqlite3_backup_init, pFpppp) GO(sqlite3_backup_pagecount, iFp) GO(sqlite3_backup_step, iFpi) -//GOM(sqlite3_bind_blob, iFEpipip) +GOM(sqlite3_bind_blob, iFEpipip) //GOM(sqlite3_bind_blob64, iFEpipUp) GO(sqlite3_bind_double, iFpid) GO(sqlite3_bind_int, iFpii) @@ -19,7 +19,7 @@ GO(sqlite3_bind_parameter_count, iFp) GO(sqlite3_bind_parameter_index, iFpp) GO(sqlite3_bind_parameter_name, pFpi) //GOM(sqlite3_bind_pointer, iFEpippp) -//GOM(sqlite3_bind_text, iFEpipip) +GOM(sqlite3_bind_text, iFEpipip) //GOM(sqlite3_bind_text16, iFEpipip) //GOM(sqlite3_bind_text64, iFEpipUpC) GO(sqlite3_bind_value, iFpip) @@ -70,7 +70,7 @@ GO(sqlite3_context_db_handle, pFp) //GOM(sqlite3_create_collation16, iFEppipp) GO(sqlite3_create_filename, pFpppip) //GOM(sqlite3_create_function_v2, iFEppiippppp) -//GOM(sqlite3_create_function, iFEppiipppp) +GOM(sqlite3_create_function, iFEppiipppp) //GOM(sqlite3_create_function16, iFEppiipppp) //GOM(sqlite3_create_module_v2, iFEppppp) //GOM(sqlite3_create_module, iFEpppp) diff --git a/src/wrapped/wrappedlibssl3.c b/src/wrapped/wrappedlibssl3.c index a4e5ba4cc0..20c1eb2994 100644 --- a/src/wrapped/wrappedlibssl3.c +++ b/src/wrapped/wrappedlibssl3.c @@ -700,6 +700,12 @@ EXPORT void my3_SSL_set_info_callback(x64emu_t* emmu, void* ctx, void* f) my->SSL_set_info_callback(ctx, find_info_cb_Fct(f)); } +EXPORT void my3_SSL_CTX_set_info_callback(x64emu_t* emu, void* ctx, void* f) +{ + (void)emu; + my->SSL_CTX_set_info_callback(ctx, find_info_cb_Fct(f)); +} + EXPORT void my3_SSL_set_psk_use_session_callback(x64emu_t* emu, void* ctx, void* f) { my->SSL_set_psk_use_session_callback(ctx, find_psk_use_session_cb_Fct(f)); diff --git a/src/wrapped/wrappedlibssl3_private.h b/src/wrapped/wrappedlibssl3_private.h index d383384da9..5b009452a1 100644 --- a/src/wrapped/wrappedlibssl3_private.h +++ b/src/wrapped/wrappedlibssl3_private.h @@ -318,6 +318,8 @@ GO(SSL_CTX_get_verify_mode, iFp) GO(SSL_CTX_load_verify_dir, iFpp) GO(SSL_CTX_load_verify_locations, iFppp) GO(SSL_CTX_new, pFp) +GO(SSL_CTX_new_ex, pFppp) +GO(SSL_CTX_up_ref, iFp) GO(SSL_CTX_remove_session, iFpp) //GOM(SSL_CTX_sess_get_get_cb, pFEp) //GOM(SSL_CTX_sess_get_new_cb, pFEp) @@ -342,9 +344,10 @@ GOM(SSL_CTX_set_cookie_verify_cb, vFEpp) GOM(SSL_CTX_set_default_passwd_cb, vFEpp) GO(SSL_CTX_set_default_passwd_cb_userdata, vFpp) GO(SSL_CTX_set_default_verify_paths, iFp) +GO(SSL_CTX_set_default_read_buffer_len, vFpL) GO(SSL_CTX_set_ex_data, iFpip) //GOM(SSL_CTX_set_generate_session_id, iFEpp) -//GOM(SSL_CTX_set_info_callback, vFEpp) +GOM(SSL_CTX_set_info_callback, vFEpp) GOM(SSL_CTX_set_keylog_callback, vFEpp) GOM(SSL_CTX_set_msg_callback, vFEpp) //GOM(SSL_CTX_set_next_protos_advertised_cb, vFEppp) @@ -369,6 +372,7 @@ GO(SSL_CTX_set_ssl_version, iFpp) GO(SSL_CTX_set_timeout, lFpl) GO(SSL_CTX_set_tlsext_use_srtp, iFpp) //GOM(SSL_CTX_set_tmp_dh_callback, vFEpp) +GO(SSL_CTX_set0_tmp_dh_pkey, iFpp) //GO(SSL_CTX_set_tmp_ecdh_callback, //GO(SSL_CTX_set_tmp_rsa_callback, GO(SSL_CTX_set_trust, iFpi) @@ -401,6 +405,7 @@ GO(SSL_free, vFp) GO(SSL_get0_alpn_selected, vFppp) GO(SSL_get0_next_proto_negotiated, vFppp) GO(SSL_get0_param, pFp) +GO(SSL_get0_group_name, pFp) GO(SSL_get0_peer_certificate, pFp) GO(SSL_get0_session, pFp) // Warning: failed to confirm GO(SSL_get0_verified_chain, pFp) @@ -420,6 +425,7 @@ GO(SSL_get_current_compression, pFp) GO(SSL_get_current_expansion, pFp) GO(SSL_get_default_timeout, lFp) GO(SSL_get_error, iFpi) +GO(SSL_get_early_data_status, iFp) GO(SSL_get_ex_data, pFpi) GO(SSL_get_ex_data_X509_STORE_CTX_idx, iFv) GOM(SSL_get_ex_new_index, iFElpppp) // Warning: failed to confirm @@ -429,6 +435,7 @@ GO(SSL_get_finished, LFppL) //GOM(SSL_get_info_callback, pFEp) //GO(ssl_get_new_session, GO(SSL_get_peer_cert_chain, pFp) +GO(SSL_get_peer_signature_type_nid, iFp) GO(SSL_get_peer_finished, LFppL) //GO(ssl_get_prev_session, GO(SSL_get_privatekey, pFp) @@ -504,6 +511,7 @@ GO(SSL_SESSION_get_ex_data, pFpi) //GO(SSL_SESSION_get_ex_new_index, GO(SSL_SESSION_get_id, pFpp) GO(SSL_SESSION_get_master_key, LFppL) +GO(SSL_SESSION_get_max_early_data, uFp) GO(SSL_SESSION_get_ticket_lifetime_hint, LFp) GO(SSL_SESSION_get_time, lFp) GO(SSL_SESSION_get_timeout, lFp) @@ -526,6 +534,7 @@ GO(SSL_set_bio, vFppp) //GOM(SSL_set_cert_cb, vFEppp) //GO(ssl_set_cert_masks, GO(SSL_set_cipher_list, iFpp) +GO(SSL_set_ciphersuites, iFpp) GO(SSL_set_client_CA_list, vFpp) //GO(ssl_set_client_disabled, GO(SSL_set_connect_state, vFp) @@ -602,6 +611,7 @@ GO(SSL_version, iFp) GO(SSL_want, iFp) GO(SSL_write, iFppi) GO(SSL_write_ex, iFppLp) +GO(SSL_write_early_data, iFppLp) //GO(tls12_check_peer_sigalg, //GO(tls12_get_hash, //GO(tls12_get_psigalgs, diff --git a/src/wrapped/wrappedselinux_private.h b/src/wrapped/wrappedselinux_private.h index 1da10f4dd9..0edea23648 100644 --- a/src/wrapped/wrappedselinux_private.h +++ b/src/wrapped/wrappedselinux_private.h @@ -58,7 +58,7 @@ GO(getcon_raw, iFp) //GO(getexeccon_raw, GO(getfilecon, iFpp) GO(getfilecon_raw, iFpp) -//GO(getfscreatecon, +GO(getfscreatecon, iFp) GO(getfscreatecon_raw, iFp) //GO(getkeycreatecon, //GO(getkeycreatecon_raw,