diff options
| author | lloyd <[email protected]> | 2012-04-25 13:48:08 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-04-25 13:48:08 +0000 |
| commit | b72a44475d06263e1492f8913310b5f29515cba6 (patch) | |
| tree | 680752dbd43999cea16851b9c196046d9e5fbd7f /src/tls/rec_read.cpp | |
| parent | edca5f211722ea6b9d99b8b5fce4603a1b9b422d (diff) | |
| parent | f14a9fdee7902ba1a4c962cfbabe29d5146e7c55 (diff) | |
propagate from branch 'net.randombit.botan.tls-state-machine' (head a4741cd07f50a9e1b29b0dd97c6fb8697c038ade)
to branch 'net.randombit.botan.cxx11' (head 116e5ff139c07000be431e07d3472cc8f3919b91)
Diffstat (limited to 'src/tls/rec_read.cpp')
| -rw-r--r-- | src/tls/rec_read.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tls/rec_read.cpp b/src/tls/rec_read.cpp index bd6ae5af9..5d46ec1fa 100644 --- a/src/tls/rec_read.cpp +++ b/src/tls/rec_read.cpp @@ -216,10 +216,11 @@ size_t Record_Reader::add_input(const byte input_array[], size_t input_sz, if(m_readbuf[0] != CHANGE_CIPHER_SPEC && m_readbuf[0] != ALERT && m_readbuf[0] != HANDSHAKE && - m_readbuf[0] != APPLICATION_DATA) + m_readbuf[0] != APPLICATION_DATA && + m_readbuf[0] != HEARTBEAT) { throw Unexpected_Message( - "Unknown record type " + std::to_string(m_readbuf[0]) + " from counterparty"); + "Unknown record type " + to_string(m_readbuf[0]) + " from counterparty"); } const size_t record_len = make_u16bit(m_readbuf[3], m_readbuf[4]); |