Upstream openssl to version 1.0.1c

patches/handshake_cutthrough.patch

 diff -uarp openssl-1.0.0.orig/apps/s_client.c openssl-1.0.0/apps/s_client.c
 --- openssl-1.0.0.orig/apps/s_client.c  2009-12-16 15:28:28.000000000 -0500
 +++ openssl-1.0.0/apps/s_client.c       2010-04-21 14:39:49.000000000 -0400
 @@ -248,6 +248,7 @@ static void sc_usage(void)
         BIO_printf(bio_err," -tlsextdebug      - hex dump of all TLS extensions received\n");
         BIO_printf(bio_err," -status           - request certificate status from server\n");
         BIO_printf(bio_err," -no_ticket        - disable use of RFC4507bis session tickets\n");
 +       BIO_printf(bio_err," -cutthrough       - enable 1-RTT full-handshake for strong ciphers\n");
- #endif
-        }
- 
+ # if !defined(OPENSSL_NO_NEXTPROTONEG)
+        BIO_printf(bio_err," -nextprotoneg arg - enable NPN extension, considering named protocols supported (comma-separated list)\n");
+ # endif
 @@ -304,6 +305,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;
 @@ -533,6 +535,8 @@ int MAIN(int argc, char **argv)
                 else if (strcmp(*argv,"-no_ticket") == 0)
@@ skipping 162 matching lines @@
   * you should not need these */
 Only in openssl-1.0.0/ssl: ssl.h.orig
 diff -uarp openssl-1.0.0.orig/ssl/ssl3.h openssl-1.0.0/ssl/ssl3.h
 -- openssl-1.0.0.orig/ssl/ssl3.h        2010-01-06 12:37:38.000000000 -0500
 +++ openssl-1.0.0/ssl/ssl3.h    2010-04-21 14:39:49.000000000 -0400
 @@ -456,6 +456,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)
- /* write to server */
- #define SSL3_ST_CW_CLNT_HELLO_A                (0x110|SSL_ST_CONNECT)
- #define SSL3_ST_CW_CLNT_HELLO_B                (0x111|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 -uarp openssl-1.0.0.orig/ssl/ssl_lib.c openssl-1.0.0/ssl/ssl_lib.c
 --- openssl-1.0.0.orig/ssl/ssl_lib.c    2010-02-17 14:43:46.000000000 -0500
 +++ openssl-1.0.0/ssl/ssl_lib.c 2010-04-21 17:02:45.000000000 -0400
 @@ -3031,6 +3031,19 @@ void SSL_set_msg_callback(SSL *ssl, void
         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 */
@@ skipping 59 matching lines @@
 +++ openssl-1.0.0/test/testssl  2010-04-21 16:50:13.000000000 -0400
 @@ -79,6 +79,8 @@ $ssltest -server_auth -client_auth -s_sm
  echo test sslv2/sslv3 with both client and server authentication and small client and server buffers
  $ssltest -server_auth -client_auth -c_small_records -s_small_records $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