Upgrade chrome's OpenSSL to same version Android ships with.

openssl/ssl/s3_pkt.c

 /* ssl/s3_pkt.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 102 matching lines @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
 
 static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
                          unsigned int len, int create_empty_fragment);
 static int ssl3_get_record(SSL *s);
 
-/* ssl3_read_snap_start_n reads from the opportunistic records contained within
- * a Snap Start extension. |s->packet| and |s->packet_length| are set to frame
- * a record within this area. Partial records are not allowed. The Snap Start
- * records are held in |s->s3->snap_start_records| and the |left| member must
- * be non-zero on entry.
- *
- * If |extend| is true then we'll expand the currently framed record by |n|
- * bytes, otherwise we frame a new record. */
-static int ssl3_read_snap_start_n(SSL *s, int n, int extend)
-        {
-        if (!extend)
-                {
-                s->packet = s->s3->snap_start_records.buf + s->s3->snap_start_records.offset;
-                s->packet_length = 0;
-                }
-
-        if (s->s3->snap_start_records.left < n)
-                {
-                /* We aren't called unless .left is non-zero, therefore this
-                 * means that we wanted to read more than we have. Since
-                 * partial records aren't allowed, this is fatal. */
-                SSLerr(SSL_F_SSL3_READ_SNAP_START_N,SSL_R_BAD_PACKET_LENGTH);
-                return -1;
-                }
-
-        s->packet_length += n;
-        s->s3->snap_start_records.left -= n;
-        s->s3->snap_start_records.offset += n;
-
-        return n;
-        }
-
 int ssl3_read_n(SSL *s, int n, int max, int extend)
         {
-        if (s->s3->snap_start_records.left)
-                return ssl3_read_snap_start_n(s, n, extend);
-        else if (s->s3->snap_start_client_hello.buf && !extend)
-                {
-                /* If we started reading the opportunistic records then we know
-                 * that we didn't enter recovery. Thus it's safe to free the
-                 * copy of the ClientHello now because we'll not need it again. */
-                OPENSSL_free(s->s3->snap_start_client_hello.buf);
-                s->s3->snap_start_client_hello.buf = NULL;
-                }
-
         /* If extend == 0, obtain new n-byte packet; if extend == 1, increase
          * packet by another n bytes.
          * The packet will be in the sub-array of s->s3->rbuf.buf specified
          * by s->packet and s->packet_length.
          * (If s->read_ahead is set, 'max' bytes may be stored in rbuf
          * [plus s->packet_length bytes if extend == 1].)
          */
-        int i,off,newb;
+        int i,len,left;
+        long align=0;
+        unsigned char *pkt;
+        SSL3_BUFFER *rb;
+
+        if (n <= 0) return n;
+
+        rb    = &(s->s3->rbuf);
+        if (rb->buf == NULL)
+                if (!ssl3_setup_read_buffer(s))
+                        return -1;
+
+        left  = rb->left;
+#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
+        align = (long)rb->buf + SSL3_RT_HEADER_LENGTH;
+        align = (-align)&(SSL3_ALIGN_PAYLOAD-1);
+#endif
 
         if (!extend)
                 {
                 /* start with empty packet ... */
-                if (s->s3->rbuf.left == 0)
-                        s->s3->rbuf.offset = 0;
-                s->packet = s->s3->rbuf.buf + s->s3->rbuf.offset;
+                if (left == 0)
+                        rb->offset = align;
+                else if (align != 0 && left >= SSL3_RT_HEADER_LENGTH)
+                        {
+                        /* check if next packet length is large
+                         * enough to justify payload alignment... */
+                        pkt = rb->buf + rb->offset;
+                        if (pkt[0] == SSL3_RT_APPLICATION_DATA
+                            && (pkt[3]<<8|pkt[4]) >= 128)
+                                {
+                                /* Note that even if packet is corrupted
+                                 * and its length field is insane, we can
+                                 * only be led to wrong decision about
+                                 * whether memmove will occur or not.
+                                 * Header values has no effect on memmove
+                                 * arguments and therefore no buffer
+                                 * overrun can be triggered. */
+                                memmove (rb->buf+align,pkt,left);
+                                rb->offset = align;
+                                }
+                        }
+                s->packet = rb->buf + rb->offset;
                 s->packet_length = 0;
                 /* ... now we can act as if 'extend' was set */
                 }
 
         /* For DTLS/UDP reads should not span multiple packets
          * because the read operation returns the whole packet
          * at once (as long as it fits into the buffer). */
-        if (SSL_version(s) == DTLS1_VERSION)
+        if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
                 {
-                if ( s->s3->rbuf.left > 0 && n > s->s3->rbuf.left)
-                        n = s->s3->rbuf.left;
+                if (left > 0 && n > left)
+                        n = left;
                 }
 
         /* if there is enough in the buffer from a previous read, take some */
-        if (s->s3->rbuf.left >= (int)n)
+        if (left >= n)
                 {
                 s->packet_length+=n;
-                s->s3->rbuf.left-=n;
-                s->s3->rbuf.offset+=n;
+                rb->left=left-n;
+                rb->offset+=n;
                 return(n);
                 }
 
         /* else we need to read more data */
-        if (!s->read_ahead)
-                max=n;
 
-        {
-                /* avoid buffer overflow */
-                int max_max = s->s3->rbuf.len - s->packet_length;
-                if (max > max_max)
-                        max = max_max;
-        }
-        if (n > max) /* does not happen */
+        len = s->packet_length;
+        pkt = rb->buf+align;
+        /* Move any available bytes to front of buffer:
+         * 'len' bytes already pointed to by 'packet',
+         * 'left' extra ones at the end */
+        if (s->packet != pkt) /* len > 0 */
+                {
+                memmove(pkt, s->packet, len+left);
+                s->packet = pkt;
+                rb->offset = len + align;
+                }
+
+        if (n > (int)(rb->len - rb->offset)) /* does not happen */
                 {
                 SSLerr(SSL_F_SSL3_READ_N,ERR_R_INTERNAL_ERROR);
                 return -1;
                 }
 
-        off = s->packet_length;
-        newb = s->s3->rbuf.left;
-        /* Move any available bytes to front of buffer:
-         * 'off' bytes already pointed to by 'packet',
-         * 'newb' extra ones at the end */
-        if (s->packet != s->s3->rbuf.buf)
+        if (!s->read_ahead)
+                /* ignore max parameter */
+                max = n;
+        else
                 {
-                /*  off > 0 */
-                memmove(s->s3->rbuf.buf, s->packet, off+newb);
-                s->packet = s->s3->rbuf.buf;
+                if (max < n)
+                        max = n;
+                if (max > (int)(rb->len - rb->offset))
+                        max = rb->len - rb->offset;
                 }
 
-        while (newb < n)
+        while (left < n)
                 {
-                /* Now we have off+newb bytes at the front of s->s3->rbuf.buf and need
-                 * to read in more until we have off+n (up to off+max if possible) */
+                /* Now we have len+left bytes at the front of s->s3->rbuf.buf
+                 * and need to read in more until we have len+n (up to
+                 * len+max if possible) */
 
                 clear_sys_error();
                 if (s->rbio != NULL)
                         {
                         s->rwstate=SSL_READING;
-                        i=BIO_read(s->rbio,     &(s->s3->rbuf.buf[off+newb]), max-newb);
+                        i=BIO_read(s->rbio,pkt+len+left, max-left);
                         }
                 else
                         {
                         SSLerr(SSL_F_SSL3_READ_N,SSL_R_READ_BIO_NOT_SET);
                         i = -1;
                         }
 
                 if (i <= 0)
                         {
-                        s->s3->rbuf.left = newb;
+                        rb->left = left;
+                        if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
+                            SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)
+                                if (len+left == 0)
+                                        ssl3_release_read_buffer(s);
                         return(i);
                         }
-                newb+=i;
+                left+=i;
                 /* reads should *never* span multiple packets for DTLS because
                  * the underlying transport protocol is message oriented as opposed
                  * to byte oriented as in the TLS case. */
-                if (SSL_version(s) == DTLS1_VERSION)
+                if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
                         {
-                        if (n > newb)
-                                n = newb; /* makes the while condition false */
+                        if (n > left)
+                                n = left; /* makes the while condition false */
                         }
                 }
 
         /* done reading, now the book-keeping */
