diff options
author | Jack Lloyd <[email protected]> | 2016-12-11 15:28:38 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2016-12-18 16:48:24 -0500 |
commit | f3cb3edb512bdcab498d825886c3366c341b3f78 (patch) | |
tree | 645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/tls/msg_finished.cpp | |
parent | c1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff) |
Convert to using standard uintN_t integer types
Renames a couple of functions for somewhat better name consistency,
eg make_u32bit becomes make_uint32. The old typedefs remain for now
since probably lots of application code uses them.
Diffstat (limited to 'src/lib/tls/msg_finished.cpp')
-rw-r--r-- | src/lib/tls/msg_finished.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/tls/msg_finished.cpp b/src/lib/tls/msg_finished.cpp index 7d5eea77a..18398e48b 100644 --- a/src/lib/tls/msg_finished.cpp +++ b/src/lib/tls/msg_finished.cpp @@ -17,21 +17,21 @@ namespace { /* * Compute the verify_data */ -std::vector<byte> finished_compute_verify(const Handshake_State& state, +std::vector<uint8_t> finished_compute_verify(const Handshake_State& state, Connection_Side side) { - const byte TLS_CLIENT_LABEL[] = { + const uint8_t TLS_CLIENT_LABEL[] = { 0x63, 0x6C, 0x69, 0x65, 0x6E, 0x74, 0x20, 0x66, 0x69, 0x6E, 0x69, 0x73, 0x68, 0x65, 0x64 }; - const byte TLS_SERVER_LABEL[] = { + const uint8_t TLS_SERVER_LABEL[] = { 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x20, 0x66, 0x69, 0x6E, 0x69, 0x73, 0x68, 0x65, 0x64 }; std::unique_ptr<KDF> prf(state.protocol_specific_prf()); - std::vector<byte> input; - std::vector<byte> label; + std::vector<uint8_t> input; + std::vector<uint8_t> label; if(side == CLIENT) label += std::make_pair(TLS_CLIENT_LABEL, sizeof(TLS_CLIENT_LABEL)); else @@ -57,7 +57,7 @@ Finished::Finished(Handshake_IO& io, /* * Serialize a Finished message */ -std::vector<byte> Finished::serialize() const +std::vector<uint8_t> Finished::serialize() const { return m_verification_data; } @@ -65,7 +65,7 @@ std::vector<byte> Finished::serialize() const /* * Deserialize a Finished message */ -Finished::Finished(const std::vector<byte>& buf) : m_verification_data(buf) +Finished::Finished(const std::vector<uint8_t>& buf) : m_verification_data(buf) {} /* |