From ee914bf036b78dcbde9bf694794c15482d721028 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Sat, 10 Jan 2015 12:26:41 -0500
Subject: Update openssl to version openssl-1.0.1k

Conflicts:
	openssl/Makefile
---
 openssl/ssl/s3_both.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'openssl/ssl/s3_both.c')

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;
-- 
cgit v1.2.3