diff options
author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 06:21:53 +0000 |
---|---|---|
committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 06:21:53 +0000 |
commit | 978df34538607d50bf4690f2d679c1bef860398c (patch) | |
tree | b99abc0b44316c0bfa16374746996ac209e363a6 /base | |
parent | 391bbb3fb3fbb0fb7d072878b9cb45e99a519e6e (diff) | |
download | chromium_src-978df34538607d50bf4690f2d679c1bef860398c.zip chromium_src-978df34538607d50bf4690f2d679c1bef860398c.tar.gz chromium_src-978df34538607d50bf4690f2d679c1bef860398c.tar.bz2 |
Move base64 from 'net/base' into 'base'.
BUG=13572
TEST=none
Review URL: http://codereview.chromium.org/399068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/DEPS | 1 | ||||
-rw-r--r-- | base/base.gyp | 6 | ||||
-rw-r--r-- | base/base64.cc | 41 | ||||
-rw-r--r-- | base/base64.h | 22 | ||||
-rw-r--r-- | base/base64_unittest.cc | 29 |
5 files changed, 99 insertions, 0 deletions
@@ -1,6 +1,7 @@ include_rules = [ "+third_party/libevent", "+third_party/dmg_fp", + "+third_party/modp_b64", "+third_party/tcmalloc", # Testing stuff shouldn't be used by the general base code. diff --git a/base/base.gyp b/base/base.gyp index 5ba7d4b..75ce295 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -11,6 +11,9 @@ 'target_name': 'base', 'type': '<(library)', 'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165', + 'dependencies': [ + '../third_party/modp_b64/modp_b64.gyp:modp_b64', + ], 'sources': [ '../build/build_config.h', 'crypto/cssm_init.cc', @@ -70,6 +73,8 @@ 'atomicops.h', 'atomicops_internals_x86_msvc.h', 'auto_reset.h', + 'base64.cc', + 'base64.h', 'base_drag_source.cc', 'base_drag_source.h', 'base_drop_target.cc', @@ -605,6 +610,7 @@ 'at_exit_unittest.cc', 'atomic_flag_unittest.cc', 'atomicops_unittest.cc', + 'base64_unittest.cc', 'bits_unittest.cc', 'command_line_unittest.cc', 'condition_variable_unittest.cc', diff --git a/base/base64.cc b/base/base64.cc new file mode 100644 index 0000000..56a577d --- /dev/null +++ b/base/base64.cc @@ -0,0 +1,41 @@ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/base64.h" + +#include "third_party/modp_b64/modp_b64.h" + +namespace base { + +bool Base64Encode(const std::string& input, std::string* output) { + std::string temp; + temp.resize(modp_b64_encode_len(input.size())); // makes room for null byte + + // null terminates result since result is base64 text! + int input_size = static_cast<int>(input.size()); + int output_size= modp_b64_encode(&(temp[0]), input.data(), input_size); + if (output_size < 0) + return false; + + temp.resize(output_size); // strips off null byte + output->swap(temp); + return true; +} + +bool Base64Decode(const std::string& input, std::string* output) { + std::string temp; + temp.resize(modp_b64_decode_len(input.size())); + + // does not null terminate result since result is binary data! + int input_size = static_cast<int>(input.size()); + int output_size = modp_b64_decode(&(temp[0]), input.data(), input_size); + if (output_size < 0) + return false; + + temp.resize(output_size); + output->swap(temp); + return true; +} + +} // namespace base diff --git a/base/base64.h b/base/base64.h new file mode 100644 index 0000000..d45a8a3 --- /dev/null +++ b/base/base64.h @@ -0,0 +1,22 @@ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_BASE64_H__ +#define BASE_BASE64_H__ + +#include <string> + +namespace base { + +// Encodes the input string in base64. Returns true if successful and false +// otherwise. The output string is only modified if successful. +bool Base64Encode(const std::string& input, std::string* output); + +// Decodes the base64 input string. Returns true if successful and false +// otherwise. The output string is only modified if successful. +bool Base64Decode(const std::string& input, std::string* output); + +} // namespace base + +#endif // BASE_BASE64_H__ diff --git a/base/base64_unittest.cc b/base/base64_unittest.cc new file mode 100644 index 0000000..1d11b1e --- /dev/null +++ b/base/base64_unittest.cc @@ -0,0 +1,29 @@ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/base64.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace { + +class Base64Test : public testing::Test { +}; + +} // namespace + +TEST(Base64Test, Basic) { + const std::string kText = "hello world"; + const std::string kBase64Text = "aGVsbG8gd29ybGQ="; + + std::string encoded, decoded; + bool ok; + + ok = base::Base64Encode(kText, &encoded); + EXPECT_TRUE(ok); + EXPECT_EQ(kBase64Text, encoded); + + ok = base::Base64Decode(encoded, &decoded); + EXPECT_TRUE(ok); + EXPECT_EQ(kText, decoded); +} |