diff options
author | Juraj Somorovsky <[email protected]> | 2016-05-12 23:40:49 +0200 |
---|---|---|
committer | Juraj Somorovsky <[email protected]> | 2016-05-12 23:40:49 +0200 |
commit | 7dd73a96bbea879a6d7107bf4b23a44ba527a134 (patch) | |
tree | 34cfb60fa6f8d8535a3e51cd9ab1dec62fe32596 /src/lib/tls/tls_session.cpp | |
parent | 7c7fcecbe6a94ffaba5752175d8da5e33fbf0d7b (diff) | |
parent | 8578e0fc758b81d176d0c5092417f4cc77676895 (diff) |
Merge branch 'master' into Encrypt-then-MAC-with-policy
Merged recent changes and resolved minor conflicts in tls record classes.
Diffstat (limited to 'src/lib/tls/tls_session.cpp')
-rw-r--r-- | src/lib/tls/tls_session.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/tls/tls_session.cpp b/src/lib/tls/tls_session.cpp index c02bbd9ab..d6b52846f 100644 --- a/src/lib/tls/tls_session.cpp +++ b/src/lib/tls/tls_session.cpp @@ -109,11 +109,11 @@ Session::Session(const byte ber[], size_t ber_len) m_version = Protocol_Version(major_version, minor_version); m_start_time = std::chrono::system_clock::from_time_t(start_time); m_connection_side = static_cast<Connection_Side>(side_code); - m_srtp_profile = srtp_profile; + m_srtp_profile = static_cast<u16bit>(srtp_profile); m_server_info = Server_Information(server_hostname.value(), server_service.value(), - server_port); + static_cast<u16bit>(server_port)); m_srp_identifier = srp_identifier_str.value(); @@ -222,4 +222,3 @@ Session Session::decrypt(const byte in[], size_t in_len, const SymmetricKey& key } } - |