aboutsummaryrefslogtreecommitdiffstats
path: root/src/tls
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-08-06 19:43:59 +0000
committerlloyd <[email protected]>2012-08-06 19:43:59 +0000
commite770788128673dd50785005fd1d269d423d241d0 (patch)
tree520e11453dc42182df7e0c30eb121b76c264bbcf /src/tls
parenta6a040f27bb9bb0bbee0371cb06b6975f83afabb (diff)
Wrap lines
Diffstat (limited to 'src/tls')
-rw-r--r--src/tls/msg_client_kex.cpp3
-rw-r--r--src/tls/rec_read.cpp6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/tls/msg_client_kex.cpp b/src/tls/msg_client_kex.cpp
index 8469708d6..22cad4e5c 100644
--- a/src/tls/msg_client_kex.cpp
+++ b/src/tls/msg_client_kex.cpp
@@ -177,7 +177,8 @@ Client_Key_Exchange::Client_Key_Exchange(Handshake_IO& io,
PK_Key_Agreement ka(priv_key, "Raw");
- secure_vector<byte> ecdh_secret = ka.derive_key(0, counterparty_key.public_value()).bits_of();
+ secure_vector<byte> ecdh_secret =
+ ka.derive_key(0, counterparty_key.public_value()).bits_of();
if(kex_algo == "ECDH")
m_pre_master = ecdh_secret;
diff --git a/src/tls/rec_read.cpp b/src/tls/rec_read.cpp
index 5cf395d1a..d57e70f59 100644
--- a/src/tls/rec_read.cpp
+++ b/src/tls/rec_read.cpp
@@ -324,7 +324,11 @@ size_t Record_Reader::add_input(const byte input_array[], size_t input_sz,
// FIXME: avoid memory allocation by processing in place
m_cipher.process_msg(&m_readbuf[TLS_HEADER_SIZE], record_len);
- size_t got_back = m_cipher.read(&m_readbuf[TLS_HEADER_SIZE], record_len, Pipe::LAST_MESSAGE);
+
+ const size_t got_back = m_cipher.read(&m_readbuf[TLS_HEADER_SIZE],
+ record_len,
+ Pipe::LAST_MESSAGE);
+
BOTAN_ASSERT_EQUAL(got_back, record_len, "Cipher encrypted full amount");
BOTAN_ASSERT_EQUAL(m_cipher.remaining(Pipe::LAST_MESSAGE), 0,