Hoist m_rng to Channel

6 files changed, 2 insertions, 4 deletions

diff --git a/src/tls/tls_channel.cpp b/src/tls/tls_channel.cpp
index 453ef9062..849f920fe 100644
--- a/src/tls/tls_channel.cpp
+++ b/src/tls/tls_channel.cpp
@@ -24,6 +24,7 @@ Channel::Channel(std::function<void (const byte[], size_t)> socket_output_fn,
    m_proc_fn(proc_fn),
    m_handshake_fn(handshake_complete),
    m_state(nullptr),
+   m_rng(rng),
    m_session_manager(session_manager),
    m_writer(socket_output_fn, rng),
    m_handshake_completed(false),
diff --git a/src/tls/tls_channel.h b/src/tls/tls_channel.h
index ae8791f6b..0f3427df5 100644
--- a/src/tls/tls_channel.h
+++ b/src/tls/tls_channel.h
@@ -149,6 +149,7 @@ class BOTAN_DLL Channel
 
       std::unique_ptr<class Handshake_State> m_state;
 
+      RandomNumberGenerator& m_rng;
       Session_Manager& m_session_manager;
       Record_Writer m_writer;
       Record_Reader m_reader;
diff --git a/src/tls/tls_client.cpp b/src/tls/tls_client.cpp
index dfcd89acf..339299087 100644
--- a/src/tls/tls_client.cpp
+++ b/src/tls/tls_client.cpp
@@ -51,7 +51,6 @@ Client::Client(std::function<void (const byte[], size_t)> output_fn,
                std::function<std::string (std::vector<std::string>)> next_protocol) :
    Channel(output_fn, proc_fn, handshake_fn, session_manager, rng),
    m_policy(policy),
-   m_rng(rng),
    m_creds(creds),
    m_hostname(hostname),
    m_port(port)
diff --git a/src/tls/tls_client.h b/src/tls/tls_client.h
index a803df32d..5326e9699 100644
--- a/src/tls/tls_client.h
+++ b/src/tls/tls_client.h
@@ -82,7 +82,6 @@ class BOTAN_DLL Client : public Channel
       class Handshake_State* new_handshake_state() override;
 
       const Policy& m_policy;
-      RandomNumberGenerator& m_rng;
       Credentials_Manager& m_creds;
       const std::string m_hostname;
       const u16bit m_port;
diff --git a/src/tls/tls_server.cpp b/src/tls/tls_server.cpp
index 9aea56b1c..8303f9aaf 100644
--- a/src/tls/tls_server.cpp
+++ b/src/tls/tls_server.cpp
@@ -216,7 +216,6 @@ Server::Server(std::function<void (const byte[], size_t)> output_fn,
                const std::vector<std::string>& next_protocols) :
    Channel(output_fn, proc_fn, handshake_fn, session_manager, rng),
    m_policy(policy),
-   m_rng(rng),
    m_creds(creds),
    m_possible_protocols(next_protocols)
    {
diff --git a/src/tls/tls_server.h b/src/tls/tls_server.h
index 4b9cc7d28..adce8237b 100644
--- a/src/tls/tls_server.h
+++ b/src/tls/tls_server.h
@@ -57,7 +57,6 @@ class BOTAN_DLL Server : public Channel
       class Handshake_State* new_handshake_state() override;
 
       const Policy& m_policy;
-      RandomNumberGenerator& m_rng;
       Credentials_Manager& m_creds;
 
       std::vector<std::string> m_possible_protocols;