| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/base64.h" | 5 #include "base/base64.h" |
| 6 | 6 |
| 7 #include "third_party/modp_b64/modp_b64.h" | 7 #include "third_party/modp_b64/modp_b64.h" |
| 8 | 8 |
| 9 namespace base { | 9 namespace base { |
| 10 | 10 |
| 11 bool Base64Encode(const StringPiece& input, std::string* output) { | 11 void Base64Encode(const StringPiece& input, std::string* output) { |
| 12 std::string temp; | 12 std::string temp; |
| 13 temp.resize(modp_b64_encode_len(input.size())); // makes room for null byte | 13 temp.resize(modp_b64_encode_len(input.size())); // makes room for null byte |
| 14 | 14 |
| 15 // null terminates result since result is base64 text! | |
| 16 int input_size = static_cast<int>(input.size()); | |
| 17 | |
| 18 // modp_b64_encode_len() returns at least 1, so temp[0] is safe to use. | 15 // modp_b64_encode_len() returns at least 1, so temp[0] is safe to use. |
| 19 size_t output_size = modp_b64_encode(&(temp[0]), input.data(), input_size); | 16 size_t output_size = modp_b64_encode(&(temp[0]), input.data(), input.size()); |
| 20 if (output_size == MODP_B64_ERROR) | |
| 21 return false; | |
| 22 | 17 |
| 23 temp.resize(output_size); // strips off null byte | 18 temp.resize(output_size); // strips off null byte |
| 24 output->swap(temp); | 19 output->swap(temp); |
| 25 return true; | |
| 26 } | 20 } |
| 27 | 21 |
| 28 bool Base64Decode(const StringPiece& input, std::string* output) { | 22 bool Base64Decode(const StringPiece& input, std::string* output) { |
| 29 std::string temp; | 23 std::string temp; |
| 30 temp.resize(modp_b64_decode_len(input.size())); | 24 temp.resize(modp_b64_decode_len(input.size())); |
| 31 | 25 |
| 32 // does not null terminate result since result is binary data! | 26 // does not null terminate result since result is binary data! |
| 33 size_t input_size = input.size(); | 27 size_t input_size = input.size(); |
| 34 size_t output_size = modp_b64_decode(&(temp[0]), input.data(), input_size); | 28 size_t output_size = modp_b64_decode(&(temp[0]), input.data(), input_size); |
| 35 if (output_size == MODP_B64_ERROR) | 29 if (output_size == MODP_B64_ERROR) |
| 36 return false; | 30 return false; |
| 37 | 31 |
| 38 temp.resize(output_size); | 32 temp.resize(output_size); |
| 39 output->swap(temp); | 33 output->swap(temp); |
| 40 return true; | 34 return true; |
| 41 } | 35 } |
| 42 | 36 |
| 43 } // namespace base | 37 } // namespace base |
| OLD | NEW |