summaryrefslogtreecommitdiffstats
path: root/ssl/ssl3.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-05-16 12:49:48 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-06-05 09:04:27 +0100
commitbc8923b1ec9c467755cd86f7848c50ee8812e441 (patch)
treec9873db8cc4f63ab3e6af6680d54f21a6074fb14 /ssl/ssl3.h
parent1632ef744872edc2aa2a53d487d3e79c965a4ad3 (diff)
Fix for CVE-2014-0224
Only accept change cipher spec when it is expected instead of at any time. This prevents premature setting of session keys before the master secret is determined which an attacker could use as a MITM attack. Thanks to KIKUCHI Masashi (Lepidum Co. Ltd.) for reporting this issue and providing the initial fix this patch is based on.
Diffstat (limited to 'ssl/ssl3.h')
-rw-r--r--ssl/ssl3.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index cb8b2492ec..37f19e3ab5 100644
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -388,6 +388,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