Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

make_change_chiper_spec() removed as this message can simply be created using make_message()

Browse Source
This commit is contained in:
Simon Rozman 2016-08-17 09:09:42 +02:00
parent cabae26e0b
commit 078636eb14
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/TLS/include/Method.h
View File

@ -248,15 +248,6 @@ namespace eap
/// ///
sanitizing_blob make_client_key_exchange(_In_ const tls_master_secret &pms) const; sanitizing_blob make_client_key_exchange(_In_ const tls_master_secret &pms) const;
///
/// Makes a TLS change cipher spec message
///
/// \sa [The Transport Layer Security (TLS) Protocol Version 1.2 (Chapter A.1. Record Layer)](https://tools.ietf.org/html/rfc5246#appendix-A.1)
///
/// \returns Change cipher spec
///
eap::sanitizing_blob make_change_chiper_spec() const;
/// ///
/// Makes a TLS finished message /// Makes a TLS finished message
/// ///

16
lib/TLS/src/Method.cpp
View File

@ -384,7 +384,7 @@ void eap::method_tls::process_request_packet(
} }
// Append change cipher spec to packet. // Append change cipher spec to packet.
sanitizing_blob ccs(make_change_chiper_spec()); sanitizing_blob ccs(make_message(tls_message_type_change_cipher_spec, sanitizing_blob(1, 1)));
m_packet_res.m_data.insert(m_packet_res.m_data.end(), ccs.begin(), ccs.end()); m_packet_res.m_data.insert(m_packet_res.m_data.end(), ccs.begin(), ccs.end());
{ {
@ -707,20 +707,6 @@ eap::sanitizing_blob eap::method_tls::make_client_key_exchange(_In_ const tls_ma
} }
eap::sanitizing_blob eap::method_tls::make_change_chiper_spec() const
{
const unsigned char msg_css[] = {
tls_message_type_change_cipher_spec, // SSL record type
m_tls_version.major, // SSL major version
m_tls_version.minor, // SSL minor version
0, // Message size (high-order byte)
1, // Message size (low-order byte)
1, // Message: change_cipher_spec is always "1"
};
return sanitizing_blob(msg_css, msg_css + _countof(msg_css));
}
eap::sanitizing_blob eap::method_tls::make_finished() const eap::sanitizing_blob eap::method_tls::make_finished() const
{ {
sanitizing_blob msg; sanitizing_blob msg;