From 5715c21a077ee1c2fe8957cb4adcea14fd2eda6b Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 20 Nov 2020 23:24:29 +0000 Subject: 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. --- src/conn-tools/s6tls-internal.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/conn-tools/s6tls-internal.h (limited to 'src/conn-tools/s6tls-internal.h') diff --git a/src/conn-tools/s6tls-internal.h b/src/conn-tools/s6tls-internal.h new file mode 100644 index 0000000..48df60f --- /dev/null +++ b/src/conn-tools/s6tls-internal.h @@ -0,0 +1,18 @@ +/* ISC license */ + +#ifndef S6TLS_INTERNAL_H +#define S6TLS_INTERNAL_H + +#include +#include + +#include + +#define s6tls_envvars "CADIR\0CAFILE\0KEYFILE\0CERTFILE\0TLS_UID\0TLS_GID" + +extern void s6tls_drop (void) ; +extern void s6tls_exec_tlscio (int const *, uint32_t, unsigned int, unsigned int, char const *) gccattr_noreturn ; +extern void s6tls_exec_tlsdio (int const *, uint32_t, unsigned int, unsigned int) gccattr_noreturn ; +extern void s6tls_wait_and_exec_app (char const *const *, int const [3][2], pid_t, int, int, uint32_t) gccattr_noreturn ; + +#endif -- cgit v1.3.1