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/codec/base64/base64.h | |
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/codec/base64/base64.h')
-rw-r--r-- | src/lib/codec/base64/base64.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/codec/base64/base64.h b/src/lib/codec/base64/base64.h index 92c4dc627..0e78ea3c2 100644 --- a/src/lib/codec/base64/base64.h +++ b/src/lib/codec/base64/base64.h @@ -27,7 +27,7 @@ namespace Botan { * @return number of bytes written to output */ size_t BOTAN_DLL base64_encode(char output[], - const byte input[], + const uint8_t input[], size_t input_length, size_t& input_consumed, bool final_inputs); @@ -38,7 +38,7 @@ size_t BOTAN_DLL base64_encode(char output[], * @param input_length length of input in bytes * @return base64adecimal representation of input */ -std::string BOTAN_DLL base64_encode(const byte input[], +std::string BOTAN_DLL base64_encode(const uint8_t input[], size_t input_length); /** @@ -47,7 +47,7 @@ std::string BOTAN_DLL base64_encode(const byte input[], * @return base64adecimal representation of input */ template<typename Alloc> -std::string base64_encode(const std::vector<byte, Alloc>& input) +std::string base64_encode(const std::vector<uint8_t, Alloc>& input) { return base64_encode(input.data(), input.size()); } @@ -67,7 +67,7 @@ std::string base64_encode(const std::vector<byte, Alloc>& input) exception if whitespace is encountered * @return number of bytes written to output */ -size_t BOTAN_DLL base64_decode(byte output[], +size_t BOTAN_DLL base64_decode(uint8_t output[], const char input[], size_t input_length, size_t& input_consumed, @@ -83,7 +83,7 @@ size_t BOTAN_DLL base64_decode(byte output[], exception if whitespace is encountered * @return number of bytes written to output */ -size_t BOTAN_DLL base64_decode(byte output[], +size_t BOTAN_DLL base64_decode(uint8_t output[], const char input[], size_t input_length, bool ignore_ws = true); @@ -96,7 +96,7 @@ size_t BOTAN_DLL base64_decode(byte output[], exception if whitespace is encountered * @return number of bytes written to output */ -size_t BOTAN_DLL base64_decode(byte output[], +size_t BOTAN_DLL base64_decode(uint8_t output[], const std::string& input, bool ignore_ws = true); @@ -108,7 +108,7 @@ size_t BOTAN_DLL base64_decode(byte output[], exception if whitespace is encountered * @return decoded base64 output */ -secure_vector<byte> BOTAN_DLL base64_decode(const char input[], +secure_vector<uint8_t> BOTAN_DLL base64_decode(const char input[], size_t input_length, bool ignore_ws = true); @@ -119,7 +119,7 @@ secure_vector<byte> BOTAN_DLL base64_decode(const char input[], exception if whitespace is encountered * @return decoded base64 output */ -secure_vector<byte> BOTAN_DLL base64_decode(const std::string& input, +secure_vector<uint8_t> BOTAN_DLL base64_decode(const std::string& input, bool ignore_ws = true); } |