Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +5 -5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b75f29438b - Show all commits

10
src/crypto/elliptic_common.cpp
View file

@ -139,11 +139,11 @@ namespace fc { namespace ecc {
std::string public_key::to_base58( const public_key_data &key ) std::string public_key::to_base58( const public_key_data &key )
{ {
uint32_t check = (uint32_t)sha256::hash(key.data, sizeof(key))._hash[0]; sha256 check = sha256::hash(key.data, sizeof(key));
static_assert(sizeof(key) + sizeof(check) == 37, "Elliptic public key size (or its hash) is incorrect"); static_assert(sizeof(key) + 4 == 37, "Elliptic public key size (or its hash) is incorrect");
array<char, 37> data; array<char, 37> data;
memcpy(data.data, key.begin(), key.size()); memcpy(data.data, key.begin(), key.size());
memcpy(data.begin() + key.size(), (const char*)&check, sizeof(check)); memcpy(data.begin() + key.size(), (const char*)check._hash, 4);
return fc::to_base58(data.begin(), data.size()); return fc::to_base58(data.begin(), data.size());
} }
@ -154,8 +154,8 @@ namespace fc { namespace ecc {
FC_ASSERT( s == sizeof(data) ); FC_ASSERT( s == sizeof(data) );
public_key_data key; public_key_data key;
uint32_t check = (uint32_t)sha256::hash(data.data, sizeof(key))._hash[0]; sha256 check = sha256::hash(data.data, sizeof(key));
FC_ASSERT( memcmp( (char*)&check, data.data + sizeof(key), sizeof(check) ) == 0 ); FC_ASSERT( memcmp( (char*)check._hash, data.data + sizeof(key), 4 ) == 0 );
memcpy( (char*)key.data, data.data, sizeof(key) ); memcpy( (char*)key.data, data.data, sizeof(key) );
return from_key_data(key); return from_key_data(key);
} }