diff options
author | lloyd <[email protected]> | 2012-01-25 13:21:01 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2012-01-25 13:21:01 +0000 |
commit | 10971c4c82970e5fc702b985eef1bf2448f34a58 (patch) | |
tree | ee1dd38146b036575e5c5e8c436541a6bca18afc /src/tls/rec_read.cpp | |
parent | d9f9ef98ec1f554c7d9729f5d97cb4578b84691b (diff) |
Move around the order of arguments to activate() and add the
compression method (currently we just ensure that no compression was
negotiated)
Diffstat (limited to 'src/tls/rec_read.cpp')
-rw-r--r-- | src/tls/rec_read.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tls/rec_read.cpp b/src/tls/rec_read.cpp index 3fd2df33f..c4773d279 100644 --- a/src/tls/rec_read.cpp +++ b/src/tls/rec_read.cpp @@ -65,15 +65,19 @@ void Record_Reader::set_version(Protocol_Version version) /* * Set the keys for reading */ -void Record_Reader::activate(const Ciphersuite& suite, +void Record_Reader::activate(Connection_Side side, + const Ciphersuite& suite, const Session_Keys& keys, - Connection_Side side) + byte compression_method) { m_cipher.reset(); delete m_mac; m_mac = 0; m_seq_no = 0; + if(compression_method != NO_COMPRESSION) + throw Internal_Error("Negotiated unknown compression algorithm"); + SymmetricKey mac_key, cipher_key; InitializationVector iv; |