-        s->s3->rbuf.offset = off + n;
-        s->s3->rbuf.left = newb - n;
+        rb->offset += n;
+        rb->left = left - n;
         s->packet_length += n;
         s->rwstate=SSL_NOTHING;
         return(n);
         }
 
 /* Call this to get a new input record.
  * It will return <= 0 if more data is needed, normally due to an error
  * or non-blocking IO.
  * When it finishes, one packet has been decoded and can be found in
  * ssl->s3->rrec.type    - is the type of record
  * ssl->s3->rrec.data,   - data
  * ssl->s3->rrec.length, - number of bytes
  */
 /* used only by ssl3_read_bytes */
 static int ssl3_get_record(SSL *s)
         {
         int ssl_major,ssl_minor,al;
         int enc_err,n,i,ret= -1;
         SSL3_RECORD *rr;
         SSL_SESSION *sess;
         unsigned char *p;
         unsigned char md[EVP_MAX_MD_SIZE];
         short version;
-        unsigned int mac_size;
+        int mac_size;
         int clear=0;
         size_t extra;
         int decryption_failed_or_bad_record_mac = 0;
         unsigned char *mac = NULL;
+#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
+        long align=SSL3_ALIGN_PAYLOAD;
+#else
+        long align=0;
+#endif
 
         rr= &(s->s3->rrec);
         sess=s->session;
 
         if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER)
                 extra=SSL3_RT_MAX_EXTRA;
         else
                 extra=0;
