summaryrefslogtreecommitdiff
path: root/main/openssl/ssl/s3_pkt.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-09-19 09:43:41 +0200
committerArne Schwabe <arne@rfc2549.org>2014-09-19 09:43:41 +0200
commit535b2ec3a4b34bbe3b5560baf6019a3e34d9c982 (patch)
tree5a71ac766787e3fefc0ec04adad3a040e3c22452 /main/openssl/ssl/s3_pkt.c
parent74304c02f4e6a89a896e0bc4832d9ebb6f2413d6 (diff)
Sync OpenSSL with AOSP
Diffstat (limited to 'main/openssl/ssl/s3_pkt.c')
-rw-r--r--main/openssl/ssl/s3_pkt.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/main/openssl/ssl/s3_pkt.c b/main/openssl/ssl/s3_pkt.c
index 60c4f1a4..df436cf7 100644
--- a/main/openssl/ssl/s3_pkt.c
+++ b/main/openssl/ssl/s3_pkt.c
@@ -632,9 +632,6 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
!s->s3->record_split_done)
{
fragment = 1;
- /* The first byte will be in its own record, so we
- * can write an extra byte. */
- max++;
/* record_split_done records that the splitting has
* been done in case we hit an SSL_WANT_WRITE condition.
* In that case, we don't need to do the split again. */
@@ -650,6 +647,8 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
if (i <= 0)
{
s->s3->wnum=tot;
+ /* Try to write the fragment next time. */
+ s->s3->record_split_done = 0;
return i;
}
@@ -701,7 +700,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
/* if it went, fall through and send more stuff */
}
- if (wb->buf == NULL)
+ if (wb->buf == NULL)
if (!ssl3_setup_write_buffer(s))
return -1;