From 687488572f223f89cf98909e87b4d1a3fbb14bfd Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 11 Jul 2014 15:44:53 +0000
Subject: If the application uses tls_session_secret_cb for session resumption,
 set the CCS_OK flag. From OpenSSL trunk.

---
 src/lib/libssl/s3_clnt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib/libssl/s3_clnt.c')

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 017aaaecba..3596acf1de 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.76 2014/07/11 13:21:15 miod Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.77 2014/07/11 15:44:53 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -849,7 +849,8 @@ ssl3_get_server_hello(SSL *s)
 		    &s->session->master_key_length, NULL, &pref_cipher,
 		    s->tls_session_secret_cb_arg)) {
 			s->session->cipher = pref_cipher ?
-			pref_cipher : ssl_get_cipher_by_char(s, p + j);
+			    pref_cipher : ssl_get_cipher_by_char(s, p + j);
+			s->s3->flags |= SSL3_FLAGS_CCS_OK;
 		}
 	}
 
-- 
cgit v1.2.3-55-g6feb