-        if (extra != s->s3->rbuf.len - SSL3_RT_MAX_PACKET_SIZE)
+        if (!(SSL_get_mode(s) & SSL_MODE_SMALL_BUFFERS) &&
+                extra && !s->s3->init_extra)
                 {
-                /* actually likely an application error: SLS_OP_MICROSOFT_BIG_SSLV3_BUFFER
+                /* An application error: SLS_OP_MICROSOFT_BIG_SSLV3_BUFFER
                  * set after ssl3_setup_buffers() was done */
                 SSLerr(SSL_F_SSL3_GET_RECORD, ERR_R_INTERNAL_ERROR);
                 return -1;
                 }
 
 again:
         /* check if we have the header */
         if (    (s->rstate != SSL_ST_READ_BODY) ||
                 (s->packet_length < SSL3_RT_HEADER_LENGTH)) 
                 {
                 n=ssl3_read_n(s, SSL3_RT_HEADER_LENGTH, s->s3->rbuf.len, 0);
                 if (n <= 0) return(n); /* error or non-blocking */
                 s->rstate=SSL_ST_READ_BODY;
 
                 p=s->packet;
 
                 /* Pull apart the header into the SSL3_RECORD */
                 rr->type= *(p++);
                 ssl_major= *(p++);
                 ssl_minor= *(p++);
                 version=(ssl_major<<8)|ssl_minor;
                 n2s(p,rr->length);
+#if 0
+fprintf(stderr, "Record type=%d, Length=%d\n", rr->type, rr->length);
+#endif
 
                 /* Lets check version */
                 if (!s->first_packet)
                         {
                         if (version != s->version)
                                 {
                                 SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
                                 if ((s->version & 0xFF00) == (version & 0xFF00))
                                         /* Send back error using their minor version number :-) */
                                         s->version = (unsigned short)version;
                                 al=SSL_AD_PROTOCOL_VERSION;
                                 goto f_err;
                                 }
                         }
 
                 if ((version>>8) != SSL3_VERSION_MAJOR)
                         {
                         SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
                         goto err;
                         }
 
-                if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH+extra)
+                /* If we receive a valid record larger than the current buffer size,
+                 * allocate some memory for it.
+                 */
+                if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH - align)
+                        {
+                        if ((p=OPENSSL_realloc(s->s3->rbuf.buf, rr->length + SSL3_RT_HEADER_LENGTH + align))==NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_RECORD,ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        s->s3->rbuf.buf=p;
+                        s->s3->rbuf.len=rr->length + SSL3_RT_HEADER_LENGTH + align;
+                        s->packet= &(s->s3->rbuf.buf[0]);
+                        }
+
+                if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH)
                         {
                         al=SSL_AD_RECORD_OVERFLOW;
                         SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_PACKET_LENGTH_TOO_LONG);
                         goto f_err;
                         }
 
                 /* now s->rstate == SSL_ST_READ_BODY */
                 }
 
         /* s->rstate == SSL_ST_READ_BODY, get and decode the data */
