aboutsummaryrefslogtreecommitdiff
path: root/openssl/ssl/s3_both.c
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-01-10 12:26:41 -0500
committerMike DePaulo <mikedep333@gmail.com>2015-01-10 13:07:24 -0500
commit4668cbfa14460fbead98ec3a904a58df1f41c4c3 (patch)
tree72b1fec2e5bfb8ea8ffad514d923c65e9ef38135 /openssl/ssl/s3_both.c
parent15915c262c1334282d0ab2a3fdb2c416e91b51cf (diff)
downloadvcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.tar.gz
vcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.tar.bz2
vcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.zip
Update openssl to version openssl-1.0.1k
Conflicts: openssl/Makefile
Diffstat (limited to 'openssl/ssl/s3_both.c')
-rw-r--r--openssl/ssl/s3_both.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/openssl/ssl/s3_both.c b/openssl/ssl/s3_both.c
index 53b9390fd..3581fbf4f 100644
--- a/openssl/ssl/s3_both.c
+++ b/openssl/ssl/s3_both.c
@@ -439,6 +439,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
goto f_err;
}
*ok=1;
+ s->state = stn;
s->init_msg = s->init_buf->data + 4;
s->init_num = (int)s->s3->tmp.message_size;
return s->init_num;