aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/tls/msg_client_hello.cpp
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-01-04 08:48:00 -0500
committerJack Lloyd <[email protected]>2018-01-21 12:56:05 -0500
commit08b7ca1d35c0e4d06695e8744708ae6cf3f5af7a (patch)
treeed1b527302608854d98a689a21d7250cb8b043ae /src/lib/tls/msg_client_hello.cpp
parent65f375348c0773af6e9bbe3a005aef177dfd4ac3 (diff)
Remove vestigial support for TLS compression
It was never supported and never will be. Removing negotiation entirely simplifies the code a bit.
Diffstat (limited to 'src/lib/tls/msg_client_hello.cpp')
-rw-r--r--src/lib/tls/msg_client_hello.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/tls/msg_client_hello.cpp b/src/lib/tls/msg_client_hello.cpp
index cde2b737a..eeeaf8c71 100644
--- a/src/lib/tls/msg_client_hello.cpp
+++ b/src/lib/tls/msg_client_hello.cpp
@@ -88,7 +88,7 @@ Client_Hello::Client_Hello(Handshake_IO& io,
m_version(client_settings.protocol_version()),
m_random(make_hello_random(rng, policy)),
m_suites(policy.ciphersuite_list(m_version, !client_settings.srp_identifier().empty())),
- m_comp_methods(policy.compression())
+ m_comp_methods(1)
{
BOTAN_ASSERT(policy.acceptable_protocol_version(client_settings.protocol_version()),
"Our policy accepts the version we are offering");
@@ -160,14 +160,11 @@ Client_Hello::Client_Hello(Handshake_IO& io,
m_session_id(session.session_id()),
m_random(make_hello_random(rng, policy)),
m_suites(policy.ciphersuite_list(m_version, (session.srp_identifier() != ""))),
- m_comp_methods(policy.compression())
+ m_comp_methods(1)
{
if(!value_exists(m_suites, session.ciphersuite_code()))
m_suites.push_back(session.ciphersuite_code());
- if(!value_exists(m_comp_methods, session.compression_method()))
- m_comp_methods.push_back(session.compression_method());
-
/*
We always add the EMS extension, even if not used in the original session.
If the server understands it and follows the RFC it should reject our resume