summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-11-05 16:19:14 -0500
committerJune McEnroe <june@causal.agency>2019-11-05 16:19:14 -0500
commit37217e23127a1d66d68de06a615c613fd3ac9141 (patch)
treee1e83cb027c4de3b85007c55c4883a6b545533fd
parentImplement SASL EXTERNAL (diff)
downloadpounce-37217e23127a1d66d68de06a615c613fd3ac9141.tar.gz
pounce-37217e23127a1d66d68de06a615c613fd3ac9141.zip
Use one call to set client cert and key
-rw-r--r--server.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/server.c b/server.c
index 5ca517c..cb11d84 100644
--- a/server.c
+++ b/server.c
@@ -46,21 +46,10 @@ void serverConfig(bool insecure, const char *cert, const char *priv) {
 	}
 
 	if (cert) {
-		error = tls_config_set_cert_file(config, cert);
+		error = tls_config_set_keypair_file(config, cert, (priv ? priv : cert));
 		if (error) {
 			errx(
-				EX_SOFTWARE, "tls_config_set_cert_file: %s",
-				tls_config_error(config)
-			);
-		}
-	}
-
-	if (cert && !priv) priv = cert;
-	if (priv) {
-		error = tls_config_set_key_file(config, priv);
-		if (error) {
-			errx(
-				EX_SOFTWARE, "tls_config_set_key_file: %s",
+				EX_SOFTWARE, "tls_config_set_keypair_file: %s",
 				tls_config_error(config)
 			);
 		}
Move hilex out of hilex directoryJune McEnroe 2021-01-12Consolidate hilex formatters into hilex.cJune McEnroe 2021-01-12Remove hacky tagging from hilexJune McEnroe 2021-01-12Add htagml -iJune McEnroe 2021-01-12Render tag index in HTMLJune McEnroe 2021-01-12Add htagml -xJune McEnroe 2021-01-12Prevent matching the same tag twiceJune McEnroe 2021-01-12Process htagml file line by lineJune McEnroe 2021-01-12Split fields by tab onlyJune McEnroe 2021-01-12List both Makefile and html.sh under README.7June McEnroe 2021-01-12Add htagml exampleJune McEnroe 2021-01-12Use mandoc and htagml for bin htmlJune McEnroe 2021-01-12Add htagmlJune McEnroe 2021-01-12Replace causal.agency with a simple mdoc pageJune McEnroe 2021-01-11Publish "Using vi"June McEnroe 2021-01-11Enable diff.colorMovedJune McEnroe 2021-01-10Set less search case-insensitiveJune McEnroe 2021-01-10Set EXINITJune McEnroe 2021-01-09Add c -t flag to print expression typeJune McEnroe 2021-01-05Update taglineJune McEnroe