Modify handshake_patch such that app data is sent along with CCS/Finished.
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 47dd34f..95f7c12 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -186,6 +186,13 @@
s->in_handshake++;
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
+ if (SSL_get_mode(s) & SSL_MODE_HANDSHAKE_CUTTHROUGH)
+ {
+ /* Reneotiation complicates the state machine */
+ s->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
+ /* Send app data along with CCS/Finished */
+ s->s3->flags |= SSL3_FLAGS_DELAY_CLIENT_FINISHED;
+ }
for (;;)
{
@@ -456,7 +463,16 @@
{
if ((SSL_get_mode(s) & SSL_MODE_HANDSHAKE_CUTTHROUGH) && SSL_get_cipher_bits(s, NULL) >= 128)
{
- s->s3->tmp.next_state=SSL3_ST_CUTTHROUGH_COMPLETE;
+ if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED)
+ {
+ s->state=SSL3_ST_CUTTHROUGH_COMPLETE;
+ s->s3->flags|=SSL3_FLAGS_POP_BUFFER;
+ s->s3->delay_buf_pop_ret=0;
+ }
+ else
+ {
+ s->s3->tmp.next_state=SSL3_ST_CUTTHROUGH_COMPLETE;
+ }
}
else
{
@@ -527,9 +543,11 @@
#endif
s->state=SSL3_ST_CR_FINISHED_A;
- /* Allow application writes to go through. Note that SSL3_FLAGS_DELAY_CLIENT_FINISHED
- * is not supported on cutthrough connections (just for simplicity) */
- ssl_free_wbio_buffer(s);
+ /* SSL_write() will take care of flushing buffered data if
+ * DELAY_CLIENT_FINISHED is set.
+ */
+ if (!(s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED))
+ ssl_free_wbio_buffer(s);
ret = 1;
goto end;
/* break; */