upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 00:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix nettle compile for warnings and ticket keys.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2025-04-04 10:30:22 +02:00
parent 90243a694a
commit 0e5d26807d
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,6 +1,7 @@
4 April 2025: Wouter 4 April 2025: Wouter
- Fix mesh_copy_client_info to omit null contents from copy. - Fix mesh_copy_client_info to omit null contents from copy.
- Fix comment name in the rpz nsdname test. - Fix comment name in the rpz nsdname test.
- Fix nettle compile for warnings and ticket keys.
3 April 2025: Wouter 3 April 2025: Wouter
- Fix #1263: Exempt loopback addresses from wait-limit. - Fix #1263: Exempt loopback addresses from wait-limit.

9
util/net_help.c
View file

@ -92,11 +92,13 @@ int RRSET_ROUNDROBIN = 1;
/** log tag queries with name instead of 'info' for filtering */ /** log tag queries with name instead of 'info' for filtering */
int LOG_TAG_QUERYREPLY = 0; int LOG_TAG_QUERYREPLY = 0;
#ifdef HAVE_SSL
static struct tls_session_ticket_key { static struct tls_session_ticket_key {
unsigned char *key_name; unsigned char *key_name;
unsigned char *aes_key; unsigned char *aes_key;
unsigned char *hmac_key; unsigned char *hmac_key;
} *ticket_keys; } *ticket_keys;
#endif /* HAVE_SSL */
#ifdef HAVE_SSL #ifdef HAVE_SSL
/** /**
@ -1198,6 +1200,7 @@ static int doh_alpn_select_cb(SSL* ATTR_UNUSED(ssl), const unsigned char** out,
} }
#endif #endif
#ifdef HAVE_SSL
/* setup the callback for ticket keys */ /* setup the callback for ticket keys */
static int static int
setup_ticket_keys_cb(void* sslctx) setup_ticket_keys_cb(void* sslctx)
@ -1213,7 +1216,7 @@ setup_ticket_keys_cb(void* sslctx)
# endif # endif
return 1; return 1;
} }
#endif /* HAVE_SSL */
int int
listen_sslctx_setup(void* ctxt) listen_sslctx_setup(void* ctxt)
@ -1417,7 +1420,7 @@ void* listen_sslctx_create(const char* key, const char* pem,
#else #else
(void)key; (void)pem; (void)verifypem; (void)key; (void)pem; (void)verifypem;
(void)tls_ciphers; (void)tls_ciphersuites; (void)tls_ciphers; (void)tls_ciphersuites;
(void)tls_session_ticket_keys; (void)set_ticket_keys_cb; (void)is_dot; (void)is_doh;
return NULL; return NULL;
#endif /* HAVE_SSL */ #endif /* HAVE_SSL */
} }
@ -1940,6 +1943,7 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
} }
#endif /* HAVE_SSL */ #endif /* HAVE_SSL */
#ifdef HAVE_SSL
void void
listen_sslctx_delete_ticket_keys(void) listen_sslctx_delete_ticket_keys(void)
{ {
@ -1957,6 +1961,7 @@ listen_sslctx_delete_ticket_keys(void)
free(ticket_keys); free(ticket_keys);
ticket_keys = NULL; ticket_keys = NULL;
} }
#endif /* HAVE_SSL */
# ifndef USE_WINSOCK # ifndef USE_WINSOCK
char* char*