From: W.C.A. Wijngaards Date: Fri, 4 Apr 2025 08:30:22 +0000 (+0200) Subject: - Fix nettle compile for warnings and ticket keys. X-Git-Tag: release-1.23.0rc1~9 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0e5d26807d1552ae4ae0b1ea0100349aa8bdac38;p=thirdparty%2Funbound.git - Fix nettle compile for warnings and ticket keys. --- diff --git a/doc/Changelog b/doc/Changelog index 6576c3455..301d53f8a 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ 4 April 2025: Wouter - Fix mesh_copy_client_info to omit null contents from copy. - Fix comment name in the rpz nsdname test. + - Fix nettle compile for warnings and ticket keys. 3 April 2025: Wouter - Fix #1263: Exempt loopback addresses from wait-limit. diff --git a/util/net_help.c b/util/net_help.c index c57228eee..8eca6b757 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -92,11 +92,13 @@ int RRSET_ROUNDROBIN = 1; /** log tag queries with name instead of 'info' for filtering */ int LOG_TAG_QUERYREPLY = 0; +#ifdef HAVE_SSL static struct tls_session_ticket_key { unsigned char *key_name; unsigned char *aes_key; unsigned char *hmac_key; } *ticket_keys; +#endif /* HAVE_SSL */ #ifdef HAVE_SSL /** @@ -1198,6 +1200,7 @@ static int doh_alpn_select_cb(SSL* ATTR_UNUSED(ssl), const unsigned char** out, } #endif +#ifdef HAVE_SSL /* setup the callback for ticket keys */ static int setup_ticket_keys_cb(void* sslctx) @@ -1213,7 +1216,7 @@ setup_ticket_keys_cb(void* sslctx) # endif return 1; } - +#endif /* HAVE_SSL */ int listen_sslctx_setup(void* ctxt) @@ -1417,7 +1420,7 @@ void* listen_sslctx_create(const char* key, const char* pem, #else (void)key; (void)pem; (void)verifypem; (void)tls_ciphers; (void)tls_ciphersuites; - (void)tls_session_ticket_keys; + (void)set_ticket_keys_cb; (void)is_dot; (void)is_doh; return NULL; #endif /* HAVE_SSL */ } @@ -1940,6 +1943,7 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name, } #endif /* HAVE_SSL */ +#ifdef HAVE_SSL void listen_sslctx_delete_ticket_keys(void) { @@ -1957,6 +1961,7 @@ listen_sslctx_delete_ticket_keys(void) free(ticket_keys); ticket_keys = NULL; } +#endif /* HAVE_SSL */ # ifndef USE_WINSOCK char*