From: W.C.A. Wijngaards Date: Fri, 31 Jul 2020 07:10:40 +0000 (+0200) Subject: - Fix doxygen comment for no ssl for tls session ticket key callback X-Git-Tag: release-1.12.0rc1~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e855d5779a6e0bd07681bb2db5a189b14039ae90;p=thirdparty%2Funbound.git - Fix doxygen comment for no ssl for tls session ticket key callback routine. --- diff --git a/doc/Changelog b/doc/Changelog index 3ee202c62..8f768952b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +31 July 2020: Wouter + - Fix doxygen comment for no ssl for tls session ticket key callback + routine. + 27 July 2020: George - Merge PR #268, draft-ietf-dnsop-serve-stale-10 has become RFC 8767 on March 2020, by and0x000. diff --git a/util/net_help.c b/util/net_help.c index f59a4d653..7d81d47be 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -82,6 +82,7 @@ static struct tls_session_ticket_key { unsigned char *hmac_key; } *ticket_keys; +#ifdef HAVE_SSL /** * callback TLS session ticket encrypt and decrypt * For use with SSL_CTX_set_tlsext_ticket_key_cb or @@ -97,7 +98,6 @@ static struct tls_session_ticket_key { * @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. */ -#ifdef HAVE_SSL int tls_session_ticket_key_cb(SSL *s, unsigned char* key_name, unsigned char* iv, EVP_CIPHER_CTX *evp_ctx, #ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB