refactor: use Span in random.*

PastaPastaPasta · PastaPastaPasta · commit 3ae7791bcaa8 · 2022-03-23T17:36:33.000-05:00
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
@@ -49,7 +49,7 @@ bool SerializeFileDB(const std::string& prefix, const fs::path& path, const Data
 {
     // Generate random temporary filename
     uint16_t randv = 0;
-    GetRandBytes((unsigned char*)&randv, sizeof(randv));
+    GetRandBytes({(unsigned char*)&randv, sizeof(randv)});
     std::string tmpfn = strprintf("%s.%04x", prefix, randv);
 
     // open temp output file, and associate with CAutoFile
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
@@ -227,7 +227,7 @@ const unsigned int CDBWrapper::OBFUSCATE_KEY_NUM_BYTES = 8;
 std::vector<unsigned char> CDBWrapper::CreateObfuscateKey() const
 {
     std::vector<uint8_t> ret(OBFUSCATE_KEY_NUM_BYTES);
-    GetRandBytes(ret.data(), OBFUSCATE_KEY_NUM_BYTES);
+    GetRandBytes(ret);
     return ret;
 }
 
diff --git a/src/key.cpp b/src/key.cpp
@@ -159,7 +159,7 @@ bool CKey::Check(const unsigned char *vch) {
 
 void CKey::MakeNewKey(bool fCompressedIn) {
     do {
-        GetStrongRandBytes(keydata.data(), keydata.size());
+        GetStrongRandBytes(keydata);
     } while (!Check(keydata.data()));
     fValid = true;
     fCompressed = fCompressedIn;
@@ -244,7 +244,7 @@ bool CKey::VerifyPubKey(const CPubKey& pubkey) const {
     }
     unsigned char rnd[8];
     std::string str = "Bitcoin key verification\n";
-    GetRandBytes(rnd, sizeof(rnd));
+    GetRandBytes(rnd);
     uint256 hash;
     CHash256().Write(MakeUCharSpan(str)).Write(rnd).Finalize(hash);
     std::vector<unsigned char> vchSig;
@@ -397,7 +397,7 @@ void ECC_Start() {
     {
         // Pass in a random blinding seed to the secp256k1 context.
         std::vector<unsigned char, secure_allocator<unsigned char>> vseed(32);
-        GetRandBytes(vseed.data(), 32);
+        GetRandBytes(vseed);
         bool ret = secp256k1_context_randomize(ctx, vseed.data());
         assert(ret);
     }
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -4426,7 +4426,7 @@ void PeerManagerImpl::MaybeSendPing(CNode& node_to, Peer& peer, std::chrono::mic
     if (pingSend) {
         uint64_t nonce = 0;
         while (nonce == 0) {
-            GetRandBytes((unsigned char*)&nonce, sizeof(nonce));
+            GetRandBytes({(unsigned char*)&nonce, sizeof(nonce)});
         }
         peer.m_ping_queued = false;
         peer.m_ping_start = now;
diff --git a/src/random.cpp b/src/random.cpp
@@ -16,6 +16,7 @@
 #include <logging.h>  // for LogPrintf()
 #include <randomenv.h>
 #include <support/allocators/secure.h>
+#include <span.h>
 #include <sync.h>     // for Mutex
 #include <util/time.h> // for GetTimeMicros()
 
@@ -578,8 +579,8 @@ static void ProcRand(unsigned char* out, int num, RNGLevel level) noexcept
     }
 }
 
-void GetRandBytes(unsigned char* buf, int num) noexcept { ProcRand(buf, num, RNGLevel::FAST); }
-void GetStrongRandBytes(unsigned char* buf, int num) noexcept { ProcRand(buf, num, RNGLevel::SLOW); }
+void GetRandBytes(Span<unsigned char> bytes) noexcept { ProcRand(bytes.data(), bytes.size(), RNGLevel::FAST); }
+void GetStrongRandBytes(Span<unsigned char> bytes) noexcept { ProcRand(bytes.data(), bytes.size(), RNGLevel::SLOW); }
 void RandAddPeriodic() noexcept { ProcRand(nullptr, 0, RNGLevel::PERIODIC); }
 void RandAddEvent(const uint32_t event_info) noexcept { GetRNGState().AddEvent(event_info); }
 
@@ -598,7 +599,7 @@ int GetRandInt(int nMax) noexcept
 uint256 GetRandHash() noexcept
 {
     uint256 hash;
-    GetRandBytes((unsigned char*)&hash, sizeof(hash));
+    GetRandBytes(hash);
     return hash;
 }
 
diff --git a/src/random.h b/src/random.h
@@ -8,6 +8,7 @@
 
 #include <crypto/chacha20.h>
 #include <crypto/common.h>
+#include <span.h>
 #include <uint256.h>
 
 #include <chrono>
@@ -66,7 +67,7 @@
  *
  * Thread-safe.
  */
-void GetRandBytes(unsigned char* buf, int num) noexcept;
+void GetRandBytes(Span<unsigned char> bytes) noexcept;
 /** Generate a uniform random integer in the range [0..range). Precondition: range > 0 */
 uint64_t GetRand(uint64_t nMax) noexcept;
 /** Generate a uniform random duration in the range [0..max). Precondition: max.count() > 0 */
@@ -105,7 +106,7 @@ uint256 GetRandHash() noexcept;
  *
  * Thread-safe.
  */
-void GetStrongRandBytes(unsigned char* buf, int num) noexcept;
+void GetStrongRandBytes(Span<unsigned char> bytes) noexcept;
 
 /**
  * Gather entropy from various expensive sources, and feed them to the PRNG state.
diff --git a/src/rpc/request.cpp b/src/rpc/request.cpp
@@ -82,7 +82,7 @@ bool GenerateAuthCookie(std::string *cookie_out)
 {
     const size_t COOKIE_SIZE = 32;
     unsigned char rand_pwd[COOKIE_SIZE];
-    GetRandBytes(rand_pwd, COOKIE_SIZE);
+    GetRandBytes(rand_pwd);
     std::string cookie = COOKIEAUTH_USER + ":" + HexStr(rand_pwd);
 
     /** the umask determines what permissions are used to create this file -
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
@@ -204,7 +204,7 @@ BOOST_AUTO_TEST_CASE(key_key_negation)
     // create a dummy hash for signature comparison
     unsigned char rnd[8];
     std::string str = "Bitcoin key verification\n";
-    GetRandBytes(rnd, sizeof(rnd));
+    GetRandBytes(rnd);
     uint256 hash;
     CHash256().Write(MakeUCharSpan(str)).Write(rnd).Finalize(hash);
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
@@ -582,7 +582,7 @@ void TorController::protocolinfo_cb(TorControlConnection& _conn, const TorContro
                 // _conn.Command("AUTHENTICATE " + HexStr(status_cookie.second), std::bind(&TorController::auth_cb, this, std::placeholders::_1, std::placeholders::_2));
                 cookie = std::vector<uint8_t>(status_cookie.second.begin(), status_cookie.second.end());
                 clientNonce = std::vector<uint8_t>(TOR_NONCE_SIZE, 0);
-                GetRandBytes(clientNonce.data(), TOR_NONCE_SIZE);
+                GetRandBytes(clientNonce);
                 _conn.Command("AUTHCHALLENGE SAFECOOKIE " + HexStr(clientNonce), std::bind(&TorController::authchallenge_cb, this, std::placeholders::_1, std::placeholders::_2));
             } else {
                 if (status_cookie.first) {
diff --git a/src/util/bytevectorhash.cpp b/src/util/bytevectorhash.cpp
@@ -8,8 +8,8 @@
 
 ByteVectorHash::ByteVectorHash()
 {
-    GetRandBytes(reinterpret_cast<unsigned char*>(&m_k0), sizeof(m_k0));
-    GetRandBytes(reinterpret_cast<unsigned char*>(&m_k1), sizeof(m_k1));
+    GetRandBytes({reinterpret_cast<unsigned char*>(&m_k0), sizeof(m_k0)});
+    GetRandBytes({reinterpret_cast<unsigned char*>(&m_k1), sizeof(m_k1)});
 }
 
 size_t ByteVectorHash::operator()(const std::vector<unsigned char>& input) const
diff --git a/src/wallet/test/wallet_crypto_tests.cpp b/src/wallet/test/wallet_crypto_tests.cpp
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE(passphrase) {
 
     std::string hash(GetRandHash().ToString());
     std::vector<unsigned char> vchSalt(8);
-    GetRandBytes(vchSalt.data(), vchSalt.size());
+    GetRandBytes(vchSalt);
     uint32_t rounds = InsecureRand32();
     if (rounds > 30000)
         rounds = 30000;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -669,12 +669,12 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
     CKeyingMaterial _vMasterKey;
 
     _vMasterKey.resize(WALLET_CRYPTO_KEY_SIZE);
-    GetStrongRandBytes(_vMasterKey.data(), WALLET_CRYPTO_KEY_SIZE);
+    GetStrongRandBytes(_vMasterKey);
 
     CMasterKey kMasterKey;
 
     kMasterKey.vchSalt.resize(WALLET_CRYPTO_SALT_SIZE);
-    GetStrongRandBytes(kMasterKey.vchSalt.data(), WALLET_CRYPTO_SALT_SIZE);
+    GetStrongRandBytes(kMasterKey.vchSalt);
 
     CCrypter crypter;
     int64_t nStartTime = GetTimeMillis();

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ bool SerializeFileDB(const std::string& prefix, const fs::path& path, const Data`
`49`	`49`	`{`
`50`	`50`	`// Generate random temporary filename`
`51`	`51`	`uint16_t randv = 0;`
`52`		`- GetRandBytes((unsigned char*)&randv, sizeof(randv));`
	`52`	`+ GetRandBytes({(unsigned char*)&randv, sizeof(randv)});`
`53`	`53`	`std::string tmpfn = strprintf("%s.%04x", prefix, randv);`
`54`	`54`
`55`	`55`	`// open temp output file, and associate with CAutoFile`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ const unsigned int CDBWrapper::OBFUSCATE_KEY_NUM_BYTES = 8;`
`227`	`227`	`std::vector<unsigned char> CDBWrapper::CreateObfuscateKey() const`
`228`	`228`	`{`
`229`	`229`	`std::vector<uint8_t> ret(OBFUSCATE_KEY_NUM_BYTES);`
`230`		`- GetRandBytes(ret.data(), OBFUSCATE_KEY_NUM_BYTES);`
	`230`	`+ GetRandBytes(ret);`
`231`	`231`	`return ret;`
`232`	`232`	`}`
`233`	`233`
Original file line number	Diff line number	Diff line change
`@@ -4426,7 +4426,7 @@ void PeerManagerImpl::MaybeSendPing(CNode& node_to, Peer& peer, std::chrono::mic`
`4426`	`4426`	`if (pingSend) {`
`4427`	`4427`	`uint64_t nonce = 0;`
`4428`	`4428`	`while (nonce == 0) {`
`4429`		`- GetRandBytes((unsigned char*)&nonce, sizeof(nonce));`
	`4429`	`+ GetRandBytes({(unsigned char*)&nonce, sizeof(nonce)});`
`4430`	`4430`	`}`
`4431`	`4431`	`peer.m_ping_queued = false;`
`4432`	`4432`	`peer.m_ping_start = now;`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`#include <logging.h> // for LogPrintf()`
`17`	`17`	`#include <randomenv.h>`
`18`	`18`	`#include <support/allocators/secure.h>`
	`19`	`+#include <span.h>`
`19`	`20`	`#include <sync.h> // for Mutex`
`20`	`21`	`#include <util/time.h> // for GetTimeMicros()`
`21`	`22`
`@@ -578,8 +579,8 @@ static void ProcRand(unsigned char* out, int num, RNGLevel level) noexcept`
`578`	`579`	`}`
`579`	`580`	`}`
`580`	`581`
`581`		`-void GetRandBytes(unsigned char* buf, int num) noexcept { ProcRand(buf, num, RNGLevel::FAST); }`
`582`		`-void GetStrongRandBytes(unsigned char* buf, int num) noexcept { ProcRand(buf, num, RNGLevel::SLOW); }`
	`582`	`+void GetRandBytes(Span<unsigned char> bytes) noexcept { ProcRand(bytes.data(), bytes.size(), RNGLevel::FAST); }`
	`583`	`+void GetStrongRandBytes(Span<unsigned char> bytes) noexcept { ProcRand(bytes.data(), bytes.size(), RNGLevel::SLOW); }`
`583`	`584`	`void RandAddPeriodic() noexcept { ProcRand(nullptr, 0, RNGLevel::PERIODIC); }`
`584`	`585`	`void RandAddEvent(const uint32_t event_info) noexcept { GetRNGState().AddEvent(event_info); }`
`585`	`586`
`@@ -598,7 +599,7 @@ int GetRandInt(int nMax) noexcept`
`598`	`599`	`uint256 GetRandHash() noexcept`
`599`	`600`	`{`
`600`	`601`	`uint256 hash;`
`601`		`- GetRandBytes((unsigned char*)&hash, sizeof(hash));`
	`602`	`+ GetRandBytes(hash);`
`602`	`603`	`return hash;`
`603`	`604`	`}`
`604`	`605`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ bool GenerateAuthCookie(std::string *cookie_out)`
`82`	`82`	`{`
`83`	`83`	`const size_t COOKIE_SIZE = 32;`
`84`	`84`	`unsigned char rand_pwd[COOKIE_SIZE];`
`85`		`- GetRandBytes(rand_pwd, COOKIE_SIZE);`
	`85`	`+ GetRandBytes(rand_pwd);`
`86`	`86`	`std::string cookie = COOKIEAUTH_USER + ":" + HexStr(rand_pwd);`
`87`	`87`
`88`	`88`	`/** the umask determines what permissions are used to create this file -`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`
`9`	`9`	`ByteVectorHash::ByteVectorHash()`
`10`	`10`	`{`
`11`		`- GetRandBytes(reinterpret_cast<unsigned char*>(&m_k0), sizeof(m_k0));`
`12`		`- GetRandBytes(reinterpret_cast<unsigned char*>(&m_k1), sizeof(m_k1));`
	`11`	`+ GetRandBytes({reinterpret_cast<unsigned char*>(&m_k0), sizeof(m_k0)});`
	`12`	`+ GetRandBytes({reinterpret_cast<unsigned char*>(&m_k1), sizeof(m_k1)});`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`size_t ByteVectorHash::operator()(const std::vector<unsigned char>& input) const`