diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-11-20 23:24:29 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-11-20 23:24:29 +0000 |
| commit | 5715c21a077ee1c2fe8957cb4adcea14fd2eda6b (patch) | |
| tree | cf3e992dce2d426727b535703b0b73dbafb41dbb /src/sbearssl/sbearssl_prep_spawn_drop.c | |
| parent | 1fea1f6ed53cae7f752c9a78271c7c8367b0ad03 (diff) | |
| download | s6-networking-5715c21a077ee1c2fe8957cb4adcea14fd2eda6b.tar.gz | |
Refactor tls code to support ucspi-tls
That includes:
- new architecture: the tls binary is now a child of the app
instead of the other way around
- the sbearssl_run engine now takes a post-handshake callback.
This allows s6-tlsc and s6-tlsd to only exec into the app when
the handshake succeeds (which was already the case with libressl).
- new binaries s6-tlsc-io and s6-tlsd-io encapsulate the crypto
code; they init and run the engine, connecting to 4 already open
fds (stdin/stdout = network, argv[1] and argv[2] = local)
- s6-tlsc is now a simple wrapper around s6-tlsc-io
- s6-tlsd is now a simple wrapper around s6-tlsd-io
- new binary: s6-ucspitlsd, which is also a wrapper around
s6-tlsd-io, but differently: the parent execs the app which should
be ucspi-tls-aware, the child waits for a command from the parent
and execs into s6-tlsd-io if it receives it.
Diffstat (limited to 'src/sbearssl/sbearssl_prep_spawn_drop.c')
| -rw-r--r-- | src/sbearssl/sbearssl_prep_spawn_drop.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/sbearssl/sbearssl_prep_spawn_drop.c b/src/sbearssl/sbearssl_prep_spawn_drop.c deleted file mode 100644 index 1ca7eb8..0000000 --- a/src/sbearssl/sbearssl_prep_spawn_drop.c +++ /dev/null @@ -1,35 +0,0 @@ -/* ISC license. */ - -#include <unistd.h> -#include <signal.h> -#include <skalibs/env.h> -#include <skalibs/strerr2.h> -#include <skalibs/djbunix.h> -#include <skalibs/selfpipe.h> -#include "sbearssl-internal.h" - -pid_t sbearssl_prep_spawn_drop (char const *const *argv, char const *const *envp, int *fds, uid_t uid, gid_t gid, uint32_t options) -{ - pid_t pid ; - - fds[4] = selfpipe_init() ; - if (fds[4] < 0) strerr_diefu1sys(111, "init selfpipe") ; - if (selfpipe_trap(SIGCHLD) < 0) strerr_diefu1sys(111, "trap SIGCHLD") ; - - if (!(options & 1)) pid = child_spawn2(argv[0], argv, envp, fds) ; - else - { - char const modifs[] = "CADIR\0CAFILE\0KEYFILE\0CERTFILE\0TLS_UID\0TLS_GID" ; - size_t modiflen = sizeof(modifs) ; - size_t n = env_len(envp) ; - char const *newenv[n + 7] ; - size_t newenvlen = env_merge(newenv, n+7, envp, n, modifs, modiflen) ; - if (!newenvlen) return 0 ; - pid = child_spawn2(argv[0], argv, newenv, fds) ; - } - - if (!pid) strerr_diefu2sys(111, "spawn ", argv[0]) ; - if (gid && setgid(gid) < 0) strerr_diefu1sys(111, "setgid") ; - if (uid && setuid(uid) < 0) strerr_diefu1sys(111, "setuid") ; - return pid ; -} |