@@ skipping 52 matching lines @@
 
 #ifdef TLS_DEBUG
 printf("dec %d\n",rr->length);
 { unsigned int z; for (z=0; z<rr->length; z++) printf("%02X%c",rr->data[z],((z+1)%16)?' ':'\n'); }
 printf("\n");
 #endif
 
         /* r->length is now the compressed data plus mac */
         if (    (sess == NULL) ||
                 (s->enc_read_ctx == NULL) ||
-                (s->read_hash == NULL))
+                (EVP_MD_CTX_md(s->read_hash) == NULL))
                 clear=1;
 
         if (!clear)
                 {
-                mac_size=EVP_MD_size(s->read_hash);
+                /* !clear => s->read_hash != NULL => mac_size != -1 */
+                mac_size=EVP_MD_CTX_size(s->read_hash);
+                OPENSSL_assert(mac_size >= 0);
 
                 if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH+extra+mac_size)
                         {
 #if 0 /* OK only for stream ciphers (then rr->length is visible from ciphertext anyway) */
                         al=SSL_AD_RECORD_OVERFLOW;
                         SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_PRE_MAC_LENGTH_TOO_LONG);
                         goto f_err;
 #else
                         decryption_failed_or_bad_record_mac = 1;
 #endif                  
                         }
                 /* check the MAC for rr->input (it's in mac_size bytes at the tail) */
-                if (rr->length >= mac_size)
+                if (rr->length >= (unsigned int)mac_size)
                         {
                         rr->length -= mac_size;
                         mac = &rr->data[rr->length];
                         }
                 else
                         {
                         /* record (minus padding) is too short to contain a MAC */
 #if 0 /* OK only for stream ciphers */
                         al=SSL_AD_DECODE_ERROR;
                         SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_LENGTH_TOO_SHORT);
                         goto f_err;
 #else
                         decryption_failed_or_bad_record_mac = 1;
                         rr->length = 0;
 #endif
                         }
                 i=s->method->ssl3_enc->mac(s,md,0);
-                if (mac == NULL || memcmp(md, mac, mac_size) != 0)
+                if (i < 0 || mac == NULL || memcmp(md, mac, (size_t)mac_size) != 0)
                         {
                         decryption_failed_or_bad_record_mac = 1;
                         }
                 }
 
         if (decryption_failed_or_bad_record_mac)
                 {
                 /* A separate 'decryption_failed' alert was introduced with TLS 1.0,
                  * SSL 3.0 only has 'bad_record_mac'.  But unless a decryption
                  * failure is directly visible from the ciphertext anyway,
@@ skipping 36 matching lines @@
          * ssl->s3->rrec.data   == where to take bytes from, increment
          *                         after use :-).
          */
 
         /* we have pulled in a full packet so zero things */
         s->packet_length=0;
 
         /* just read a 0 length packet */
         if (rr->length == 0) goto again;
 
+#if 0
+fprintf(stderr, "Ultimate Record type=%d, Length=%d\n", rr->type, rr->length);
+#endif
+
         return(1);
 
 f_err:
         ssl3_send_alert(s,SSL3_AL_FATAL,al);
 err:
         return(ret);
         }
 
 int ssl3_do_uncompress(SSL *ssl)
         {
@@ skipping 34 matching lines @@
         }
 
 /* Call this to write data in records of type 'type'
  * It will return <= 0 if not all data has been sent or non-blocking IO.
  */
 int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
         {
         const unsigned char *buf=buf_;
         unsigned int tot,n,nw;
         int i;
+        unsigned int max_plain_length;
 
         s->rwstate=SSL_NOTHING;
         tot=s->s3->wnum;
         s->s3->wnum=0;
 
         if (SSL_in_init(s) && !s->in_handshake)
                 {
                 i=s->handshake_func(s);
                 if (i < 0) return(i);
                 if (i == 0)
                         {
                         SSLerr(SSL_F_SSL3_WRITE_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
                         return -1;
                         }
                 }
 
         n=(len-tot);
         for (;;)
                 {
-                if (n > SSL3_RT_MAX_PLAIN_LENGTH)
-                        nw=SSL3_RT_MAX_PLAIN_LENGTH;
+                if (type == SSL3_RT_APPLICATION_DATA && (SSL_get_mode(s) & SSL_MODE_SMALL_BUFFERS))
+                        max_plain_length = SSL3_RT_DEFAULT_PLAIN_LENGTH;
+                else
+                        max_plain_length = s->max_send_fragment;
+
+                if (n > max_plain_length)
+                        nw = max_plain_length;
                 else
                         nw=n;
 
                 i=do_ssl3_write(s, type, &(buf[tot]), nw, 0);
                 if (i <= 0)
                         {
                         s->s3->wnum=tot;
                         return i;
                         }
 
@@ skipping 11 matching lines @@
                 n-=i;
                 tot+=i;
                 }
         }
 
 static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
                          unsigned int len, int create_empty_fragment)
         {
         unsigned char *p,*plen;
         int i,mac_size,clear=0;
-        int prefix_len = 0;
+        int prefix_len=0;
+        long align=0;
         SSL3_RECORD *wr;
-        SSL3_BUFFER *wb;
+        SSL3_BUFFER *wb=&(s->s3->wbuf);
         SSL_SESSION *sess;
 
+        if (wb->buf == NULL)
+                if (!ssl3_setup_write_buffer(s))
+                        return -1;
+
         /* first check if there is a SSL3_BUFFER still being written
          * out.  This will happen with non blocking IO */
-        if (s->s3->wbuf.left != 0)
+        if (wb->left != 0)
                 return(ssl3_write_pending(s,type,buf,len));
 
         /* If we have an alert to send, lets send it */
         if (s->s3->alert_dispatch)
                 {
                 i=s->method->ssl_dispatch_alert(s);
                 if (i <= 0)
                         return(i);
                 /* if it went, fall through and send more stuff */
                 }
 
         if (len == 0 && !create_empty_fragment)
                 return 0;
 
         wr= &(s->s3->wrec);
-        wb= &(s->s3->wbuf);
         sess=s->session;
 
         if (    (sess == NULL) ||
                 (s->enc_write_ctx == NULL) ||
-                (s->write_hash == NULL))
+                (EVP_MD_CTX_md(s->write_hash) == NULL))
                 clear=1;
 
         if (clear)
                 mac_size=0;
         else
