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

- Fix that with openssl 1.1 control-use-cert: no uses less cpu, by

Browse source 
using no encryption over the unix socket.


git-svn-id: file:///svn/unbound/trunk@3936 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-11-25 16:14:14 +00:00
parent 2dce3856cd
commit 92bff79d3d
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/remote.c
View file

@ -146,6 +146,7 @@ timeval_divide(struct timeval* avg, const struct timeval* sum, size_t d)
* the command : "openssl dhparam -C 2048" * the command : "openssl dhparam -C 2048"
* (some openssl versions reject DH that is 'too small', eg. 512). * (some openssl versions reject DH that is 'too small', eg. 512).
*/ */
#if OPENSSL_VERSION_NUMBER < 0x10100000
#ifndef S_SPLINT_S #ifndef S_SPLINT_S
static DH *get_dh2048(void) static DH *get_dh2048(void)
{ {
@ -203,6 +204,7 @@ err:
return NULL; return NULL;
} }
#endif /* SPLINT */ #endif /* SPLINT */
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */
struct daemon_remote* struct daemon_remote*
daemon_remote_create(struct config_file* cfg) daemon_remote_create(struct config_file* cfg)
@ -246,12 +248,15 @@ daemon_remote_create(struct config_file* cfg)
#ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL
SSL_CTX_set_security_level(rc->ctx, 0); SSL_CTX_set_security_level(rc->ctx, 0);
#endif #endif
if(!SSL_CTX_set_cipher_list(rc->ctx, "aNULL")) { if(!SSL_CTX_set_cipher_list(rc->ctx, "aNULL, eNULL")) {
log_crypto_err("Failed to set aNULL cipher list"); log_crypto_err("Failed to set aNULL cipher list");
daemon_remote_delete(rc); daemon_remote_delete(rc);
return NULL; return NULL;
} }
/* in openssl 1.1, the securitylevel 0 allows eNULL, that
* does not need the DH */
#if OPENSSL_VERSION_NUMBER < 0x10100000
/* Since we have no certificates and hence no source of /* Since we have no certificates and hence no source of
* DH params, let's generate and set them * DH params, let's generate and set them
*/ */
@ -260,6 +265,7 @@ daemon_remote_create(struct config_file* cfg)
daemon_remote_delete(rc); daemon_remote_delete(rc);
return NULL; return NULL;
} }
#endif
return rc; return rc;
} }
rc->use_cert = 1; rc->use_cert = 1;

4
doc/Changelog
View file

@ -1,3 +1,7 @@
25 November 2016: Wouter
- Fix that with openssl 1.1 control-use-cert: no uses less cpu, by
using no encryption over the unix socket.
22 Novenber 2016: Ralph 22 Novenber 2016: Ralph
- Make access-control-tag-data RDATA absolute. This makes the RDATA - Make access-control-tag-data RDATA absolute. This makes the RDATA
origin consistent between local-data and access-control-tag-data. origin consistent between local-data and access-control-tag-data.

2
smallapp/unbound-control.c
View file

@ -179,7 +179,7 @@ setup_ctx(struct config_file* cfg)
#ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL
SSL_CTX_set_security_level(ctx, 0); SSL_CTX_set_security_level(ctx, 0);
#endif #endif
if(!SSL_CTX_set_cipher_list(ctx, "aNULL")) if(!SSL_CTX_set_cipher_list(ctx, "aNULL, eNULL"))
ssl_err("Error setting NULL cipher!"); ssl_err("Error setting NULL cipher!");
} }
return ctx; return ctx;