diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/base32 | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/base32')
-rw-r--r-- | chromium/components/base32/BUILD.gn | 15 | ||||
-rw-r--r-- | chromium/components/base32/base32.cc | 56 | ||||
-rw-r--r-- | chromium/components/base32/base32.h | 4 | ||||
-rw-r--r-- | chromium/components/base32/base32_fuzzer.cc | 1 | ||||
-rw-r--r-- | chromium/components/base32/base32_test_util.cc | 76 | ||||
-rw-r--r-- | chromium/components/base32/base32_test_util.h | 19 | ||||
-rw-r--r-- | chromium/components/base32/base32_unittest.cc | 1 |
7 files changed, 60 insertions, 112 deletions
diff --git a/chromium/components/base32/BUILD.gn b/chromium/components/base32/BUILD.gn index 931e222af85..36e22af9680 100644 --- a/chromium/components/base32/BUILD.gn +++ b/chromium/components/base32/BUILD.gn @@ -13,26 +13,12 @@ static_library("base32") { deps = [ "//base" ] } -static_library("base32_test_util") { - testonly = true - sources = [ - "base32_test_util.cc", - "base32_test_util.h", - ] - - deps = [ - ":base32", - "//base", - ] -} - source_set("unit_tests") { testonly = true sources = [ "base32_unittest.cc" ] deps = [ ":base32", - ":base32_test_util", "//base", "//testing/gtest", ] @@ -43,7 +29,6 @@ fuzzer_test("base32_fuzzer") { deps = [ ":base32", - ":base32_test_util", "//base", ] } diff --git a/chromium/components/base32/base32.cc b/chromium/components/base32/base32.cc index b4ad2ef8e6d..96950b380eb 100644 --- a/chromium/components/base32/base32.cc +++ b/chromium/components/base32/base32.cc @@ -13,6 +13,20 @@ namespace base32 { +namespace { + +// Returns a 5 bit number between [0,31] matching the provided base 32 encoded +// character. Returns 0xff on error. +uint8_t ReverseMapping(char input_char) { + if (input_char >= 'A' && input_char <= 'Z') + return input_char - 'A'; + if (input_char >= '2' && input_char <= '7') + return input_char - '2' + 26; + return 0xff; +} + +} // namespace + std::string Base32Encode(base::StringPiece input, Base32EncodePolicy policy) { if (input.empty()) return std::string(); @@ -64,4 +78,46 @@ std::string Base32Encode(base::StringPiece input, Base32EncodePolicy policy) { return output; } +std::string Base32Decode(base::StringPiece input) { + // Remove padding, if any + const size_t padding_index = input.find(kPaddingChar); + if (padding_index != base::StringPiece::npos) + input.remove_suffix(input.size() - padding_index); + + if (input.empty()) + return std::string(); + + const size_t decoded_length = + (base::MakeCheckedNum(input.size()) * 5 / 8).ValueOrDie(); + + std::string output; + output.reserve(decoded_length); + + // A bit stream which will be read from the left and appended to from the + // right as it's emptied. + uint16_t bit_stream = 0; + size_t free_bits = 16; + for (char input_char : input) { + const uint8_t decoded_5bits = ReverseMapping(input_char); + // If an invalid character is read from the input, then stop decoding. + if (decoded_5bits >= 32) + return std::string(); + + // Place the next decoded 5-bits in the stream. + bit_stream |= decoded_5bits << (free_bits - 5); + free_bits -= 5; + + // If the stream is filled with a byte, flush the stream of that byte and + // append it to the output. + if (free_bits <= 8) { + output.push_back(static_cast<char>(bit_stream >> 8)); + bit_stream <<= 8; + free_bits += 8; + } + } + + DCHECK_EQ(decoded_length, output.size()); + return output; +} + } // namespace base32 diff --git a/chromium/components/base32/base32.h b/chromium/components/base32/base32.h index d6299d73be0..52fc745ac47 100644 --- a/chromium/components/base32/base32.h +++ b/chromium/components/base32/base32.h @@ -32,6 +32,10 @@ std::string Base32Encode( base::StringPiece input, Base32EncodePolicy policy = Base32EncodePolicy::INCLUDE_PADDING); +// Decodes the |input| string piece from base32. Returns an empty string on +// error, including if |input| is empty. +std::string Base32Decode(base::StringPiece input); + } // namespace base32 #endif // COMPONENTS_BASE32_BASE32_H_ diff --git a/chromium/components/base32/base32_fuzzer.cc b/chromium/components/base32/base32_fuzzer.cc index 82b2b2abe33..e591cb22d90 100644 --- a/chromium/components/base32/base32_fuzzer.cc +++ b/chromium/components/base32/base32_fuzzer.cc @@ -10,7 +10,6 @@ #include "base/check_op.h" #include "base/stl_util.h" #include "components/base32/base32.h" -#include "components/base32/base32_test_util.h" base32::Base32EncodePolicy GetBase32EncodePolicyFromUint8(uint8_t value) { // Dummy switch to detect changes to the enum definition. diff --git a/chromium/components/base32/base32_test_util.cc b/chromium/components/base32/base32_test_util.cc deleted file mode 100644 index 9c605becc7f..00000000000 --- a/chromium/components/base32/base32_test_util.cc +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2019 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 "components/base32/base32_test_util.h" - -#include <stddef.h> - -#include <limits> - -#include "base/check_op.h" -#include "base/notreached.h" -#include "base/numerics/safe_math.h" -#include "components/base32/base32.h" - -namespace base32 { - -namespace { - -// Returns a 5 bit number between [0,31] matching the provided base 32 encoded -// character. Returns 0xff on error. -uint8_t ReverseMapping(char input_char) { - if (input_char >= 'A' && input_char <= 'Z') - return input_char - 'A'; - if (input_char >= '2' && input_char <= '7') - return input_char - '2' + 26; - - NOTREACHED() << "Invalid base32 character"; - return 0xff; -} - -} // namespace - -std::string Base32Decode(base::StringPiece input) { - if (input.empty()) - return std::string(); - - // Remove padding, if any - const size_t padding_index = input.find(kPaddingChar); - if (padding_index != base::StringPiece::npos) - input.remove_suffix(input.size() - padding_index); - - const size_t decoded_length = - (base::MakeCheckedNum(input.size()) * 5 / 8).ValueOrDie(); - - std::string output; - output.reserve(decoded_length); - - // A bit stream which will be read from the left and appended to from the - // right as it's emptied. - uint16_t bit_stream = 0; - size_t free_bits = 16; - for (char input_char : input) { - const uint8_t decoded_5bits = ReverseMapping(input_char); - // If an invalid character is read from the input, then stop decoding. - if (decoded_5bits >= 32) - return std::string(); - - // Place the next decoded 5-bits in the stream. - bit_stream |= decoded_5bits << (free_bits - 5); - free_bits -= 5; - - // If the stream is filled with a byte, flush the stream of that byte and - // append it to the output. - if (free_bits <= 8) { - output.push_back(static_cast<char>(bit_stream >> 8)); - bit_stream <<= 8; - free_bits += 8; - } - } - - DCHECK_EQ(decoded_length, output.size()); - return output; -} - -} // namespace base32 diff --git a/chromium/components/base32/base32_test_util.h b/chromium/components/base32/base32_test_util.h deleted file mode 100644 index 35c73c15e0c..00000000000 --- a/chromium/components/base32/base32_test_util.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2019 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 COMPONENTS_BASE32_BASE32_TEST_UTIL_H_ -#define COMPONENTS_BASE32_BASE32_TEST_UTIL_H_ - -#include <string> - -#include "base/strings/string_piece.h" - -namespace base32 { - -// Decodes the |input| string piece from base32. -std::string Base32Decode(base::StringPiece input); - -} // namespace base32 - -#endif // COMPONENTS_BASE32_BASE32_TEST_UTIL_H_ diff --git a/chromium/components/base32/base32_unittest.cc b/chromium/components/base32/base32_unittest.cc index 49b8e64ed25..474e8e3cf51 100644 --- a/chromium/components/base32/base32_unittest.cc +++ b/chromium/components/base32/base32_unittest.cc @@ -6,7 +6,6 @@ #include "base/stl_util.h" #include "components/base32/base32.h" -#include "components/base32/base32_test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace base32 { |