aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-02-17 17:08:14 +0200
committerRiccardo Spagni <ric@spagni.net>2016-02-17 17:08:14 +0200
commit1db97139946909002ce2fc9056610e4409c06871 (patch)
tree64db656020d775dc2dcfa63ff9a8ef639739ad1f
parent8a6d93be25fda16a20716e30a92beb312214811f (diff)
parent1402a526af838cb84fed344fdd553d46e1e13871 (diff)
downloadmonzero-core-1db97139946909002ce2fc9056610e4409c06871.tar.gz
monzero-core-1db97139946909002ce2fc9056610e4409c06871.tar.xz
monzero-core-1db97139946909002ce2fc9056610e4409c06871.zip
Merge pull request #660
1402a52 epee: always call the PRNG through the locked API (moneromooo-monero)
-rw-r--r--contrib/epee/include/net/abstract_tcp_server2.inl2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 934132ea2..4fb6fa75d 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -144,7 +144,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
// create a random uuid
boost::uuids::uuid random_uuid;
// that stuff turns out to be included, even though it's from src... Taking advantage
- crypto::generate_random_bytes(sizeof(random_uuid), &random_uuid);
+ random_uuid = crypto::rand<boost::uuids::uuid>();
context.set_details(random_uuid, ip_, remote_ep.port(), is_income);
_dbg3("[sock " << socket_.native_handle() << "] new connection from " << print_connection_context_short(context) <<