clones/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2024-09-21 14:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prettier, comments from Jelte.

Browse Source 
git-svn-id: file:///svn/unbound/trunk@1698 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2009-07-06 09:34:47 +00:00
parent bfceac5b2e
commit 8595d94e0f
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemon/remote.c
View File

@ -168,38 +168,27 @@ daemon_remote_create(struct config_file* cfg)
s_key = fname_after_chroot(cfg->server_key_file, cfg, 1);
if(!s_cert || !s_key) {
log_err("out of memory in remote control fname");
free(s_cert);
free(s_key);
daemon_remote_delete(rc);
return NULL;
goto setup_error;
}
verbose(VERB_ALGO, "setup SSL certificates");
if (!SSL_CTX_use_certificate_file(rc->ctx,s_cert,SSL_FILETYPE_PEM)) {
log_err("Error for server-cert-file: %s", s_cert);
log_crypto_err("Error in SSL_CTX use_certificate_file");
free(s_cert);
free(s_key);
daemon_remote_delete(rc);
return NULL;
goto setup_error;
}
if(!SSL_CTX_use_PrivateKey_file(rc->ctx,s_key,SSL_FILETYPE_PEM)) {
log_err("Error for server-key-file: %s", s_key);
log_crypto_err("Error in SSL_CTX use_PrivateKey_file");
free(s_cert);
free(s_key);
daemon_remote_delete(rc);
return NULL;
goto setup_error;
}
if(!SSL_CTX_check_private_key(rc->ctx)) {
log_err("Error for server-key-file: %s", s_key);
log_crypto_err("Error in SSL_CTX check_private_key");
free(s_cert);
free(s_key);
daemon_remote_delete(rc);
return NULL;
goto setup_error;
}
if(!SSL_CTX_load_verify_locations(rc->ctx, s_cert, NULL)) {
log_crypto_err("Error setting up SSL_CTX verify locations");
setup_error:
free(s_cert);
free(s_key);
daemon_remote_delete(rc);

3
doc/Changelog
View File

@ -1,3 +1,6 @@
6 July 2009: Wouter
- prettier error handling in SSL setup.
3 July 2009: Wouter
- fixup linking when ldnsdir is "".