From 0545d612be4529492a86a98b5f066d58d7c9436a Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 18 Jan 2021 21:15:21 +0000 Subject: Tiny code and doc fixes --- doc/s6-ucspitlsc.html | 8 ++++---- doc/s6-ucspitlsd.html | 8 ++++---- src/tls/s6-ucspitlsc.c | 1 + src/tls/s6-ucspitlsd.c | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/s6-ucspitlsc.html b/doc/s6-ucspitlsc.html index 4c1d2be..627945f 100644 --- a/doc/s6-ucspitlsc.html +++ b/doc/s6-ucspitlsc.html @@ -148,10 +148,10 @@ connection without using close_notify. This is the default.
  • -k servername : use Server Name Indication, and send servername. The default is not to use SNI, which may be a security risk.
    • -
  • -K kimeout : close the connection -if kimeout milliseconds elapse without any data being -received from either side. The default is 0, which means -infinite timeout (never kill the connection).
    • +
  • -K kimeout : close the connection if +the handshake takes more than kimeout milliseconds to complete. +The default is 0, which means infinite timeout: let the handshake complete +at its own pace, no matter how slow.
  • -6 fdr : expect an open file descriptor numbered fdr to read network (ciphertext) data from. Make sure prog also reads its data diff --git a/doc/s6-ucspitlsd.html b/doc/s6-ucspitlsd.html index 51372e2..7d7ef9b 100644 --- a/doc/s6-ucspitlsd.html +++ b/doc/s6-ucspitlsd.html @@ -146,10 +146,10 @@ connection without using close_notify. This is the default.
  • -y : Require a mandatory client certificate. The default, with neither the -Y nor the -y option, is not to require a client certificate at all.
    • -
  • -K kimeout : close the connection -if kimeout milliseconds elapse without any data being -received from either side. The default is 0, which means -infinite timeout (never kill the connection).
    • +
  • -K kimeout : close the connection if +the handshake takes more than kimeout milliseconds to complete. +The default is 0, which means infinite timeout: let the handshake complete +at its own pace, no matter how slow.

    • Notes

    diff --git a/src/tls/s6-ucspitlsc.c b/src/tls/s6-ucspitlsc.c index c8e2e68..fd5bc86 100644 --- a/src/tls/s6-ucspitlsc.c +++ b/src/tls/s6-ucspitlsc.c @@ -37,6 +37,7 @@ static inline void child (int p[4][2], uint32_t options, unsigned int verbosity, case 'y' : close(p[2][1]) ; p[2][1] = 0 ; /* we know 0 is open so it's a correct invalid value */ + break ; case 'Y' : fd_shutdown(p[2][1], 0) ; break ; diff --git a/src/tls/s6-ucspitlsd.c b/src/tls/s6-ucspitlsd.c index dbabf4e..2ece32f 100644 --- a/src/tls/s6-ucspitlsd.c +++ b/src/tls/s6-ucspitlsd.c @@ -34,6 +34,7 @@ static inline void child (int p[4][2], uint32_t options, unsigned int verbosity, case 'y' : close(p[2][1]) ; p[2][1] = 0 ; /* we know 0 is open so it's a correct invalid value */ + break ; case 'Y' : fd_shutdown(p[2][1], 0) ; break ; -- cgit v1.2.3