util: make EncodeBase64 consume Spans

Adapted from btc@e2aa1a585a83971639572cd2c84565ec360deac9
PIVX-Project · Jul 6, 2021 · a1f3aed · a1f3aed
1 parent c36754f
commit a1f3aed
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/messagesigner.cpp b/src/messagesigner.cpp
@@ -76,7 +76,7 @@ bool CHashSigner::VerifyHash(const uint256& hash, const CKeyID& keyID, const std
     if(pubkeyFromSig.GetID() != keyID) {
         strErrorRet = strprintf("Keys don't match: pubkey=%s, pubkeyFromSig=%s, hash=%s, vchSig=%s",
                 EncodeDestination(keyID), EncodeDestination(pubkeyFromSig.GetID()),
-                hash.ToString(), EncodeBase64(&vchSig[0], vchSig.size()));
+                hash.ToString(), EncodeBase64(vchSig));
         return false;
     }
 
@@ -131,6 +131,6 @@ bool CSignedMessage::CheckSignature(const CKeyID& keyID) const
 
 std::string CSignedMessage::GetSignatureBase64() const
 {
-    return EncodeBase64(&vchSig[0], vchSig.size());
+    return EncodeBase64(vchSig);
 }
 
diff --git a/src/qt/pivx/settings/settingssignmessagewidgets.cpp b/src/qt/pivx/settings/settingssignmessagewidgets.cpp
@@ -201,7 +201,7 @@ void SettingsSignMessageWidgets::onSignMessageButtonSMClicked()
     ui->statusLabel_SM->setStyleSheet("QLabel { color: green; }");
     ui->statusLabel_SM->setText(QString("<nobr>") + tr("Message signed.") + QString("</nobr>"));
 
-    ui->signatureOut_SM->setText(QString::fromStdString(EncodeBase64(&vchSig[0], vchSig.size())));
+    ui->signatureOut_SM->setText(QString::fromStdString(EncodeBase64(vchSig)));
 }
 
 void SettingsSignMessageWidgets::onVerifyMessage()

diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp
@@ -123,20 +123,20 @@ std::vector<unsigned char> ParseHex(const std::string& str)
     return ParseHex(str.c_str());
 }
 
-std::string EncodeBase64(const unsigned char* pch, size_t len)
+std::string EncodeBase64(Span<const unsigned char> input)
 {
     static const char *pbase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
     std::string str;
-    str.reserve(((len + 2) / 3) * 4);
-    ConvertBits<8, 6, true>([&](int v) { str += pbase64[v]; }, pch, pch + len);
+    str.reserve(((input.size() + 2) / 3) * 4);
+    ConvertBits<8, 6, true>([&](int v) { str += pbase64[v]; }, input.begin(), input.end());
     while (str.size() % 4) str += '=';
     return str;
 }
 
 std::string EncodeBase64(const std::string& str)
 {
-    return EncodeBase64((const unsigned char*)str.c_str(), str.size());
+    return EncodeBase64(MakeUCharSpan(str));
 }
 
 std::vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid)

diff --git a/src/utilstrencodings.h b/src/utilstrencodings.h
@@ -11,6 +11,7 @@
 #define BITCOIN_UTILSTRENCODINGS_H
 
 #include "support/allocators/secure.h"
+#include "span.h"
 #include <algorithm>
 #include <stdint.h>
 #include <string>
@@ -54,7 +55,7 @@ signed char HexDigit(char c);
 bool IsHex(const std::string& str);
 std::vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid = NULL);
 std::string DecodeBase64(const std::string& str);
-std::string EncodeBase64(const unsigned char* pch, size_t len);
+std::string EncodeBase64(Span<const unsigned char> input);
 std::string EncodeBase64(const std::string& str);
 std::vector<unsigned char> DecodeBase32(const char* p, bool* pfInvalid = NULL);
 std::string DecodeBase32(const std::string& str);

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -2023,7 +2023,7 @@ UniValue signmessage(const JSONRPCRequest& request)
     if (!key.SignCompact(ss.GetHash(), vchSig))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Sign failed");
 
-    return EncodeBase64(&vchSig[0], vchSig.size());
+    return EncodeBase64(vchSig);
 }
 
 UniValue getreceivedbyaddress(const JSONRPCRequest& request)