From f3cb3edb512bdcab498d825886c3366c341b3f78 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Sun, 11 Dec 2016 15:28:38 -0500 Subject: 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. --- src/lib/stream/ofb/ofb.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/stream/ofb/ofb.cpp') diff --git a/src/lib/stream/ofb/ofb.cpp b/src/lib/stream/ofb/ofb.cpp index 0c23188d5..5a2d63dd4 100644 --- a/src/lib/stream/ofb/ofb.cpp +++ b/src/lib/stream/ofb/ofb.cpp @@ -23,7 +23,7 @@ void OFB::clear() m_buf_pos = 0; } -void OFB::key_schedule(const byte key[], size_t key_len) +void OFB::key_schedule(const uint8_t key[], size_t key_len) { m_cipher->set_key(key, key_len); @@ -36,7 +36,7 @@ std::string OFB::name() const return "OFB(" + m_cipher->name() + ")"; } -void OFB::cipher(const byte in[], byte out[], size_t length) +void OFB::cipher(const uint8_t in[], uint8_t out[], size_t length) { while(length >= m_buffer.size() - m_buf_pos) { @@ -51,7 +51,7 @@ void OFB::cipher(const byte in[], byte out[], size_t length) m_buf_pos += length; } -void OFB::set_iv(const byte iv[], size_t iv_len) +void OFB::set_iv(const uint8_t iv[], size_t iv_len) { if(!valid_iv_length(iv_len)) throw Invalid_IV_Length(name(), iv_len); @@ -64,7 +64,7 @@ void OFB::set_iv(const byte iv[], size_t iv_len) } -void OFB::seek(u64bit) +void OFB::seek(uint64_t) { throw Exception("OFB does not support seeking"); } -- cgit v1.2.3