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 -8
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0c69c9b61b - Show all commits

2
include/fc/crypto/sha256.hpp
View file

@ -117,8 +117,6 @@ namespace raw {
void to_variant( const sha256& bi, variant& v, uint32_t max_depth ); void to_variant( const sha256& bi, variant& v, uint32_t max_depth );
void from_variant( const variant& v, sha256& bi, uint32_t max_depth ); void from_variant( const variant& v, sha256& bi, uint32_t max_depth );
uint64_t hash64(const char* buf, size_t len);
} // fc } // fc
namespace std namespace std
{ {

6
src/crypto/sha256.cpp
View file

@ -205,12 +205,6 @@ namespace fc {
memcpy( &bi, ve.data(), std::min<size_t>(ve.size(),sizeof(bi)) ); memcpy( &bi, ve.data(), std::min<size_t>(ve.size(),sizeof(bi)) );
} }
uint64_t hash64(const char* buf, size_t len)
{
sha256 sha_value = sha256::hash(buf,len);
return sha_value._hash[0];
}
template<> template<>
unsigned int hmac<sha256>::internal_block_size() const { return 64; } unsigned int hmac<sha256>::internal_block_size() const { return 64; }
} //end namespace fc } //end namespace fc