util: make EncodeBase32 consume Spans

theStack · theStack · commit 2bc207190e6f · 2020-08-25T18:52:51.000+02:00
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -4,10 +4,11 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <netaddress.h>
+
 #include <hash.h>
+#include <tinyformat.h>
 #include <util/strencodings.h>
 #include <util/asmap.h>
-#include <tinyformat.h>
 
 #include <algorithm>
 #include <array>
@@ -341,9 +342,9 @@ enum Network CNetAddr::GetNetwork() const
 std::string CNetAddr::ToStringIP() const
 {
     if (IsTor())
-        return EncodeBase32(m_addr.data(), m_addr.size()) + ".onion";
+        return EncodeBase32(m_addr) + ".onion";
     if (IsInternal())
-        return EncodeBase32(m_addr.data(), m_addr.size()) + ".internal";
+        return EncodeBase32(m_addr) + ".internal";
     CService serv(*this, 0);
     struct sockaddr_storage sockaddr;
     socklen_t socklen = sizeof(sockaddr);
diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp
@@ -201,20 +201,20 @@ std::string DecodeBase64(const std::string& str, bool* pf_invalid)
     return std::string((const char*)vchRet.data(), vchRet.size());
 }
 
-std::string EncodeBase32(const unsigned char* pch, size_t len)
+std::string EncodeBase32(Span<const unsigned char> input)
 {
     static const char *pbase32 = "abcdefghijklmnopqrstuvwxyz234567";
 
     std::string str;
-    str.reserve(((len + 4) / 5) * 8);
-    ConvertBits<8, 5, true>([&](int v) { str += pbase32[v]; }, pch, pch + len);
+    str.reserve(((input.size() + 4) / 5) * 8);
+    ConvertBits<8, 5, true>([&](int v) { str += pbase32[v]; }, input.begin(), input.end());
     while (str.size() % 8) str += '=';
     return str;
 }
 
 std::string EncodeBase32(const std::string& str)
 {
-    return EncodeBase32((const unsigned char*)str.data(), str.size());
+    return EncodeBase32(MakeUCharSpan(str));
 }
 
 std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid)
diff --git a/src/util/strencodings.h b/src/util/strencodings.h
@@ -52,7 +52,7 @@ std::string EncodeBase64(const unsigned char* pch, size_t len);
 std::string EncodeBase64(const std::string& str);
 std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid = nullptr);
 std::string DecodeBase32(const std::string& str, bool* pf_invalid = nullptr);
-std::string EncodeBase32(const unsigned char* pch, size_t len);
+std::string EncodeBase32(Span<const unsigned char> input);
 std::string EncodeBase32(const std::string& str);
 
 void SplitHostPort(std::string in, int& portOut, std::string& hostOut);

Original file line number	Diff line number	Diff line change
`@@ -201,20 +201,20 @@ std::string DecodeBase64(const std::string& str, bool* pf_invalid)`
`201`	`201`	`return std::string((const char*)vchRet.data(), vchRet.size());`
`202`	`202`	`}`
`203`	`203`
`204`		`-std::string EncodeBase32(const unsigned char* pch, size_t len)`
	`204`	`+std::string EncodeBase32(Span<const unsigned char> input)`
`205`	`205`	`{`
`206`	`206`	`static const char *pbase32 = "abcdefghijklmnopqrstuvwxyz234567";`
`207`	`207`
`208`	`208`	`std::string str;`
`209`		`- str.reserve(((len + 4) / 5) * 8);`
`210`		`- ConvertBits<8, 5, true>([&](int v) { str += pbase32[v]; }, pch, pch + len);`
	`209`	`+ str.reserve(((input.size() + 4) / 5) * 8);`
	`210`	`+ ConvertBits<8, 5, true>([&](int v) { str += pbase32[v]; }, input.begin(), input.end());`
`211`	`211`	`while (str.size() % 8) str += '=';`
`212`	`212`	`return str;`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`std::string EncodeBase32(const std::string& str)`
`216`	`216`	`{`
`217`		`- return EncodeBase32((const unsigned char*)str.data(), str.size());`
	`217`	`+ return EncodeBase32(MakeUCharSpan(str));`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`std::vector<unsigned char> DecodeBase32(const char* p, bool* pf_invalid)`