aboutsummaryrefslogtreecommitdiffstats
path: root/crypto.cpp
diff options
context:
space:
mode:
authorsubtly <subtly@users.noreply.github.com>2014-10-18 04:44:05 +0800
committersubtly <subtly@users.noreply.github.com>2014-10-18 04:44:05 +0800
commit5693de0f139c90c12abb7a2d1fc88ccecef97018 (patch)
tree7ccfd90121843870ab04fdb934fe2d48760ea65d /crypto.cpp
parent0abb8e9b1d9d3549068c5c3432444292b713cbc6 (diff)
parent693fe08bc996ff8403c75a770a735916dae4fc5b (diff)
downloaddexon-solidity-5693de0f139c90c12abb7a2d1fc88ccecef97018.tar
dexon-solidity-5693de0f139c90c12abb7a2d1fc88ccecef97018.tar.gz
dexon-solidity-5693de0f139c90c12abb7a2d1fc88ccecef97018.tar.bz2
dexon-solidity-5693de0f139c90c12abb7a2d1fc88ccecef97018.tar.lz
dexon-solidity-5693de0f139c90c12abb7a2d1fc88ccecef97018.tar.xz
dexon-solidity-5693de0f139c90c12abb7a2d1fc88ccecef97018.tar.zst
dexon-solidity-5693de0f139c90c12abb7a2d1fc88ccecef97018.zip
Merge branch 'develop' into crypto
Conflicts: test/TestHelperCrypto.h
Diffstat (limited to 'crypto.cpp')
-rw-r--r--crypto.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto.cpp b/crypto.cpp
index 0f0a5f60..1c5b9a30 100644
--- a/crypto.cpp
+++ b/crypto.cpp
@@ -344,7 +344,7 @@ int cryptoTest()
int ret = secp256k1_ecdsa_recover_compact((byte const*)hmsg.data(), (int)hmsg.size(), (byte const*)sig64.data(), pubkey.data(), &pubkeylen, 0, (int)t.vrs.v - 27);
pubkey.resize(pubkeylen);
cout << "RECPUB: " << dec << ret << " " << pubkeylen << " " << toHex(pubkey) << endl;
- cout << "SENDER: " << hex << toAddress(dev::eth::sha3(bytesConstRef(&pubkey).cropped(1))) << dec << endl;
+ cout << "SENDER: " << hex << toAddress(dev::sha3(bytesConstRef(&pubkey).cropped(1))) << dec << endl;
}
#endif
return 0;