maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/nix/hash): eliminate exposed global variable

Browse source 
Change-Id: I3b34e3e17a751e225831ae599c6c6bb782a25679
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1486
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-07-27 17:07:51 -07:00 • committed by kanepyork
parent d9262bd6c6
commit 976a36c2e4
3 changed files with 61 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

39
third_party/nix/src/libutil/hash.cc vendored
View file

@ -78,6 +78,45 @@ static std::string printHash16(const Hash& hash) {
// omitted: E O U T
const std::string base32Chars = "0123456789abcdfghijklmnpqrsvwxyz";
constexpr signed char kUnBase32[] = {
-1, -1, -1, -1, -1, -1, -1, -1, /* unprintables */
-1, -1, -1, -1, -1, -1, -1, -1, /* unprintables */
-1, -1, -1, -1, -1, -1, -1, -1, /* unprintables */
-1, -1, -1, -1, -1, -1, -1, -1, /* unprintables */
-1, -1, -1, -1, -1, -1, -1, -1, /* SP..' */
-1, -1, -1, -1, -1, -1, -1, -1, /* (../ */
0, 1, 2, 3, 4, 5, 6, 7, /* 0..7 */
8, 9, -1, -1, -1, -1, -1, -1, /* 8..? */
-1, -1, -1, -1, -1, -1, -1, -1, /* @..G */
-1, -1, -1, -1, -1, -1, -1, -1, /* H..O */
-1, -1, -1, -1, -1, -1, -1, -1, /* P..W */
-1, -1, -1, -1, -1, -1, -1, -1, /* X.._ */
-1, 10, 11, 12, 13, -1, 14, 15, /* `..g */
16, 17, 18, 19, 20, 21, 22, -1, /* h..o */
23, 24, 25, 26, -1, -1, 27, 28, /* p..w */
29, 30, 31, -1, -1, -1, -1, -1, /* x..DEL */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* high */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* high */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* high */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* high */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* high */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* high */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* high */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* high */
};
bool Hash::IsValidBase32(absl::string_view s) {
static_assert(sizeof(kUnBase32) == 256);
for (char c : s) {
if (kUnBase32[static_cast<unsigned char>(c)] == -1) {
return false;
}
}
return true;
}
static std::string printHash32(const Hash& hash) {
assert(hash.hashSize);
size_t len = hash.base32Len();

6
third_party/nix/src/libutil/hash.hh vendored
View file

@ -14,8 +14,6 @@ const int sha1HashSize = 20;
const int sha256HashSize = 32;
const int sha512HashSize = 64;
extern const std::string base32Chars;
enum Base : int { Base64, Base32, Base16, SRI };
struct Hash {
@ -65,6 +63,10 @@ struct Hash {
or base-64. By default, this is prefixed by the hash type
(e.g. "sha256:"). */
std::string to_string(Base base = Base32, bool includeType = true) const;
/* Returns whether the passed string contains entirely valid base32
characters. */
static bool IsValidBase32(absl::string_view s);
};
/* Print a hash in base-16 if it's MD5, or base-32 otherwise. */