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 compile with libnettle

Browse source 
git-svn-id: file:///svn/unbound/trunk@4281 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-07-24 09:52:20 +00:00
parent 62e88b46cc
commit b7d9b59aa9
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -7,6 +7,7 @@
- squelch TCP fast open error on FreeBSD when kernel has it disabled, - squelch TCP fast open error on FreeBSD when kernel has it disabled,
unless verbosity is high. unless verbosity is high.
- remove warning from windows compile. - remove warning from windows compile.
- Fix compile with libnettle
17 July 2017: Wouter 17 July 2017: Wouter
- Fix #1350: make cachedb backend configurable (from JINMEI Tatuya). - Fix #1350: make cachedb backend configurable (from JINMEI Tatuya).

8
util/net_help.c
View file

@ -613,6 +613,7 @@ log_crypto_err(const char* str)
int int
listen_sslctx_setup(void* ctxt) listen_sslctx_setup(void* ctxt)
{ {
#ifdef HAVE_SSL
SSL_CTX* ctx = (SSL_CTX*)ctxt; SSL_CTX* ctx = (SSL_CTX*)ctxt;
/* no SSLv2, SSLv3 because has defects */ /* no SSLv2, SSLv3 because has defects */
if((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) if((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2)
@ -658,11 +659,15 @@ listen_sslctx_setup(void* ctxt)
SSL_CTX_set_security_level(ctx, 0); SSL_CTX_set_security_level(ctx, 0);
#endif #endif
return 1; return 1;
#else
(void)ctxt;
#endif /* HAVE_SSL */
} }
void void
listen_sslctx_setup_2(void* ctxt) listen_sslctx_setup_2(void* ctxt)
{ {
#ifdef HAVE_SSL
SSL_CTX* ctx = (SSL_CTX*)ctxt; SSL_CTX* ctx = (SSL_CTX*)ctxt;
(void)ctx; (void)ctx;
#if HAVE_DECL_SSL_CTX_SET_ECDH_AUTO #if HAVE_DECL_SSL_CTX_SET_ECDH_AUTO
@ -682,6 +687,9 @@ listen_sslctx_setup_2(void* ctxt)
} }
} }
#endif #endif
#else
(void)ctxt;
#endif /* HAVE_SSL */
} }
void* listen_sslctx_create(char* key, char* pem, char* verifypem) void* listen_sslctx_create(char* key, char* pem, char* verifypem)