-                mac_size=EVP_MD_size(s->write_hash);
+                {
+                mac_size=EVP_MD_CTX_size(s->write_hash);
+                if (mac_size < 0)
+                        goto err;
+                }
 
         /* 'create_empty_fragment' is true only when this function calls itself */
         if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done)
                 {
                 /* countermeasure against known-IV weakness in CBC ciphersuites
                  * (see http://www.openssl.org/~bodo/tls-cbc.txt) */
 
                 if (s->s3->need_empty_fragments && type == SSL3_RT_APPLICATION_DATA)
                         {
                         /* recursive function call with 'create_empty_fragment' set;
                          * this prepares and buffers the data for an empty fragment
                          * (these 'prefix_len' bytes are sent out later
                          * together with the actual payload) */
                         prefix_len = do_ssl3_write(s, type, buf, 0, 1);
                         if (prefix_len <= 0)
                                 goto err;
 
-                        if (s->s3->wbuf.len < (size_t)prefix_len + SSL3_RT_MAX_PACKET_SIZE)
+                        if (prefix_len >
+                (SSL3_RT_HEADER_LENGTH + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD))
                                 {
                                 /* insufficient space */
                                 SSLerr(SSL_F_DO_SSL3_WRITE, ERR_R_INTERNAL_ERROR);
                                 goto err;
                                 }
                         }
                 
                 s->s3->empty_fragment_done = 1;
                 }
 
