From 5ae637afdee78946d12c798b55a116565c8130aa Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 2 Mar 2022 14:11:36 +0100 Subject: Drop support for non-gcrypt builds. * As there is now a builtin, lightweight libgcrypt there is no need to disable tls-clho decryption. * It is still possible to use a host libgcrypt with `--with-local-libgcrypt'. Signed-off-by: Toni Uhlig --- src/lib/ndpi_main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/lib/ndpi_main.c') diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index f85ff831d..c9ca62ea3 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -32,11 +32,10 @@ #include "ahocorasick.h" #include "libcache.h" -#ifdef HAVE_LIBGCRYPT +#ifdef USE_HOST_LIBGCRYPT #include #else #include -#define HAVE_LIBGCRYPT 1 #endif #include @@ -2420,7 +2419,6 @@ struct ndpi_detection_module_struct *ndpi_init_detection_module(ndpi_init_prefs if(prefs & ndpi_enable_ja3_plus) ndpi_str->enable_ja3_plus = 1; -#ifdef HAVE_LIBGCRYPT if(!(prefs & ndpi_dont_init_libgcrypt)) { if(!gcry_control (GCRYCTL_INITIALIZATION_FINISHED_P)) { const char *gcrypt_ver = gcry_check_version(NULL); @@ -2436,7 +2434,6 @@ struct ndpi_detection_module_struct *ndpi_init_detection_module(ndpi_init_prefs } else { NDPI_LOG_DBG(ndpi_str, "Libgcrypt initialization skipped\n"); } -#endif if((ndpi_str->protocols_ptree = ndpi_patricia_new(32 /* IPv4 */)) != NULL) { ndpi_init_ptree_ipv4(ndpi_str, ndpi_str->protocols_ptree, host_protocol_list); @@ -7554,10 +7551,7 @@ u_int16_t ndpi_get_api_version() { } const char *ndpi_get_gcrypt_version(void) { -#ifdef HAVE_LIBGCRYPT return gcry_check_version(NULL); -#endif - return NULL; } ndpi_proto_defaults_t *ndpi_get_proto_defaults(struct ndpi_detection_module_struct *ndpi_str) { -- cgit v1.2.3