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_hello_verify.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_hello_verify.cpp')
| -rw-r--r-- | src/lib/tls/msg_hello_verify.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/tls/msg_hello_verify.cpp b/src/lib/tls/msg_hello_verify.cpp index 059d9d4fd..34b7bb3d5 100644 --- a/src/lib/tls/msg_hello_verify.cpp +++ b/src/lib/tls/msg_hello_verify.cpp @@ -12,7 +12,7 @@ namespace Botan { namespace TLS { -Hello_Verify_Request::Hello_Verify_Request(const std::vector<byte>& buf) +Hello_Verify_Request::Hello_Verify_Request(const std::vector<uint8_t>& buf) { if(buf.size() < 3) throw Decoding_Error("Hello verify request too small"); @@ -31,7 +31,7 @@ Hello_Verify_Request::Hello_Verify_Request(const std::vector<byte>& buf) m_cookie.assign(buf.begin() + 3, buf.end()); } -Hello_Verify_Request::Hello_Verify_Request(const std::vector<byte>& client_hello_bits, +Hello_Verify_Request::Hello_Verify_Request(const std::vector<uint8_t>& client_hello_bits, const std::string& client_identity, const SymmetricKey& secret_key) { @@ -46,7 +46,7 @@ Hello_Verify_Request::Hello_Verify_Request(const std::vector<byte>& client_hello m_cookie = unlock(hmac->final()); } -std::vector<byte> Hello_Verify_Request::serialize() const +std::vector<uint8_t> Hello_Verify_Request::serialize() const { /* DTLS 1.2 server implementations SHOULD use DTLS version 1.0 regardless of the version of TLS that is expected to be @@ -55,10 +55,10 @@ std::vector<byte> Hello_Verify_Request::serialize() const Protocol_Version format_version(Protocol_Version::DTLS_V10); - std::vector<byte> bits; + std::vector<uint8_t> bits; bits.push_back(format_version.major_version()); bits.push_back(format_version.minor_version()); - bits.push_back(static_cast<byte>(m_cookie.size())); + bits.push_back(static_cast<uint8_t>(m_cookie.size())); bits += m_cookie; return bits; } |