Restore the x509_hash_name_alpgorithm_change patch.

patches/handshake_cutthrough.patch

-commit 15a86b921a7eaa190a22a0a369e4e99beb91f5ad
-Author: Adam Langley <agl@chromium.org>
-Date:   Mon Mar 26 17:43:29 2012 -0400
-
-    handshake_cutthrough
-
-diff --git a/apps/s_client.c b/apps/s_client.c
-index 098cce2..0e10766 100644
---- a/apps/s_client.c
-+++ b/apps/s_client.c
-@@ -361,6 +361,7 @@ static void sc_usage(void)
-        BIO_printf(bio_err," -nextprotoneg arg - enable NPN extension, considering named protocols supported (comma-separated list)\n");
- # endif
- #endif
-+       BIO_printf(bio_err," -cutthrough       - enable 1-RTT full-handshake for strong ciphers\n");
-        BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
-        BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
-        BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
-@@ -573,6 +574,7 @@ int MAIN(int argc, char **argv)
-        EVP_PKEY *key = NULL;
-        char *CApath=NULL,*CAfile=NULL,*cipher=NULL;
-        int reconnect=0,badop=0,verify=SSL_VERIFY_NONE,bugs=0;
-+       int cutthrough=0;
-        int crlf=0;
-        int write_tty,read_tty,write_ssl,read_ssl,tty_on,ssl_pending;
-        SSL_CTX *ctx=NULL;
-@@ -885,6 +887,8 @@ int MAIN(int argc, char **argv)
-                        }
- # endif
- #endif
-+               else if (strcmp(*argv,"-cutthrough") == 0)
-+                       cutthrough=1;
-                else if (strcmp(*argv,"-serverpref") == 0)
-                        off|=SSL_OP_CIPHER_SERVER_PREFERENCE;
-                else if (strcmp(*argv,"-legacy_renegotiation") == 0)
-@@ -1156,6 +1160,15 @@ bad:
-                SSL_CTX_set_next_proto_select_cb(ctx, next_proto_cb, &next_proto);
- #endif
- 
-+       /* Enable handshake cutthrough for client connections using
-+        * strong ciphers. */
-+       if (cutthrough)
-+               {
-+               int ssl_mode = SSL_CTX_get_mode(ctx);
-+               ssl_mode |= SSL_MODE_HANDSHAKE_CUTTHROUGH;
-+               SSL_CTX_set_mode(ctx, ssl_mode);
-+               }
-+
-        if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
-        if (cipher != NULL)
-                if(!SSL_CTX_set_cipher_list(ctx,cipher)) {
-diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
-index 4511a91..d2ecc3e 100644
---- a/ssl/s3_clnt.c
-+++ b/ssl/s3_clnt.c
-@@ -215,6 +215,24 @@ int ssl3_connect(SSL *s)
-                }
- #endif
- 
-+// BEGIN android-added
-+#if 0
-+/* Send app data in separate packet, otherwise, some particular site
-+ * (only one site so far) closes the socket. http://b/2511073
-+ * Note: there is a very small chance that two TCP packets
-+ * could be arriving at server combined into a single TCP packet,
-+ * then trigger that site to break. We haven't encounter that though.
-+ */
-+// END android-added
-+       if (SSL_get_mode(s) & SSL_MODE_HANDSHAKE_CUTTHROUGH)
-+               {
-+               /* Send app data along with CCS/Finished */
-+               s->s3->flags |= SSL3_FLAGS_DELAY_CLIENT_FINISHED;
-+               }
-+
-+// BEGIN android-added
-+#endif
-+// END android-added
-        for (;;)
-                {
-                state=s->state;
-@@ -527,14 +533,31 @@ int ssl3_connect(SSL *s)
-                                }
-                        else
-                                {
--#ifndef OPENSSL_NO_TLSEXT
--                               /* Allow NewSessionTicket if ticket expected */
--                               if (s->tlsext_ticket_expected)
--                                       s->s3->tmp.next_state=SSL3_ST_CR_SESSION_TICKET_A;
-+                               if ((SSL_get_mode(s) & SSL_MODE_HANDSHAKE_CUTTHROUGH) && SSL_get_cipher_bits(s, NULL) >= 128
-+                                   && s->s3->previous_server_finished_len == 0 /* no cutthrough on renegotiation (would complicate the state machine) */
-+                                  )
-+                                       {
-+                                       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
-+                                       {
-+#ifndef OPENSSL_NO_TLSEXT
-+                                       /* Allow NewSessionTicket if ticket expected */
-+                                       if (s->tlsext_ticket_expected)
-+                                               s->s3->tmp.next_state=SSL3_ST_CR_SESSION_TICKET_A;
-+                                       else
- #endif
--                               
--                               s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
-+                                               s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
-+                                       }
-                                }
-                        s->init_num=0;
-                        break;
-@@ -582,6 +605,24 @@ int ssl3_connect(SSL *s)
-                        s->state=s->s3->tmp.next_state;
-                        break;
- 
-+               case SSL3_ST_CUTTHROUGH_COMPLETE:
-+#ifndef OPENSSL_NO_TLSEXT
-+                       /* Allow NewSessionTicket if ticket expected */
-+                       if (s->tlsext_ticket_expected)
-+                               s->state=SSL3_ST_CR_SESSION_TICKET_A;
-+                       else
-+#endif
-+                               s->state=SSL3_ST_CR_FINISHED_A;
-+
-+                       /* 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; */
-+
-                case SSL_ST_OK:
-                        /* clean a few things up */
-                        ssl3_cleanup_key_block(s);
-diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
-index db75479..a2ea25a 100644
---- a/ssl/s3_lib.c
-+++ b/ssl/s3_lib.c
-@@ -4199,9 +4199,22 @@ int ssl3_write(SSL *s, const void *buf, int len)
- 
- static int ssl3_read_internal(SSL *s, void *buf, int len, int peek)
-        {
--       int ret;
-+       int n,ret;
-        
-        clear_sys_error();
-+       if ((s->s3->flags & SSL3_FLAGS_POP_BUFFER) && (s->wbio == s->bbio))
-+               {
-+               /* Deal with an application that calls SSL_read() when handshake data
-+                * is yet to be written.
-+                */
-+               if (BIO_wpending(s->wbio) > 0)
-+                       {
-+                       s->rwstate=SSL_WRITING;
-+                       n=BIO_flush(s->wbio);
-+                       if (n <= 0) return(n);
-+                       s->rwstate=SSL_NOTHING;
-+                       }
-+               }
-        if (s->s3->renegotiate) ssl3_renegotiate_check(s);
-        s->s3->in_read_app_data=1;
-        ret=s->method->ssl_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
-diff --git a/ssl/ssl.h b/ssl/ssl.h
-index 72ed766..ceaf647 100644
---- a/ssl/ssl.h
-+++ b/ssl/ssl.h
-@@ -638,6 +638,10 @@ struct ssl_session_st
-  * TLS only.)  "Released" buffers are put onto a free-list in the context
-  * or just freed (depending on the context's setting for freelist_max_len). */
- #define SSL_MODE_RELEASE_BUFFERS 0x00000010L
-+/* When set, clients may send application data before receipt of CCS
-+ * and Finished.  This mode enables full-handshakes to 'complete' in
-+ * one RTT. */
-+#define SSL_MODE_HANDSHAKE_CUTTHROUGH 0x00000020L
- 
- /* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
-  * they cannot be used to clear bits. */
-@@ -1410,10 +1414,12 @@ extern "C" {
- /* Is the SSL_connection established? */
- #define SSL_get_state(a)               SSL_state(a)
- #define SSL_is_init_finished(a)                (SSL_state(a) == SSL_ST_OK)
--#define SSL_in_init(a)                 (SSL_state(a)&SSL_ST_INIT)
-+#define SSL_in_init(a)                 ((SSL_state(a)&SSL_ST_INIT) && \
-+                                       !SSL_cutthrough_complete(a))
- #define SSL_in_before(a)               (SSL_state(a)&SSL_ST_BEFORE)
- #define SSL_in_connect_init(a)         (SSL_state(a)&SSL_ST_CONNECT)
- #define SSL_in_accept_init(a)          (SSL_state(a)&SSL_ST_ACCEPT)
-+int SSL_cutthrough_complete(const SSL *s);
- 
- /* The following 2 states are kept in ssl->rstate when reads fail,
-  * you should not need these */
-diff --git a/ssl/ssl3.h b/ssl/ssl3.h
-index 112e627..556ffc1 100644
---- a/ssl/ssl3.h
-+++ b/ssl/ssl3.h
-@@ -547,6 +547,7 @@ typedef struct ssl3_state_st
- /*client */
- /* extra state */
- #define SSL3_ST_CW_FLUSH               (0x100|SSL_ST_CONNECT)
-+#define SSL3_ST_CUTTHROUGH_COMPLETE    (0x101|SSL_ST_CONNECT)
- #ifndef OPENSSL_NO_SCTP
- #define DTLS1_SCTP_ST_CW_WRITE_SOCK                    (0x310|SSL_ST_CONNECT)
- #define DTLS1_SCTP_ST_CR_READ_SOCK                     (0x320|SSL_ST_CONNECT)
-diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
-index f82d071..518f152 100644
---- a/ssl/ssl_lib.c
-+++ b/ssl/ssl_lib.c
-@@ -3211,6 +3211,19 @@ void SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, int con
-        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->s3->previous_server_finished_len == 0 &&                 /* not a renegotiation handshake */
-+               (s->state == SSL3_ST_CR_SESSION_TICKET_A ||                 /* ready to write app-data*/
-+                       s->state == SSL3_ST_CR_FINISHED_A));
-+       }
-+
- /* Allocates new EVP_MD_CTX and sets pointer to it into given pointer
-  * vairable, freeing  EVP_MD_CTX previously stored in that variable, if
-  * any. If EVP_MD pointer is passed, initializes ctx with this md
-diff --git a/ssl/ssltest.c b/ssl/ssltest.c
-index 0f8fd39..02ce4ec 100644
---- a/ssl/ssltest.c
-+++ b/ssl/ssltest.c
-@@ -369,6 +369,7 @@ static void sv_usage(void)
-                       "                 (default is sect163r2).\n");
- #endif
-        fprintf(stderr," -test_cipherlist - verifies the order of the ssl cipher lists\n");
-+       fprintf(stderr," -cutthrough      - enable 1-RTT full-handshake for strong ciphers\n");
-        }
- 
- static void print_details(SSL *c_ssl, const char *prefix)
-@@ -549,6 +550,7 @@ int main(int argc, char *argv[])
- #ifdef OPENSSL_FIPS
-        int fips_mode=0;
- #endif
-+       int cutthrough = 0;
- 
-        verbose = 0;
-        debug = 0;
-@@ -765,6 +767,10 @@ int main(int argc, char *argv[])
-                        {
-                        test_cipherlist = 1;
-                        }
-+               else if (strcmp(*argv, "-cutthrough") == 0)
-+                       {
-+                       cutthrough = 1;
-+                       }
-                else
-                        {
-                        fprintf(stderr,"unknown option %s\n",*argv);
-@@ -900,6 +906,12 @@ bad:
-                SSL_CTX_set_cipher_list(c_ctx,cipher);
-                SSL_CTX_set_cipher_list(s_ctx,cipher);
-                }
-+       if (cutthrough)
-+               {
-+               int ssl_mode = SSL_CTX_get_mode(c_ctx);
-+               ssl_mode |= SSL_MODE_HANDSHAKE_CUTTHROUGH;
-+               SSL_CTX_set_mode(c_ctx, ssl_mode);
-+               }
- 
- #ifndef OPENSSL_NO_DH
-        if (!no_dhe)
-diff --git a/test/testssl b/test/testssl
-index 5ae4dc8..5dfeeeb 100644
---- a/test/testssl
-+++ b/test/testssl
-@@ -70,6 +70,9 @@ $ssltest -client_auth $CA $extra || exit 1
- echo test sslv2/sslv3 with both client and server authentication
- $ssltest -server_auth -client_auth $CA $extra || exit 1
- 
-+echo test sslv2/sslv3 with both client and server authentication and handshake cutthrough
-+$ssltest -server_auth -client_auth -cutthrough $CA $extra || exit 1
-+
- echo test sslv2 via BIO pair
- $ssltest -bio_pair -ssl2 $extra || exit 1
-