Abstract away BIO_flush calls in the handshake.
This is the first part to removing the buffer BIO. The eventual end
state is the SSL_PROTOCOL_METHOD is responsible for maintaining one
flight's worth of messages. In TLS, it will just be a buffer containing
the flight's ciphertext. In DTLS, it's the existing structure for
retransmit purposes. There will be hooks:
- add_message (synchronous)
- add_change_cipher_spec (synchronous)
- add_warning_alert (synchronous; needed until we lose SSLv3 client auth
and TLS 1.3 draft 18; draft 19 will switch end_of_early_data to a
handshake message)
- write_flight (BIO; flush_flight will be renamed to this)
This also preserves the exact return value of BIO_flush. Eventually all
the BIO_write calls will be hidden behind BIO_flush to, to be consistent
with other BIO-based calls, preserve the return value.
BUG=72
Change-Id: I74cd23759a17356aab3bb475a8ea42bd2cd115c9
Reviewed-on: https://boringssl-review.googlesource.com/13222
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/dtls_method.c b/ssl/dtls_method.c
index 6576686..702b3c0 100644
--- a/ssl/dtls_method.c
+++ b/ssl/dtls_method.c
@@ -99,6 +99,14 @@
return cipher->algorithm_enc != SSL_eNULL;
}
+static int dtls1_flush_flight(SSL *ssl) {
+ int ret = BIO_flush(ssl->wbio);
+ if (ret <= 0) {
+ ssl->rwstate = SSL_WRITING;
+ }
+ return ret;
+}
+
static void dtls1_expect_flight(SSL *ssl) { dtls1_start_timer(ssl); }
static void dtls1_received_flight(SSL *ssl) { dtls1_stop_timer(ssl); }
@@ -154,6 +162,7 @@
dtls1_queue_message,
dtls1_write_message,
dtls1_send_change_cipher_spec,
+ dtls1_flush_flight,
dtls1_expect_flight,
dtls1_received_flight,
dtls1_set_read_state,
