summaryrefslogtreecommitdiffstats
path: root/usr.sbin/relayd/config.c
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2014-05-04 16:38:19 +0000
committerreyk <reyk@openbsd.org>2014-05-04 16:38:19 +0000
commit1013dd2ea9b81d70f70e69090e203f7ad13066cc (patch)
treea650d7c31d7072dc44348f6261b90d069a1cd52f /usr.sbin/relayd/config.c
parentMake use of usbd_xfer_isread() instead of rerolling it everywhere. (diff)
downloadwireguard-openbsd-1013dd2ea9b81d70f70e69090e203f7ad13066cc.tar.xz
wireguard-openbsd-1013dd2ea9b81d70f70e69090e203f7ad13066cc.zip
Create a new default RSA engine instead of patching the existing one
if none is available. Fixes SSL/TLS and a possible fatalx() on machines without a default RSA engine. Thanks to Bjorn Ketelaars for reporting and testing. ok gilles@ (for the relayd part)
Diffstat (limited to 'usr.sbin/relayd/config.c')
-rw-r--r--usr.sbin/relayd/config.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/relayd/config.c b/usr.sbin/relayd/config.c
index 609317a5680..51adfe950b7 100644
--- a/usr.sbin/relayd/config.c
+++ b/usr.sbin/relayd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.13 2014/04/22 08:04:23 reyk Exp $ */
+/* $OpenBSD: config.c,v 1.14 2014/05/04 16:38:19 reyk Exp $ */
/*
* Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -284,9 +284,8 @@ config_getcfg(struct relayd *env, struct imsg *imsg)
if (env->sc_flags & (F_SSL|F_SSLCLIENT)) {
ssl_init(env);
- if ((what & CONFIG_CA_ENGINE) &&
- (ca_engine_init(env)) == -1)
- fatal("CA engine failed");
+ if (what & CONFIG_CA_ENGINE)
+ ca_engine_init(env);
}
if (privsep_process != PROC_PARENT)