-        p = wb->buf + prefix_len;
+        /* resize if necessary to hold the data. */
+        if (len + SSL3_RT_DEFAULT_WRITE_OVERHEAD > wb->len)
+                {
+                if ((p=OPENSSL_realloc(wb->buf, len + SSL3_RT_DEFAULT_WRITE_OVERHEAD))==NULL)
+                        {
+                        SSLerr(SSL_F_DO_SSL3_WRITE,ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                wb->buf = p;
+                wb->len = len + SSL3_RT_DEFAULT_WRITE_OVERHEAD;
+                }
+
+        if (create_empty_fragment)
+                {
+#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
+                /* extra fragment would be couple of cipher blocks,
+                 * which would be multiple of SSL3_ALIGN_PAYLOAD, so
+                 * if we want to align the real payload, then we can
+                 * just pretent we simply have two headers. */
+                align = (long)wb->buf + 2*SSL3_RT_HEADER_LENGTH;
+                align = (-align)&(SSL3_ALIGN_PAYLOAD-1);
+#endif
+                p = wb->buf + align;
+                wb->offset  = align;
+                }
+        else if (prefix_len)
+                {
+                p = wb->buf + wb->offset + prefix_len;
+                }
+        else
+                {
+#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
+                align = (long)wb->buf + SSL3_RT_HEADER_LENGTH;
+                align = (-align)&(SSL3_ALIGN_PAYLOAD-1);
+#endif
+                p = wb->buf + align;
+                wb->offset  = align;
+                }
 
         /* write the header */
 
         *(p++)=type&0xff;
         wr->type=type;
 
         *(p++)=(s->version>>8);
         *(p++)=s->version&0xff;
 
         /* field where we are to write out packet length */
@@ skipping 22 matching lines @@
                 memcpy(wr->data,wr->input,wr->length);
                 wr->input=wr->data;
                 }
 
         /* we should still have the output to wr->data and the input
          * from wr->input.  Length should be wr->length.
          * wr->data still points in the wb->buf */
 
         if (mac_size != 0)
                 {
-                s->method->ssl3_enc->mac(s,&(p[wr->length]),1);
+                if (s->method->ssl3_enc->mac(s,&(p[wr->length]),1) < 0)
+                        goto err;
                 wr->length+=mac_size;
                 wr->input=p;
                 wr->data=p;
                 }
 
         /* ssl3_enc can only have an error on read */
         s->method->ssl3_enc->enc(s,1);
 
         /* record length after mac and block padding */
         s2n(wr->length,plen);
 
         /* we should now have
          * wr->data pointing to the encrypted data, which is
          * wr->length long */
         wr->type=type; /* not needed but helps for debugging */
         wr->length+=SSL3_RT_HEADER_LENGTH;
 
         if (create_empty_fragment)
                 {
                 /* we are in a recursive call;
                  * just return the length, don't write out anything here
                  */
                 return wr->length;
                 }
 
         /* now let's set up wb */
         wb->left = prefix_len + wr->length;
-        wb->offset = 0;
 
         /* memorize arguments so that ssl3_write_pending can detect bad write retries later */
         s->s3->wpend_tot=len;
         s->s3->wpend_buf=buf;
         s->s3->wpend_type=type;
         s->s3->wpend_ret=len;
 
         /* we now just need to write the buffer */
         return ssl3_write_pending(s,type,buf,len);
 err:
         return -1;
         }
 
 /* if s->s3->wbuf.left != 0, we need to call this */
 int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
         unsigned int len)
         {
         int i;
+        SSL3_BUFFER *wb=&(s->s3->wbuf);
 
 /* XXXX */
         if ((s->s3->wpend_tot > (int)len)
                 || ((s->s3->wpend_buf != buf) &&
                         !(s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER))
                 || (s->s3->wpend_type != type))
                 {
                 SSLerr(SSL_F_SSL3_WRITE_PENDING,SSL_R_BAD_WRITE_RETRY);
                 return(-1);
                 }
 
         for (;;)
                 {
                 clear_sys_error();
                 if (s->wbio != NULL)
                         {
                         s->rwstate=SSL_WRITING;
                         i=BIO_write(s->wbio,
-                                (char *)&(s->s3->wbuf.buf[s->s3->wbuf.offset]),
-                                (unsigned int)s->s3->wbuf.left);
+                                (char *)&(wb->buf[wb->offset]),
+                                (unsigned int)wb->left);
                         }
                 else
                         {
                         SSLerr(SSL_F_SSL3_WRITE_PENDING,SSL_R_BIO_NOT_SET);
                         i= -1;
                         }
-                if (i == s->s3->wbuf.left)
+                if (i == wb->left)
                         {
-                        s->s3->wbuf.left=0;
+                        wb->left=0;
+                        wb->offset+=i;
+                        if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
+                            SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)
+                                ssl3_release_write_buffer(s);
                         s->rwstate=SSL_NOTHING;
                         return(s->s3->wpend_ret);
                         }
                 else if (i <= 0) {
                         if (s->version == DTLS1_VERSION ||
                             s->version == DTLS1_BAD_VER) {
                                 /* For DTLS, just drop it. That's kind of the whole
                                    point in using a datagram service */
-                                s->s3->wbuf.left = 0;
+                                wb->left = 0;
                         }
                         return(i);
                 }
