From a4377a0843636eae0aaf698510fc6518582545db Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Fri, 8 Apr 2022 23:17:01 -0400 Subject: Reject incorrect base64 in HTTP auth In addition, to make sure that no call site ignores the invalid decoding status, make the pf_invalid argument mandatory. --- src/util/strencodings.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/util/strencodings.h') diff --git a/src/util/strencodings.h b/src/util/strencodings.h index 82645c6bf0..c87b2d2415 100644 --- a/src/util/strencodings.h +++ b/src/util/strencodings.h @@ -64,13 +64,13 @@ bool IsHex(std::string_view str); * Return true if the string is a hex number, optionally prefixed with "0x" */ bool IsHexNumber(std::string_view str); -std::vector DecodeBase64(const char* p, bool* pf_invalid = nullptr); -std::string DecodeBase64(const std::string& str, bool* pf_invalid = nullptr); +std::vector DecodeBase64(const char* p, bool* pf_invalid); +std::string DecodeBase64(const std::string& str, bool* pf_invalid); std::string EncodeBase64(Span input); inline std::string EncodeBase64(Span input) { return EncodeBase64(MakeUCharSpan(input)); } inline std::string EncodeBase64(const std::string& str) { return EncodeBase64(MakeUCharSpan(str)); } -std::vector DecodeBase32(const char* p, bool* pf_invalid = nullptr); -std::string DecodeBase32(const std::string& str, bool* pf_invalid = nullptr); +std::vector DecodeBase32(const char* p, bool* pf_invalid); +std::string DecodeBase32(const std::string& str, bool* pf_invalid); /** * Base32 encode. -- cgit v1.2.3