From 976a36c2e482f416acd79a624e6d96cce2564b5b Mon Sep 17 00:00:00 2001 From: Kane York Date: Mon, 27 Jul 2020 17:07:51 -0700 Subject: chore(3p/nix/hash): eliminate exposed global variable Change-Id: I3b34e3e17a751e225831ae599c6c6bb782a25679 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1486 Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/nix/src/libutil/hash.hh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'third_party/nix/src/libutil/hash.hh') diff --git a/third_party/nix/src/libutil/hash.hh b/third_party/nix/src/libutil/hash.hh index 34cb41c48784..58f808896fe2 100644 --- a/third_party/nix/src/libutil/hash.hh +++ b/third_party/nix/src/libutil/hash.hh @@ -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. */ -- cgit 1.4.1