summary refs log tree commit diff
path: root/server.c
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 /server.c
parentImplement SASL EXTERNAL (diff)
downloadpounce-37217e23127a1d66d68de06a615c613fd3ac9141.tar.gz
pounce-37217e23127a1d66d68de06a615c613fd3ac9141.zip
Use one call to set client cert and key
Diffstat (limited to 'server.c')
-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)
 			);
 		}
low=1'>Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 34f25ae40a3db9369e9d98b3814f2b93bbc21451. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe