Allow FastRandomContext::randbytes for all byte types

2 files changed, 8 insertions, 4 deletions

diff --git a/src/random.cpp b/src/random.cpp
index 39ceae4206..5ff6f573b8 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -589,15 +589,18 @@ uint256 FastRandomContext::rand256() noexcept
     return ret;
 }
 
-std::vector<unsigned char> FastRandomContext::randbytes(size_t len)
+template <typename B>
+std::vector<B> FastRandomContext::randbytes(size_t len)
 {
     if (requires_seed) RandomSeed();
-    std::vector<unsigned char> ret(len);
+    std::vector<B> ret(len);
     if (len > 0) {
-        rng.Keystream(ret.data(), len);
+        rng.Keystream(UCharCast(ret.data()), len);
     }
     return ret;
 }
+template std::vector<unsigned char> FastRandomContext::randbytes(size_t);
+template std::vector<std::byte> FastRandomContext::randbytes(size_t);
 
 void FastRandomContext::fillrand(Span<std::byte> output)
 {
diff --git a/src/random.h b/src/random.h
index 50f56ed911..3b15477ae9 100644
--- a/src/random.h
+++ b/src/random.h
@@ -211,7 +211,8 @@ public:
     }
 
     /** Generate random bytes. */
-    std::vector<unsigned char> randbytes(size_t len);
+    template <typename B = unsigned char>
+    std::vector<B> randbytes(size_t len);
 
     /** Fill a byte Span with random bytes. */
     void fillrand(Span<std::byte> output);