DO NOT MERGE
Re-enable SSL's cut-through feature in Froyo.
It was pulled because of b/2586347 but it turns out to be a problem in
the tests. The tests are fixed in Change Id8472487 of Froyo, and the feature
is re-enabled here.
Dr. No approved in http://b/issue?id=2511073 .
Change-Id: I85e73737b2f584376c1b8608f98bcd421cc4dc0d
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 15650da..0ba658e 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2752,7 +2752,17 @@
SSL_callback_ctrl(ssl, SSL_CTRL_SET_MSG_CALLBACK, (void (*)(void))cb);
}
-
+int SSL_cutthrough_complete(const SSL *s)
+ {
+ return (!s->server && /* cutthrough only applies to clients */
+ !s->hit && /* full-handshake */
+ s->version >= SSL3_VERSION &&
+ s->s3->in_read_app_data == 0 && /* cutthrough only applies to write() */
+ (SSL_get_mode((SSL*)s) & SSL_MODE_HANDSHAKE_CUTTHROUGH) && /* cutthrough enabled */
+ SSL_get_cipher_bits(s, NULL) >= 128 && /* strong cipher choosen */
+ (s->state == SSL3_ST_CR_SESSION_TICKET_A || /* ready to write app-data*/
+ s->state == SSL3_ST_CR_FINISHED_A));
+ }
#if defined(_WINDLL) && defined(OPENSSL_SYS_WIN16)
#include "../crypto/bio/bss_file.c"