admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run 'git cl format --full' on Base64.

Browse Source 
# Legal requires us to keep the original license header.
NOPRESUBMIT=true
BUG=None

Review-Url: https://codereview.webrtc.org/2574143002
Cr-Commit-Position: refs/heads/master@{#15609}
This commit is contained in:
johan 2016-12-14 07:15:12 -08:00 committed by Commit bot
parent 9006987243
commit db8af2a953
2 changed files with 114 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
webrtc/base/base64.cc
View File

@ -30,49 +30,47 @@ static const unsigned char sp = 0xFE; // Whitespace
static const unsigned char il = 0xFF; // Illegal base64 character
const char Base64::Base64Table[] =
// 0000000000111111111122222222223333333333444444444455555555556666
// 0123456789012345678901234567890123456789012345678901234567890123
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
// 0000000000111111111122222222223333333333444444444455555555556666
// 0123456789012345678901234567890123456789012345678901234567890123
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
// Decode Table gives the index of any valid base64 character in the
// Base64 table
// 65 == A, 97 == a, 48 == 0, 43 == +, 47 == /
const unsigned char Base64::DecodeTable[] = {
// 0 1 2 3 4 5 6 7 8 9
il,il,il,il,il,il,il,il,il,sp, // 0 - 9
sp,sp,sp,sp,il,il,il,il,il,il, // 10 - 19
il,il,il,il,il,il,il,il,il,il, // 20 - 29
il,il,sp,il,il,il,il,il,il,il, // 30 - 39
il,il,il,62,il,il,il,63,52,53, // 40 - 49
54,55,56,57,58,59,60,61,il,il, // 50 - 59
il,pd,il,il,il, 0, 1, 2, 3, 4, // 60 - 69
5, 6, 7, 8, 9,10,11,12,13,14, // 70 - 79
15,16,17,18,19,20,21,22,23,24, // 80 - 89
25,il,il,il,il,il,il,26,27,28, // 90 - 99
29,30,31,32,33,34,35,36,37,38, // 100 - 109
39,40,41,42,43,44,45,46,47,48, // 110 - 119
49,50,51,il,il,il,il,il,il,il, // 120 - 129
il,il,il,il,il,il,il,il,il,il, // 130 - 139
il,il,il,il,il,il,il,il,il,il, // 140 - 149
il,il,il,il,il,il,il,il,il,il, // 150 - 159
il,il,il,il,il,il,il,il,il,il, // 160 - 169
il,il,il,il,il,il,il,il,il,il, // 170 - 179
il,il,il,il,il,il,il,il,il,il, // 180 - 189
il,il,il,il,il,il,il,il,il,il, // 190 - 199
il,il,il,il,il,il,il,il,il,il, // 200 - 209
il,il,il,il,il,il,il,il,il,il, // 210 - 219
il,il,il,il,il,il,il,il,il,il, // 220 - 229
il,il,il,il,il,il,il,il,il,il, // 230 - 239
il,il,il,il,il,il,il,il,il,il, // 240 - 249
il,il,il,il,il,il // 250 - 255
// 0 1 2 3 4 5 6 7 8 9
il, il, il, il, il, il, il, il, il, sp, // 0 - 9
sp, sp, sp, sp, il, il, il, il, il, il, // 10 - 19
il, il, il, il, il, il, il, il, il, il, // 20 - 29
il, il, sp, il, il, il, il, il, il, il, // 30 - 39
il, il, il, 62, il, il, il, 63, 52, 53, // 40 - 49
54, 55, 56, 57, 58, 59, 60, 61, il, il, // 50 - 59
il, pd, il, il, il, 0, 1, 2, 3, 4, // 60 - 69
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 70 - 79
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, // 80 - 89
25, il, il, il, il, il, il, 26, 27, 28, // 90 - 99
29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // 100 - 109
39, 40, 41, 42, 43, 44, 45, 46, 47, 48, // 110 - 119
49, 50, 51, il, il, il, il, il, il, il, // 120 - 129
il, il, il, il, il, il, il, il, il, il, // 130 - 139
il, il, il, il, il, il, il, il, il, il, // 140 - 149
il, il, il, il, il, il, il, il, il, il, // 150 - 159
il, il, il, il, il, il, il, il, il, il, // 160 - 169
il, il, il, il, il, il, il, il, il, il, // 170 - 179
il, il, il, il, il, il, il, il, il, il, // 180 - 189
il, il, il, il, il, il, il, il, il, il, // 190 - 199
il, il, il, il, il, il, il, il, il, il, // 200 - 209
il, il, il, il, il, il, il, il, il, il, // 210 - 219
il, il, il, il, il, il, il, il, il, il, // 220 - 229
il, il, il, il, il, il, il, il, il, il, // 230 - 239
il, il, il, il, il, il, il, il, il, il, // 240 - 249
il, il, il, il, il, il // 250 - 255
};
bool Base64::IsBase64Char(char ch) {
return (('A' <= ch) && (ch <= 'Z')) ||
(('a' <= ch) && (ch <= 'z')) ||
(('0' <= ch) && (ch <= '9')) ||
(ch == '+') || (ch == '/');
return (('A' <= ch) && (ch <= 'Z')) || (('a' <= ch) && (ch <= 'z')) ||
(('0' <= ch) && (ch <= '9')) || (ch == '+') || (ch == '/');
}
bool Base64::GetNextBase64Char(char ch, char* next_ch) {
@ -95,7 +93,8 @@ bool Base64::IsBase64Encoded(const std::string& str) {
return true;
}
void Base64::EncodeFromArray(const void* data, size_t len,
void Base64::EncodeFromArray(const void* data,
size_t len,
std::string* result) {
RTC_DCHECK(NULL != result);
result->clear();
@ -135,10 +134,13 @@ void Base64::EncodeFromArray(const void* data, size_t len,
}
}
size_t Base64::GetNextQuantum(DecodeFlags parse_flags, bool illegal_pads,
const char* data, size_t len, size_t* dpos,
unsigned char qbuf[4], bool* padded)
{
size_t Base64::GetNextQuantum(DecodeFlags parse_flags,
bool illegal_pads,
const char* data,
size_t len,
size_t* dpos,
unsigned char qbuf[4],
bool* padded) {
size_t byte_len = 0, pad_len = 0, pad_start = 0;
for (; (byte_len < 4) && (*dpos < len); ++*dpos) {
qbuf[byte_len] = DecodeTable[static_cast<unsigned char>(data[*dpos])];
@ -189,14 +191,20 @@ size_t Base64::GetNextQuantum(DecodeFlags parse_flags, bool illegal_pads,
return byte_len;
}
bool Base64::DecodeFromArray(const char* data, size_t len, DecodeFlags flags,
std::string* result, size_t* data_used) {
return DecodeFromArrayTemplate<std::string>(
data, len, flags, result, data_used);
bool Base64::DecodeFromArray(const char* data,
size_t len,
DecodeFlags flags,
std::string* result,
size_t* data_used) {
return DecodeFromArrayTemplate<std::string>(data, len, flags, result,
data_used);
}
bool Base64::DecodeFromArray(const char* data, size_t len, DecodeFlags flags,
vector<char>* result, size_t* data_used) {
bool Base64::DecodeFromArray(const char* data,
size_t len,
DecodeFlags flags,
vector<char>* result,
size_t* data_used) {
return DecodeFromArrayTemplate<vector<char>>(data, len, flags, result,
data_used);
}
@ -210,17 +218,18 @@ bool Base64::DecodeFromArray(const char* data,
data_used);
}
template<typename T>
bool Base64::DecodeFromArrayTemplate(const char* data, size_t len,
DecodeFlags flags, T* result,
size_t* data_used)
{
template <typename T>
bool Base64::DecodeFromArrayTemplate(const char* data,
size_t len,
DecodeFlags flags,
T* result,
size_t* data_used) {
RTC_DCHECK(NULL != result);
RTC_DCHECK(flags <= (DO_PARSE_MASK | DO_PAD_MASK | DO_TERM_MASK));
const DecodeFlags parse_flags = flags & DO_PARSE_MASK;
const DecodeFlags pad_flags = flags & DO_PAD_MASK;
const DecodeFlags term_flags = flags & DO_TERM_MASK;
const DecodeFlags pad_flags = flags & DO_PAD_MASK;
const DecodeFlags term_flags = flags & DO_TERM_MASK;
RTC_DCHECK(0 != parse_flags);
RTC_DCHECK(0 != pad_flags);
RTC_DCHECK(0 != term_flags);
@ -232,8 +241,8 @@ bool Base64::DecodeFromArrayTemplate(const char* data, size_t len,
bool success = true, padded;
unsigned char c, qbuf[4];
while (dpos < len) {
size_t qlen = GetNextQuantum(parse_flags, (DO_PAD_NO == pad_flags),
data, len, &dpos, qbuf, &padded);
size_t qlen = GetNextQuantum(parse_flags, (DO_PAD_NO == pad_flags), data,
len, &dpos, qbuf, &padded);
c = (qbuf[0] << 2) | ((qbuf[1] >> 4) & 0x3);
if (qlen >= 2) {
result->push_back(c);
@ -266,4 +275,4 @@ bool Base64::DecodeFromArrayTemplate(const char* data, size_t len,
return success;
}
} // namespace rtc
} // namespace rtc

86
webrtc/base/base64.h
View File

@ -17,29 +17,28 @@
namespace rtc {
class Base64
{
public:
class Base64 {
public:
enum DecodeOption {
DO_PARSE_STRICT = 1, // Parse only base64 characters
DO_PARSE_WHITE = 2, // Parse only base64 and whitespace characters
DO_PARSE_ANY = 3, // Parse all characters
DO_PARSE_MASK = 3,
DO_PARSE_STRICT = 1, // Parse only base64 characters
DO_PARSE_WHITE = 2, // Parse only base64 and whitespace characters
DO_PARSE_ANY = 3, // Parse all characters
DO_PARSE_MASK = 3,
DO_PAD_YES = 4, // Padding is required
DO_PAD_ANY = 8, // Padding is optional
DO_PAD_NO = 12, // Padding is disallowed
DO_PAD_MASK = 12,
DO_PAD_YES = 4, // Padding is required
DO_PAD_ANY = 8, // Padding is optional
DO_PAD_NO = 12, // Padding is disallowed
DO_PAD_MASK = 12,
DO_TERM_BUFFER = 16, // Must termiante at end of buffer
DO_TERM_CHAR = 32, // May terminate at any character boundary
DO_TERM_ANY = 48, // May terminate at a sub-character bit offset
DO_TERM_MASK = 48,
DO_TERM_BUFFER = 16, // Must termiante at end of buffer
DO_TERM_CHAR = 32, // May terminate at any character boundary
DO_TERM_ANY = 48, // May terminate at a sub-character bit offset
DO_TERM_MASK = 48,
// Strictest interpretation
DO_STRICT = DO_PARSE_STRICT | DO_PAD_YES | DO_TERM_BUFFER,
DO_LAX = DO_PARSE_ANY | DO_PAD_ANY | DO_TERM_CHAR,
DO_LAX = DO_PARSE_ANY | DO_PAD_ANY | DO_TERM_CHAR,
};
typedef int DecodeFlags;
@ -57,12 +56,19 @@ public:
// encoded characters.
static bool IsBase64Encoded(const std::string& str);
static void EncodeFromArray(const void* data, size_t len,
static void EncodeFromArray(const void* data,
size_t len,
std::string* result);
static bool DecodeFromArray(const char* data, size_t len, DecodeFlags flags,
std::string* result, size_t* data_used);
static bool DecodeFromArray(const char* data, size_t len, DecodeFlags flags,
std::vector<char>* result, size_t* data_used);
static bool DecodeFromArray(const char* data,
size_t len,
DecodeFlags flags,
std::string* result,
size_t* data_used);
static bool DecodeFromArray(const char* data,
size_t len,
DecodeFlags flags,
std::vector<char>* result,
size_t* data_used);
static bool DecodeFromArray(const char* data,
size_t len,
DecodeFlags flags,
@ -80,30 +86,38 @@ public:
DecodeFromArray(data.data(), data.size(), flags, &result, NULL);
return result;
}
static inline bool Decode(const std::string& data, DecodeFlags flags,
std::string* result, size_t* data_used)
{
static inline bool Decode(const std::string& data,
DecodeFlags flags,
std::string* result,
size_t* data_used) {
return DecodeFromArray(data.data(), data.size(), flags, result, data_used);
}
static inline bool Decode(const std::string& data, DecodeFlags flags,
std::vector<char>* result, size_t* data_used)
{
static inline bool Decode(const std::string& data,
DecodeFlags flags,
std::vector<char>* result,
size_t* data_used) {
return DecodeFromArray(data.data(), data.size(), flags, result, data_used);
}
private:
private:
static const char Base64Table[];
static const unsigned char DecodeTable[];
static size_t GetNextQuantum(DecodeFlags parse_flags, bool illegal_pads,
const char* data, size_t len, size_t* dpos,
unsigned char qbuf[4], bool* padded);
template<typename T>
static bool DecodeFromArrayTemplate(const char* data, size_t len,
DecodeFlags flags, T* result,
static size_t GetNextQuantum(DecodeFlags parse_flags,
bool illegal_pads,
const char* data,
size_t len,
size_t* dpos,
unsigned char qbuf[4],
bool* padded);
template <typename T>
static bool DecodeFromArrayTemplate(const char* data,
size_t len,
DecodeFlags flags,
T* result,
size_t* data_used);
};
} // namespace rtc
} // namespace rtc
#endif // WEBRTC_BASE_BASE64_H__
#endif // WEBRTC_BASE_BASE64_H__