From af47789ef2276fdb3b081955025b778d16ed2188 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 9 Jun 2012 18:58:54 +0100 Subject: [tls] Mark security negotiation as a pending operation Signed-off-by: Michael Brown --- src/net/tls.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/net/tls.c') diff --git a/src/net/tls.c b/src/net/tls.c index 97e013d7b..8d6620d3f 100644 --- a/src/net/tls.c +++ b/src/net/tls.c @@ -31,6 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include #include #include +#include #include #include #include @@ -101,7 +102,8 @@ static void tls_set_uint24 ( uint8_t field24[3], unsigned long value ) { * @ret is_ready TLS session is ready */ static int tls_ready ( struct tls_session *tls ) { - return ( tls->client_finished && tls->server_finished ); + return ( ( ! is_pending ( &tls->client_negotiation ) ) && + ( ! is_pending ( &tls->server_negotiation ) ) ); } /****************************************************************************** @@ -205,6 +207,10 @@ static void free_tls ( struct refcnt *refcnt ) { */ static void tls_close ( struct tls_session *tls, int rc ) { + /* Remove pending operations, if applicable */ + pending_put ( &tls->client_negotiation ); + pending_put ( &tls->server_negotiation ); + /* Remove process */ process_del ( &tls->process ); @@ -1141,7 +1147,7 @@ static int tls_send_finished ( struct tls_session *tls ) { return rc; /* Mark client as finished */ - tls->client_finished = 1; + pending_put ( &tls->client_negotiation ); return 0; } @@ -1489,7 +1495,7 @@ static int tls_new_finished ( struct tls_session *tls, } /* Mark server as finished */ - tls->server_finished = 1; + pending_put ( &tls->server_negotiation ); /* Send notification of a window change */ xfer_window_changed ( &tls->plainstream ); @@ -2396,6 +2402,10 @@ int add_tls ( struct interface *xfer, const char *name, tls->handshake_ctx = tls->handshake_sha256_ctx; tls->tx_pending = TLS_TX_CLIENT_HELLO; + /* Add pending operations for server and client Finished messages */ + pending_get ( &tls->client_negotiation ); + pending_get ( &tls->server_negotiation ); + /* Attach to parent interface, mortalise self, and return */ intf_plug_plug ( &tls->plainstream, xfer ); *next = &tls->cipherstream; -- cgit v1.2.3-55-g7522