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/deps-exe/s6-tlsc | 6 +----- src/conn-tools/deps-exe/s6-tlsc-io | 5 +++++ src/conn-tools/deps-exe/s6-tlsd | 6 +----- src/conn-tools/deps-exe/s6-tlsd-io | 5 +++++ src/conn-tools/deps-exe/s6-ucspitlsd | 3 +++ 5 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 src/conn-tools/deps-exe/s6-tlsc-io create mode 100644 src/conn-tools/deps-exe/s6-tlsd-io create mode 100644 src/conn-tools/deps-exe/s6-ucspitlsd (limited to 'src/conn-tools/deps-exe') diff --git a/src/conn-tools/deps-exe/s6-tlsc b/src/conn-tools/deps-exe/s6-tlsc index 6e89a02..37405fd 100644 --- a/src/conn-tools/deps-exe/s6-tlsc +++ b/src/conn-tools/deps-exe/s6-tlsc @@ -1,6 +1,2 @@ -${LIBCRYPTOSUPPORT} +libs6tls.a.xyzzy -lskarnet -${CRYPTO_LIB} -${SOCKET_LIB} -${SPAWN_LIB} -${SYSCLOCK_LIB} diff --git a/src/conn-tools/deps-exe/s6-tlsc-io b/src/conn-tools/deps-exe/s6-tlsc-io new file mode 100644 index 0000000..3e2653d --- /dev/null +++ b/src/conn-tools/deps-exe/s6-tlsc-io @@ -0,0 +1,5 @@ +${LIBCRYPTOSUPPORT} +-lskarnet +${CRYPTO_LIB} +${SOCKET_LIB} +${SYSCLOCK_LIB} diff --git a/src/conn-tools/deps-exe/s6-tlsd b/src/conn-tools/deps-exe/s6-tlsd index 6e89a02..37405fd 100644 --- a/src/conn-tools/deps-exe/s6-tlsd +++ b/src/conn-tools/deps-exe/s6-tlsd @@ -1,6 +1,2 @@ -${LIBCRYPTOSUPPORT} +libs6tls.a.xyzzy -lskarnet -${CRYPTO_LIB} -${SOCKET_LIB} -${SPAWN_LIB} -${SYSCLOCK_LIB} diff --git a/src/conn-tools/deps-exe/s6-tlsd-io b/src/conn-tools/deps-exe/s6-tlsd-io new file mode 100644 index 0000000..3e2653d --- /dev/null +++ b/src/conn-tools/deps-exe/s6-tlsd-io @@ -0,0 +1,5 @@ +${LIBCRYPTOSUPPORT} +-lskarnet +${CRYPTO_LIB} +${SOCKET_LIB} +${SYSCLOCK_LIB} diff --git a/src/conn-tools/deps-exe/s6-ucspitlsd b/src/conn-tools/deps-exe/s6-ucspitlsd new file mode 100644 index 0000000..ac1b327 --- /dev/null +++ b/src/conn-tools/deps-exe/s6-ucspitlsd @@ -0,0 +1,3 @@ +libs6tls.a.xyzzy +-lskarnet +${SOCKET_LIB} -- cgit v1.3.1