diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-06-02 09:26:41 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2021-06-02 09:26:41 +0000 |
| commit | dbfc174a230b39fe8c6671bba8ea7bebde2e698c (patch) | |
| tree | 88f636e7f41c6a1a6165f6729355269787dc4bd0 | |
| parent | 9cfe27834a3014235526c60c52652399411993de (diff) | |
| download | s6-networking-dbfc174a230b39fe8c6671bba8ea7bebde2e698c.tar.xz | |
Work around incredible libtls stupidity
| -rw-r--r-- | src/stls/stls_server_init_and_handshake.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/stls/stls_server_init_and_handshake.c b/src/stls/stls_server_init_and_handshake.c index 2a8c235..f2613db 100644 --- a/src/stls/stls_server_init_and_handshake.c +++ b/src/stls/stls_server_init_and_handshake.c @@ -20,6 +20,7 @@ struct tls *stls_server_init_and_handshake (int const *fds, tain_t const *tto, u struct tls *sctx ; struct tls_config *cfg ; char const *x ; + int got = 0 ; if (tls_init() < 0) strerr_diefu1sys(111, "tls_init") ; cfg = tls_config_new() ; @@ -33,6 +34,7 @@ struct tls *stls_server_init_and_handshake (int const *fds, tain_t const *tto, u if (!x) strerr_dienotset(100, "KEYFILE") ; if (tls_config_set_keypair_file(cfg, y, x) < 0) diecfg(cfg, "tls_config_set_keypair_file") ; + got = 1 ; } if (preoptions & 4) /* snilevel > 0 */ { @@ -53,6 +55,12 @@ struct tls *stls_server_init_and_handshake (int const *fds, tain_t const *tto, u x = getenv(certvar) ; if (!x) strerr_dief3x(96, "environment variable KEYFILE:", certvar + 9, " not paired with the corresponding CERTFILE") ; + else if (!got) + { + if (tls_config_set_keypair_file(cfg, x, *envp + kequal + 1) < 0) + diecfg(cfg, "tls_config_set_keypair_file") ; + got = 1 ; + } else if (tls_config_add_keypair_file(cfg, x, *envp + kequal + 1) < 0) diecfg(cfg, "tls_config_add_keypair_file") ; } |