From a1aa52709d3c53d1664e282da9d9833869ffcf47 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 5 Jun 2014 15:46:24 +0000
Subject: Be selective as to when ChangeCipherSpec messages will be accepted.
 Without this an early ChangeCipherSpec message would result in session keys
 being generated, along with the Finished hash for the handshake, using an
 empty master secret.

For a detailed analysis see:

  https://www.imperialviolet.org/2014/06/05/earlyccs.html

This is a fix for CVE-2014-0224, from OpenSSL.

This issue was reported to OpenSSL by KIKUCHI Masashi. Unfortunately the
recent OpenSSL commit was the first we were made aware of the issue.

ok deraadt@ sthen@
---
 src/lib/libssl/ssl3.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/lib/libssl/ssl3.h')

diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h
index 1d2bc2f5c0..8444ccb57d 100644
--- a/src/lib/libssl/ssl3.h
+++ b/src/lib/libssl/ssl3.h
@@ -370,6 +370,7 @@ 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
+#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-55-g6feb