From d5e1e30271d5173abf37d0028f82dab8ca052ba1 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Mon, 24 Aug 2020 21:58:59 -0400 Subject: Use configPath to load client cert/priv --- server.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/server.c b/server.c index 1c87c2a..89e3e36 100644 --- a/server.c +++ b/server.c @@ -57,13 +57,24 @@ void serverConfig(bool insecure, const char *cert, const char *priv) { } if (cert) { - error = tls_config_set_keypair_file(config, cert, (priv ? priv : cert)); - if (error) { - errx( - EX_SOFTWARE, "tls_config_set_keypair_file: %s", - tls_config_error(config) - ); + const char *dirs = NULL; + for (const char *path; NULL != (path = configPath(&dirs, cert));) { + if (priv) { + error = tls_config_set_cert_file(config, path); + } else { + error = tls_config_set_keypair_file(config, path, path); + } + if (!error) break; + } + if (error) errx(EX_NOINPUT, "%s: %s", cert, tls_config_error(config)); + } + if (priv) { + const char *dirs = NULL; + for (const char *path; NULL != (path = configPath(&dirs, priv));) { + error = tls_config_set_key_file(config, path); + if (!error) break; } + if (error) errx(EX_NOINPUT, "%s: %s", priv, tls_config_error(config)); } client = tls_client(); -- cgit 1.4.1 '>diff
path: root/pdf (unfollow)
Commit message (Expand)Author
2019-08-28Add Birds ContendingJune McEnroe
2019-08-28Rename wat to everJune McEnroe
2019-08-28Remove brot and gfxxJune McEnroe
2019-08-28Use rand(3) in beefJune McEnroe
2019-08-28Remove wakeJune McEnroe
2019-08-28Add The Fated SkyJune McEnroe
2019-08-28Factor out cap_rights_limit error handlingJune McEnroe
2019-08-27Cast %lc parameter to wint_tJune McEnroe
2019-08-27Remove host thursdayJune McEnroe
2019-08-22Add cards to causal.agencyJune McEnroe
2019-08-20Add Record of a Spaceborn FewJune McEnroe
2019-08-13Add The Calculating StarsJune McEnroe
2019-08-12Make dtch one command, add sinkingJune McEnroe
2019-08-03Add ImagoJune McEnroe
2019-07-29Add KindredJune McEnroe
2019-07-27Clean up home filesJune McEnroe
2019-07-27Fix shell script style in ~/.local/binJune McEnroe
2019-07-27Shell script style passJune McEnroe
2019-07-27Add c11.pdfJune McEnroe
2019-07-27Move pdf script to MakefileJune McEnroe
2019-07-27Update macOS neovim to 0.3.8June McEnroe
2019-07-27Rewrite port makefiles consistentlyJune McEnroe
2019-07-27Rewrite Makefile once more with more organizationJune McEnroe
2019-07-27Reference png.h in bin.7June McEnroe
2019-07-27Revert "Use scheme to style HTMLs"June McEnroe
2019-07-27Remove scheme text linkJune McEnroe
2019-07-26Update Dark.terminalJune McEnroe
2019-07-26Lighten dark whiteJune McEnroe
2019-07-25Add png.3 man pageJune McEnroe
2019-07-25Use scheme to style HTMLsJune McEnroe
2019-07-25Don't match comments in strings in makeJune McEnroe
2019-07-25Generate index.html with links from bin.7June McEnroe
2019-07-24Warn when date has changedJune McEnroe
2019-07-24Add whenJune McEnroe
2019-07-24Remove histedit from bitJune McEnroe