- Fix doxygen comment for no ssl for tls session ticket key callback

  routine.

diff --git a/doc/Changelog b/doc/Changelog
index 3ee202c6288386dcfec649118c3d68811f070303..8f768952b79be4e1b73207cc4797f43788c52cb0 100644 (file)
--- 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 f59a4d65370d7a97ac5f2cf9d94a455c29ff2ec4..7d81d47be004a8a418f4444d76077bf8de3b9029 100644 (file)
--- 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