diff options
Diffstat (limited to 'src/util/base64.cpp')
| -rw-r--r-- | src/util/base64.cpp | 74 |
1 files changed, 32 insertions, 42 deletions
diff --git a/src/util/base64.cpp b/src/util/base64.cpp index 7150913de..c75f98598 100644 --- a/src/util/base64.cpp +++ b/src/util/base64.cpp @@ -28,16 +28,17 @@ René Nyffenegger rene.nyffenegger@adp-gmbh.ch #include "base64.h" #include <iostream> -static const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789+/"; +static const std::string base64_chars = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; -static inline bool is_base64(unsigned char c) -{ + +static inline bool is_base64(unsigned char c) { return (isalnum(c) || (c == '+') || (c == '/')); } -bool base64_is_valid(std::string const &s) +bool base64_is_valid(std::string const& s) { for (char i : s) if (!is_base64(i)) @@ -45,8 +46,7 @@ bool base64_is_valid(std::string const &s) return true; } -std::string base64_encode(unsigned char const *bytes_to_encode, unsigned int in_len) -{ +std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len) { std::string ret; int i = 0; int j = 0; @@ -57,42 +57,40 @@ std::string base64_encode(unsigned char const *bytes_to_encode, unsigned int in_ char_array_3[i++] = *(bytes_to_encode++); if (i == 3) { char_array_4[0] = (char_array_3[0] & 0xfc) >> 2; - char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + - ((char_array_3[1] & 0xf0) >> 4); - char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + - ((char_array_3[2] & 0xc0) >> 6); + char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4); + char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6); char_array_4[3] = char_array_3[2] & 0x3f; - for (i = 0; (i < 4); i++) + for(i = 0; (i <4) ; i++) ret += base64_chars[char_array_4[i]]; i = 0; } } - if (i) { - for (j = i; j < 3; j++) + if (i) + { + for(j = i; j < 3; j++) char_array_3[j] = '\0'; char_array_4[0] = (char_array_3[0] & 0xfc) >> 2; - char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + - ((char_array_3[1] & 0xf0) >> 4); - char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + - ((char_array_3[2] & 0xc0) >> 6); + char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4); + char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6); char_array_4[3] = char_array_3[2] & 0x3f; for (j = 0; (j < i + 1); j++) ret += base64_chars[char_array_4[j]]; - // Don't pad it with = + // Don't pad it with = /*while((i++ < 3)) ret += '=';*/ + } return ret; + } -std::string base64_decode(std::string const &encoded_string) -{ +std::string base64_decode(std::string const& encoded_string) { int in_len = encoded_string.size(); int i = 0; int j = 0; @@ -100,20 +98,15 @@ std::string base64_decode(std::string const &encoded_string) unsigned char char_array_4[4], char_array_3[3]; std::string ret; - while (in_len-- && (encoded_string[in_] != '=') && - is_base64(encoded_string[in_])) { - char_array_4[i++] = encoded_string[in_]; - in_++; - if (i == 4) { - for (i = 0; i < 4; i++) + while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) { + char_array_4[i++] = encoded_string[in_]; in_++; + if (i ==4) { + for (i = 0; i <4; i++) char_array_4[i] = base64_chars.find(char_array_4[i]); - char_array_3[0] = (char_array_4[0] << 2) + - ((char_array_4[1] & 0x30) >> 4); - char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + - ((char_array_4[2] & 0x3c) >> 2); - char_array_3[2] = - ((char_array_4[2] & 0x3) << 6) + char_array_4[3]; + char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4); + char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2); + char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3]; for (i = 0; (i < 3); i++) ret += char_array_3[i]; @@ -122,20 +115,17 @@ std::string base64_decode(std::string const &encoded_string) } if (i) { - for (j = i; j < 4; j++) + for (j = i; j <4; j++) char_array_4[j] = 0; - for (j = 0; j < 4; j++) + for (j = 0; j <4; j++) char_array_4[j] = base64_chars.find(char_array_4[j]); - char_array_3[0] = - (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4); - char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + - ((char_array_4[2] & 0x3c) >> 2); + char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4); + char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2); char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3]; - for (j = 0; (j < i - 1); j++) - ret += char_array_3[j]; + for (j = 0; (j < i - 1); j++) ret += char_array_3[j]; } return ret; |