From 29d34cdd24326b200a8fe3b4dc103cd7da0b134e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 6 Jun 2014 12:21:53 +0200
Subject: merge ccs fix

---
 main/openssl/ssl/ssl3.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'main/openssl/ssl/ssl3.h')

diff --git a/main/openssl/ssl/ssl3.h b/main/openssl/ssl/ssl3.h
index 9086db42..f205f73d 100644
--- a/main/openssl/ssl/ssl3.h
+++ b/main/openssl/ssl/ssl3.h
@@ -388,6 +388,10 @@ typedef struct ssl3_buffer_st
 #define TLS1_FLAGS_TLS_PADDING_BUG		0x0008
 #define TLS1_FLAGS_SKIP_CERT_VERIFY		0x0010
 #define TLS1_FLAGS_KEEP_HANDSHAKE		0x0020
+/* SSL3_FLAGS_CCS_OK indicates that a ChangeCipherSpec record is acceptable at
+ * this point in the handshake. If this flag is not set then received CCS
+ * records will cause a fatal error for the connection. */
+#define SSL3_FLAGS_CCS_OK			0x0080
  
 /* SSL3_FLAGS_SGC_RESTART_DONE is set when we
  * restart a handshake because of MS SGC and so prevents us
-- 
cgit v1.2.3