kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move get_proof_of_trust_hash from util.h to p2p_protocol_defs.h

Browse source 
This avoids having to include p2p_protocol_defs.h in util.h,
as util.h is used a lot, and p2p_protocol_defs.h includes
a lot of other things that most users don't need.
This commit is contained in:
moneromooo-monero 2017-07-27 15:46:47 +01:00
parent ab594cfee9
commit 06aea2cf0a
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/util.h
View file

@ -40,7 +40,6 @@
#include <string> #include <string>
#include "crypto/hash.h" #include "crypto/hash.h"
#include "p2p/p2p_protocol_defs.h"
/*! \brief Various Tools /*! \brief Various Tools
* *
@ -108,14 +107,6 @@ namespace tools
bool sanitize_locale(); bool sanitize_locale();
inline crypto::hash get_proof_of_trust_hash(const nodetool::proof_of_trust& pot)
{
std::string s;
s.append(reinterpret_cast<const char*>(&pot.peer_id), sizeof(pot.peer_id));
s.append(reinterpret_cast<const char*>(&pot.time), sizeof(pot.time));
return crypto::cn_fast_hash(s.data(), s.size());
}
/*! \brief Defines a signal handler for win32 and *nix /*! \brief Defines a signal handler for win32 and *nix
*/ */
class signal_handler class signal_handler

2
src/p2p/net_node.inl
View file

@ -1382,7 +1382,7 @@ namespace nodetool
} }
crypto::public_key pk = AUTO_VAL_INIT(pk); crypto::public_key pk = AUTO_VAL_INIT(pk);
epee::string_tools::hex_to_pod(::config::P2P_REMOTE_DEBUG_TRUSTED_PUB_KEY, pk); epee::string_tools::hex_to_pod(::config::P2P_REMOTE_DEBUG_TRUSTED_PUB_KEY, pk);
crypto::hash h = tools::get_proof_of_trust_hash(tr); crypto::hash h = get_proof_of_trust_hash(tr);
if(!crypto::check_signature(h, pk, tr.sign)) if(!crypto::check_signature(h, pk, tr.sign))
{ {
LOG_ERROR("check_trust failed: sign check failed"); LOG_ERROR("check_trust failed: sign check failed");

8
src/p2p/p2p_protocol_defs.h
View file

@ -440,6 +440,14 @@ namespace nodetool
#endif #endif
inline crypto::hash get_proof_of_trust_hash(const nodetool::proof_of_trust& pot)
{
std::string s;
s.append(reinterpret_cast<const char*>(&pot.peer_id), sizeof(pot.peer_id));
s.append(reinterpret_cast<const char*>(&pot.time), sizeof(pot.time));
return crypto::cn_fast_hash(s.data(), s.size());
}
} }