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/deps-lib | |
parent | 1fea1f6ed53cae7f752c9a78271c7c8367b0ad03 (diff) | |
download | s6-networking-5715c21a077ee1c2fe8957cb4adcea14fd2eda6b.tar.xz |
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/deps-lib')
-rw-r--r-- | src/sbearssl/deps-lib/sbearssl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sbearssl/deps-lib/sbearssl b/src/sbearssl/deps-lib/sbearssl index c0acfb6..55729f6 100644 --- a/src/sbearssl/deps-lib/sbearssl +++ b/src/sbearssl/deps-lib/sbearssl @@ -1,5 +1,4 @@ sbearssl_append.o -sbearssl_prep_spawn_drop.o sbearssl_cert_from.o sbearssl_cert_readbigpem.o sbearssl_cert_readfile.o @@ -33,7 +32,7 @@ sbearssl_ta_to.o sbearssl_x500_name_len.o sbearssl_x500_from_ta.o sbearssl_x509_minimal_set_tai.o -sbearssl_s6tlsc.o -sbearssl_s6tlsd.o +sbearssl_client_init_and_run.o +sbearssl_server_init_and_run.o -lbearssl -lskarnet |