-                s->s3->wbuf.offset+=i;
-                s->s3->wbuf.left-=i;
+                wb->offset+=i;
+                wb->left-=i;
                 }
         }
 
 /* Return up to 'len' payload bytes received in 'type' records.
  * 'type' is one of the following:
  *
  *   -  SSL3_RT_HANDSHAKE (when ssl3_get_message calls us)
  *   -  SSL3_RT_APPLICATION_DATA (when ssl3_read calls us)
  *   -  0 (during a shutdown, no data has to be returned)
  *
@@ skipping 18 matching lines @@
  *             none of our business
  */
 int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         {
         int al,i,j,ret;
         unsigned int n;
         SSL3_RECORD *rr;
         void (*cb)(const SSL *ssl,int type2,int val)=NULL;
 
         if (s->s3->rbuf.buf == NULL) /* Not initialized yet */
-                if (!ssl3_setup_buffers(s))
+                if (!ssl3_setup_read_buffer(s))
                         return(-1);
 
         if ((type && (type != SSL3_RT_APPLICATION_DATA) && (type != SSL3_RT_HANDSHAKE) && type) ||
             (peek && (type != SSL3_RT_APPLICATION_DATA)))
                 {
                 SSLerr(SSL_F_SSL3_READ_BYTES, ERR_R_INTERNAL_ERROR);
                 return -1;
                 }
 
         if ((type == SSL3_RT_HANDSHAKE) && (s->s3->handshake_fragment_len > 0))
@@ skipping 88 matching lines @@
 
                 memcpy(buf,&(rr->data[rr->off]),n);
                 if (!peek)
                         {
                         rr->length-=n;
                         rr->off+=n;
                         if (rr->length == 0)
                                 {
                                 s->rstate=SSL_ST_READ_HEADER;
                                 rr->off=0;
+                                if (s->mode & SSL_MODE_RELEASE_BUFFERS)
+                                        ssl3_release_read_buffer(s);
                                 }
                         }
                 return(n);
                 }
 
 
         /* If we get here, then type != rr->type; if we have a handshake
          * message, then it was unexpected (Hello Request or Client Hello). */
 
         /* In case of record types for which we have 'fragment' storage,
@@ skipping 324 matching lines @@
 
 f_err:
         ssl3_send_alert(s,SSL3_AL_FATAL,al);
 err:
         return(-1);
         }
 
 int ssl3_do_change_cipher_spec(SSL *s)
         {
         int i;
+#ifdef OPENSSL_NO_NEXTPROTONEG
+        const char *sender;
+        int slen;
+#endif
 
         if (s->state & SSL_ST_ACCEPT)
                 i=SSL3_CHANGE_CIPHER_SERVER_READ;
         else
                 i=SSL3_CHANGE_CIPHER_CLIENT_READ;
 
         if (s->s3->tmp.key_block == NULL)
                 {
                 if (s->session == NULL) 
                         {
                         /* might happen if dtls1_read_bytes() calls this */
                         SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,SSL_R_CCS_RECEIVED_EARLY);
                         return (0);
                         }
 
                 s->session->cipher=s->s3->tmp.new_cipher;
                 if (!s->method->ssl3_enc->setup_key_block(s)) return(0);
                 }
 
         if (!s->method->ssl3_enc->change_cipher_state(s,i))
                 return(0);
 
+#ifdef OPENSSL_NO_NEXTPROTONEG
+        /* we have to record the message digest at
+         * this point so we can get it before we read
+         * the finished message */
+        if (s->state & SSL_ST_CONNECT)
+                {
+                sender=s->method->ssl3_enc->server_finished_label;
+                slen=s->method->ssl3_enc->server_finished_label_len;
+                }
+        else
+                {
+                sender=s->method->ssl3_enc->client_finished_label;
+                slen=s->method->ssl3_enc->client_finished_label_len;
+                }
+
+        s->s3->tmp.peer_finish_md_len = s->method->ssl3_enc->final_finish_mac(s,
+                sender,slen,s->s3->tmp.peer_finish_md);
+#endif
+
         return(1);
         }
 
 int ssl3_send_alert(SSL *s, int level, int desc)
         {
         /* Map tls/ssl alert value to correct one */
         desc=s->method->ssl3_enc->alert_value(desc);
         if (s->version == SSL3_VERSION && desc == SSL_AD_PROTOCOL_VERSION)
                 desc = SSL_AD_HANDSHAKE_FAILURE; /* SSL 3.0 does not have protocol_version alerts */
         if (desc < 0) return -1;
@@ skipping 39 matching lines @@
                         cb=s->ctx->info_callback;
 
                 if (cb != NULL)
                         {
                         j=(s->s3->send_alert[0]<<8)|s->s3->send_alert[1];
                         cb(s,SSL_CB_WRITE_ALERT,j);
                         }
                 }
         return(i);
         }