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

- Fix libnettle compile for session ticket key callback function

Browse source 
changes.
This commit is contained in:
W.C.A. Wijngaards 2020-07-17 16:53:52 +02:00
parent 3a21617c62
commit 7d4445c03d
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
17 July 2020: Wouter
- Fix libnettle compile for session ticket key callback function
changes.
17 July 2020: Ralph 17 July 2020: Ralph
- Merge PR #234 - Ensure proper alignment of cmsg buffers by Jérémie - Merge PR #234 - Ensure proper alignment of cmsg buffers by Jérémie
Courrèges-Anglas. Courrèges-Anglas.

5
util/net_help.c
View file

@ -97,6 +97,7 @@ static struct tls_session_ticket_key {
* @return 0 on no ticket, 1 for okay, and 2 for okay but renew the ticket * @return 0 on no ticket, 1 for okay, and 2 for okay but renew the ticket
* (the ticket is decrypt only). and <0 for failures. * (the ticket is decrypt only). and <0 for failures.
*/ */
#ifdef HAVE_SSL
int tls_session_ticket_key_cb(SSL *s, unsigned char* key_name, int tls_session_ticket_key_cb(SSL *s, unsigned char* key_name,
unsigned char* iv, EVP_CIPHER_CTX *evp_ctx, unsigned char* iv, EVP_CIPHER_CTX *evp_ctx,
#ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB #ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB
@ -105,6 +106,7 @@ int tls_session_ticket_key_cb(SSL *s, unsigned char* key_name,
HMAC_CTX* hmac_ctx, HMAC_CTX* hmac_ctx,
#endif #endif
int enc); int enc);
#endif /* HAVE_SSL */
/* returns true is string addr is an ip6 specced address */ /* returns true is string addr is an ip6 specced address */
int int
@ -1267,6 +1269,7 @@ int set_auth_name_on_ssl(void* ssl, char* auth_name, int use_sni)
} }
#else #else
(void)ssl; (void)ssl;
(void)use_sni;
#endif #endif
#ifdef HAVE_SSL_SET1_HOST #ifdef HAVE_SSL_SET1_HOST
SSL_set_verify(ssl, SSL_VERIFY_PEER, NULL); SSL_set_verify(ssl, SSL_VERIFY_PEER, NULL);
@ -1434,6 +1437,7 @@ int listen_sslctx_setup_ticket_keys(void* sslctx, struct config_strlist* tls_ses
} }
#ifdef HAVE_SSL
int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name, int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
unsigned char* iv, EVP_CIPHER_CTX *evp_sctx, unsigned char* iv, EVP_CIPHER_CTX *evp_sctx,
#ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB #ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB
@ -1531,6 +1535,7 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
return 0; return 0;
#endif #endif
} }
#endif /* HAVE_SSL */
void void
listen_sslctx_delete_ticket_keys(void) listen_sslctx_delete_ticket_keys(void)