diff options
| author | lloyd <[email protected]> | 2013-04-10 22:40:48 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2013-04-10 22:40:48 +0000 |
| commit | 55fed6ea14121837e4f4229ae5debe3bcd70893b (patch) | |
| tree | dbfa5dccb1913043c133f9e593011b7df424e601 | |
| parent | 3f9d452f604956e92a78f13e068530235519f84e (diff) | |
Mark Channel IO buffers for zeroing
| -rw-r--r-- | src/tls/tls_channel.h | 4 | ||||
| -rw-r--r-- | src/tls/tls_record.cpp | 6 | ||||
| -rw-r--r-- | src/tls/tls_record.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/tls/tls_channel.h b/src/tls/tls_channel.h index d27f8f2f5..c3c2dc8e2 100644 --- a/src/tls/tls_channel.h +++ b/src/tls/tls_channel.h @@ -217,8 +217,8 @@ class BOTAN_DLL Channel { { 0, nullptr } }; /* I/O buffers */ - std::vector<byte> m_writebuf; - std::vector<byte> m_readbuf; + secure_vector<byte> m_writebuf; + secure_vector<byte> m_readbuf; }; } diff --git a/src/tls/tls_record.cpp b/src/tls/tls_record.cpp index 1db836d16..9581d7eb7 100644 --- a/src/tls/tls_record.cpp +++ b/src/tls/tls_record.cpp @@ -78,7 +78,7 @@ Connection_Cipher_State::Connection_Cipher_State(Protocol_Version version, m_mac->set_key(mac_key); } -void write_record(std::vector<byte>& output, +void write_record(secure_vector<byte>& output, byte msg_type, const byte msg[], size_t msg_length, Protocol_Version version, u64bit msg_sequence, @@ -195,7 +195,7 @@ void write_record(std::vector<byte>& output, namespace { -size_t fill_buffer_to(std::vector<byte>& readbuf, +size_t fill_buffer_to(secure_vector<byte>& readbuf, const byte*& input, size_t& input_size, size_t& input_consumed, @@ -397,7 +397,7 @@ bool decrypt_record(Record& output_record, } -size_t read_record(std::vector<byte>& readbuf, +size_t read_record(secure_vector<byte>& readbuf, const byte input[], size_t input_sz, size_t& consumed, diff --git a/src/tls/tls_record.h b/src/tls/tls_record.h index 76e8e5e69..ce4dec2ad 100644 --- a/src/tls/tls_record.h +++ b/src/tls/tls_record.h @@ -136,7 +136,7 @@ class Record * @param rng is a random number generator * @return number of bytes written to write_buffer */ -void write_record(std::vector<byte>& write_buffer, +void write_record(secure_vector<byte>& write_buffer, byte msg_type, const byte msg[], size_t msg_length, Protocol_Version version, u64bit msg_sequence, @@ -147,7 +147,7 @@ void write_record(std::vector<byte>& write_buffer, * Decode a TLS record * @return zero if full message, else number of bytes still needed */ -size_t read_record(std::vector<byte>& read_buffer, +size_t read_record(secure_vector<byte>& read_buffer, const byte input[], size_t input_length, size_t& input_consumed, |