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_cert_status.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_cert_status.cpp')
-rw-r--r-- | src/lib/tls/msg_cert_status.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/tls/msg_cert_status.cpp b/src/lib/tls/msg_cert_status.cpp index f28fe10d2..bd982f506 100644 --- a/src/lib/tls/msg_cert_status.cpp +++ b/src/lib/tls/msg_cert_status.cpp @@ -16,7 +16,7 @@ namespace Botan { namespace TLS { -Certificate_Status::Certificate_Status(const std::vector<byte>& buf) +Certificate_Status::Certificate_Status(const std::vector<uint8_t>& buf) { if(buf.size() < 5) throw Decoding_Error("Invalid Certificate_Status message: too small"); @@ -24,7 +24,7 @@ Certificate_Status::Certificate_Status(const std::vector<byte>& buf) if(buf[0] != 1) throw Decoding_Error("Unexpected Certificate_Status message: unexpected message type"); - size_t len = make_u32bit(0, buf[1], buf[2], buf[3]); + size_t len = make_uint32(0, buf[1], buf[2], buf[3]); // Verify the redundant length field... if(buf.size() != len + 4) @@ -41,17 +41,17 @@ Certificate_Status::Certificate_Status(Handshake_IO& io, hash.update(io.send(*this)); } -std::vector<byte> Certificate_Status::serialize() const +std::vector<uint8_t> Certificate_Status::serialize() const { BOTAN_ASSERT_NONNULL(m_response); - const std::vector<byte>& m_resp_bits = m_response->raw_bits(); + const std::vector<uint8_t>& m_resp_bits = m_response->raw_bits(); if(m_resp_bits.size() > 0xFFFFFF) // unlikely throw Encoding_Error("OCSP response too long to encode in TLS"); - const uint32_t m_resp_bits_len = static_cast<u32bit>(m_resp_bits.size()); + const uint32_t m_resp_bits_len = static_cast<uint32_t>(m_resp_bits.size()); - std::vector<byte> buf; + std::vector<uint8_t> buf; buf.push_back(1); // type OCSP for(size_t i = 1; i < 4; ++i) buf[i] = get_byte(i, m_resp_bits_len); |