aboutsummaryrefslogtreecommitdiffstats
path: root/crypto.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'crypto.cpp')
-rw-r--r--crypto.cpp428
1 files changed, 255 insertions, 173 deletions
diff --git a/crypto.cpp b/crypto.cpp
index 67286bfc..08236135 100644
--- a/crypto.cpp
+++ b/crypto.cpp
@@ -27,8 +27,9 @@
#include <libdevcore/Log.h>
#include <libethereum/Transaction.h>
#include <boost/test/unit_test.hpp>
-#include <libdevcrypto/EC.h>
-#include "TestHelperCrypto.h"
+#include <libdevcrypto/SHA3.h>
+#include <libdevcrypto/ECDHE.h>
+#include <libdevcrypto/CryptoPP.h>
using namespace std;
using namespace dev;
@@ -37,197 +38,281 @@ using namespace CryptoPP;
BOOST_AUTO_TEST_SUITE(devcrypto)
+static Secp256k1 s_secp256k1;
+static CryptoPP::AutoSeededRandomPool s_rng;
+static CryptoPP::OID s_curveOID(CryptoPP::ASN1::secp256k1());
+static CryptoPP::DL_GroupParameters_EC<CryptoPP::ECP> s_params(s_curveOID);
+static CryptoPP::DL_GroupParameters_EC<CryptoPP::ECP>::EllipticCurve s_curve(s_params.GetCurve());
+
+BOOST_AUTO_TEST_CASE(verify_secert)
+{
+ h256 empty;
+ KeyPair kNot(empty);
+ BOOST_REQUIRE(!kNot.address());
+ KeyPair k(sha3(empty));
+ BOOST_REQUIRE(k.address());
+}
+
BOOST_AUTO_TEST_CASE(common_encrypt_decrypt)
{
- string message("Now is the time for all good persons to come to the aide of humanity.");
+ string message("Now is the time for all good persons to come to the aid of humanity.");
bytes m = asBytes(message);
bytesConstRef bcr(&m);
KeyPair k = KeyPair::create();
bytes cipher;
encrypt(k.pub(), bcr, cipher);
- assert(cipher != asBytes(message) && cipher.size() > 0);
+ BOOST_REQUIRE(cipher != asBytes(message) && cipher.size() > 0);
bytes plain;
decrypt(k.sec(), bytesConstRef(&cipher), plain);
- assert(asString(plain) == message);
- assert(plain == asBytes(message));
+ BOOST_REQUIRE(asString(plain) == message);
+ BOOST_REQUIRE(plain == asBytes(message));
}
-BOOST_AUTO_TEST_CASE(cryptopp_vs_secp256k1)
+BOOST_AUTO_TEST_CASE(cryptopp_cryptopp_secp256k1libport)
{
- ECIES<ECP>::Decryptor d(pp::PRNG(), pp::secp256k1());
- ECIES<ECP>::Encryptor e(d.GetKey());
-
- Secret s;
- pp::SecretFromDL_PrivateKey_EC(d.GetKey(), s);
+ secp256k1_start();
- Public p;
- pp::PublicFromDL_PublicKey_EC(e.GetKey(), p);
+ // base secret
+ Secret secret(sha3("privacy"));
- assert(dev::toAddress(s) == right160(dev::sha3(p.ref())));
+ // we get ec params from signer
+ ECDSA<ECP, SHA3_256>::Signer signer;
- Secret previous = s;
- for (auto i = 0; i < 30; i++)
+ // e := sha3(msg)
+ bytes e(fromHex("0x01"));
+ e.resize(32);
+ int tests = 2;
+ while (sha3(&e, &e), secret = sha3(secret.asBytes()), tests--)
{
- ECIES<ECP>::Decryptor d(pp::PRNG(), pp::secp256k1());
- ECIES<ECP>::Encryptor e(d.GetKey());
+ KeyPair key(secret);
+ Public pkey = key.pub();
+ signer.AccessKey().Initialize(s_params, secretToExponent(secret));
- Secret s;
- pp::SecretFromDL_PrivateKey_EC(d.GetKey(), s);
- assert(s != previous);
+ h256 he(sha3(e));
+ Integer heInt(he.asBytes().data(), 32);
+ h256 k(crypto::kdf(secret, he));
+ Integer kInt(k.asBytes().data(), 32);
+ kInt %= s_params.GetSubgroupOrder()-1;
+
+ ECP::Point rp = s_params.ExponentiateBase(kInt);
+ Integer const& q = s_params.GetGroupOrder();
+ Integer r = s_params.ConvertElementToInteger(rp);
+
+ Integer kInv = kInt.InverseMod(q);
+ Integer s = (kInv * (Integer(secret.asBytes().data(), 32)*r + heInt)) % q;
+ BOOST_REQUIRE(!!r && !!s);
+
+ Signature sig;
+ sig[64] = rp.y.IsOdd() ? 1 : 0;
+ r.Encode(sig.data(), 32);
+ s.Encode(sig.data() + 32, 32);
+
+ Public p = dev::recover(sig, he);
+ BOOST_REQUIRE(p == pkey);
- Public p;
- pp::PublicFromDL_PublicKey_EC(e.GetKey(), p);
-
- assert(dev::toAddress(s) == right160(dev::sha3(p.ref())));
+ // verify w/cryptopp
+ BOOST_REQUIRE(s_secp256k1.verify(pkey, sig, bytesConstRef(&e)));
+
+ // verify with secp256k1lib
+ byte encpub[65] = {0x04};
+ memcpy(&encpub[1], pkey.data(), 64);
+ byte dersig[72];
+ size_t cssz = DSAConvertSignatureFormat(dersig, 72, DSA_DER, sig.data(), 64, DSA_P1363);
+ BOOST_CHECK(cssz <= 72);
+ BOOST_REQUIRE(1 == secp256k1_ecdsa_verify(he.data(), sizeof(he), dersig, cssz, encpub, 65));
}
}
-BOOST_AUTO_TEST_CASE(cryptopp_keys_cryptor_sipaseckp256k1)
+BOOST_AUTO_TEST_CASE(cryptopp_ecdsa_sipaseckp256k1)
{
- KeyPair k = KeyPair::create();
- Secret s = k.sec();
-
- // Convert secret to exponent used by pp
- Integer e = pp::ExponentFromSecret(s);
-
- // Test that exported DL_EC private is same as exponent from Secret
- CryptoPP::DL_PrivateKey_EC<CryptoPP::ECP> privatek;
- privatek.AccessGroupParameters().Initialize(pp::secp256k1());
- privatek.SetPrivateExponent(e);
- assert(e == privatek.GetPrivateExponent());
-
- // Test that exported secret is same as decryptor(privatek) secret
- ECIES<ECP>::Decryptor d;
- d.AccessKey().AccessGroupParameters().Initialize(pp::secp256k1());
- d.AccessKey().SetPrivateExponent(e);
- assert(d.AccessKey().GetPrivateExponent() == e);
-
- // Test that decryptor->encryptor->public == private->makepublic->public
- CryptoPP::DL_PublicKey_EC<CryptoPP::ECP> pubk;
- pubk.AccessGroupParameters().Initialize(pp::secp256k1());
- privatek.MakePublicKey(pubk);
-
- ECIES<ECP>::Encryptor enc(d);
- assert(pubk.GetPublicElement() == enc.AccessKey().GetPublicElement());
-
- // Test against sipa/seckp256k1
- Public p;
- pp::PublicFromExponent(pp::ExponentFromSecret(s), p);
- assert(toAddress(s) == dev::right160(dev::sha3(p.ref())));
- assert(k.pub() == p);
-}
-
-BOOST_AUTO_TEST_CASE(cryptopp_public_export_import)
-{
- ECIES<ECP>::Decryptor d(pp::PRNG(), pp::secp256k1());
- ECIES<ECP>::Encryptor e(d.GetKey());
-
- Secret s;
- pp::SecretFromDL_PrivateKey_EC(d.GetKey(), s);
- Public p;
- pp::PublicFromDL_PublicKey_EC(e.GetKey(), p);
- Address addr = right160(dev::sha3(p.ref()));
- assert(toAddress(s) == addr);
+ secp256k1_start();
- KeyPair l(s);
- assert(l.address() == addr);
+ // cryptopp integer encoding
+ Integer nHex("f2ee15ea639b73fa3db9b34a245bdfa015c260c598b211bf05a1ecc4b3e3b4f2H");
+ Integer nB(fromHex("f2ee15ea639b73fa3db9b34a245bdfa015c260c598b211bf05a1ecc4b3e3b4f2").data(), 32);
+ BOOST_REQUIRE(nHex == nB);
- DL_PublicKey_EC<ECP> pub;
- pub.Initialize(pp::secp256k1(), pp::PointFromPublic(p));
- assert(pub.GetPublicElement() == e.GetKey().GetPublicElement());
-
- KeyPair k = KeyPair::create();
- Public p2;
- pp::PublicFromExponent(pp::ExponentFromSecret(k.sec()), p2);
- assert(k.pub() == p2);
+ bytes sbytes(fromHex("0xFFFF"));
+ Secret secret(sha3(sbytes));
+ KeyPair key(secret);
- Address a = k.address();
- Address a2 = toAddress(k.sec());
- assert(a2 == a);
+ bytes m(1, 0xff);
+ int tests = 2;
+ while (m[0]++, tests--)
+ {
+ h256 hm(sha3(m));
+ Integer hInt(hm.asBytes().data(), 32);
+ h256 k(hm ^ key.sec());
+ Integer kInt(k.asBytes().data(), 32);
+
+ // raw sign w/cryptopp (doesn't pass through cryptopp hash filter)
+ ECDSA<ECP, SHA3_256>::Signer signer;
+ signer.AccessKey().Initialize(s_params, secretToExponent(key.sec()));
+ Integer r, s;
+ signer.RawSign(kInt, hInt, r, s);
+
+ // verify cryptopp raw-signature w/cryptopp
+ ECDSA<ECP, SHA3_256>::Verifier verifier;
+ verifier.AccessKey().Initialize(s_params, publicToPoint(key.pub()));
+ Signature sigppraw;
+ r.Encode(sigppraw.data(), 32);
+ s.Encode(sigppraw.data() + 32, 32);
+ BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), sigppraw.data(), 64));
+// BOOST_REQUIRE(crypto::verify(key.pub(), sigppraw, bytesConstRef(&m)));
+ BOOST_REQUIRE(dev::verify(key.pub(), sigppraw, hm));
+
+ // sign with cryptopp, verify, recover w/sec256lib
+ Signature seclibsig(dev::sign(key.sec(), hm));
+ BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), seclibsig.data(), 64));
+// BOOST_REQUIRE(crypto::verify(key.pub(), seclibsig, bytesConstRef(&m)));
+ BOOST_REQUIRE(dev::verify(key.pub(), seclibsig, hm));
+ BOOST_REQUIRE(dev::recover(seclibsig, hm) == key.pub());
+
+ // sign with cryptopp (w/hash filter?), verify with cryptopp
+ bytes sigppb(signer.MaxSignatureLength());
+ size_t ssz = signer.SignMessage(s_rng, m.data(), m.size(), sigppb.data());
+ Signature sigpp;
+ memcpy(sigpp.data(), sigppb.data(), 64);
+ BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), sigppb.data(), ssz));
+// BOOST_REQUIRE(crypto::verify(key.pub(), sigpp, bytesConstRef(&m)));
+ BOOST_REQUIRE(dev::verify(key.pub(), sigpp, hm));
+
+ // sign with cryptopp and stringsource hash filter
+ string sigstr;
+ StringSource ssrc(asString(m), true, new SignerFilter(s_rng, signer, new StringSink(sigstr)));
+ FixedHash<sizeof(Signature)> retsig((byte const*)sigstr.data(), Signature::ConstructFromPointer);
+ BOOST_REQUIRE(verifier.VerifyMessage(m.data(), m.size(), retsig.data(), 64));
+// BOOST_REQUIRE(crypto::verify(key.pub(), retsig, bytesConstRef(&m)));
+ BOOST_REQUIRE(dev::verify(key.pub(), retsig, hm));
+
+ /// verification w/sec256lib
+ // requires public key and sig in standard format
+ byte encpub[65] = {0x04};
+ memcpy(&encpub[1], key.pub().data(), 64);
+ byte dersig[72];
+
+ // verify sec256lib sig w/sec256lib
+ size_t cssz = DSAConvertSignatureFormat(dersig, 72, DSA_DER, seclibsig.data(), 64, DSA_P1363);
+ BOOST_CHECK(cssz <= 72);
+ BOOST_REQUIRE(1 == secp256k1_ecdsa_verify(hm.data(), sizeof(hm), dersig, cssz, encpub, 65));
+
+ // verify cryptopp-raw sig w/sec256lib
+ cssz = DSAConvertSignatureFormat(dersig, 72, DSA_DER, sigppraw.data(), 64, DSA_P1363);
+ BOOST_CHECK(cssz <= 72);
+ BOOST_REQUIRE(1 == secp256k1_ecdsa_verify(hm.data(), sizeof(hm), dersig, cssz, encpub, 65));
+
+ // verify cryptopp sig w/sec256lib
+ cssz = DSAConvertSignatureFormat(dersig, 72, DSA_DER, sigppb.data(), 64, DSA_P1363);
+ BOOST_CHECK(cssz <= 72);
+ BOOST_REQUIRE(1 == secp256k1_ecdsa_verify(hm.data(), sizeof(hm), dersig, cssz, encpub, 65));
+ }
}
BOOST_AUTO_TEST_CASE(ecies_eckeypair)
{
KeyPair k = KeyPair::create();
- string message("Now is the time for all good persons to come to the aide of humanity.");
+ string message("Now is the time for all good persons to come to the aid of humanity.");
string original = message;
bytes b = asBytes(message);
- encrypt(k.pub(), b);
- assert(b != asBytes(original));
+ s_secp256k1.encrypt(k.pub(), b);
+ BOOST_REQUIRE(b != asBytes(original));
- decrypt(k.sec(), b);
- assert(b == asBytes(original));
+ s_secp256k1.decrypt(k.sec(), b);
+ BOOST_REQUIRE(b == asBytes(original));
}
-BOOST_AUTO_TEST_CASE(ecdhe_aes128_ctr_sha3mac)
+BOOST_AUTO_TEST_CASE(ecdh)
{
- // New connections require new ECDH keypairs
- // Every new connection requires a new EC keypair
- // Every new trust requires a new EC keypair
- // All connections should share seed for PRF (or PRNG) for nonces
+ cnote << "Testing ecdh...";
+
+ ECDH<ECP>::Domain dhLocal(s_curveOID);
+ SecByteBlock privLocal(dhLocal.PrivateKeyLength());
+ SecByteBlock pubLocal(dhLocal.PublicKeyLength());
+ dhLocal.GenerateKeyPair(s_rng, privLocal, pubLocal);
+
+ ECDH<ECP>::Domain dhRemote(s_curveOID);
+ SecByteBlock privRemote(dhRemote.PrivateKeyLength());
+ SecByteBlock pubRemote(dhRemote.PublicKeyLength());
+ dhRemote.GenerateKeyPair(s_rng, privRemote, pubRemote);
+
+ assert(dhLocal.AgreedValueLength() == dhRemote.AgreedValueLength());
+
+ // local: send public to remote; remote: send public to local
+
+ // Local
+ SecByteBlock sharedLocal(dhLocal.AgreedValueLength());
+ assert(dhLocal.Agree(sharedLocal, privLocal, pubRemote));
+
+ // Remote
+ SecByteBlock sharedRemote(dhRemote.AgreedValueLength());
+ assert(dhRemote.Agree(sharedRemote, privRemote, pubLocal));
+
+ // Test
+ Integer ssLocal, ssRemote;
+ ssLocal.Decode(sharedLocal.BytePtr(), sharedLocal.SizeInBytes());
+ ssRemote.Decode(sharedRemote.BytePtr(), sharedRemote.SizeInBytes());
+ assert(ssLocal != 0);
+ assert(ssLocal == ssRemote);
+ // Now use our keys
+ KeyPair a = KeyPair::create();
+ byte puba[65] = {0x04};
+ memcpy(&puba[1], a.pub().data(), 64);
+ KeyPair b = KeyPair::create();
+ byte pubb[65] = {0x04};
+ memcpy(&pubb[1], b.pub().data(), 64);
+ ECDH<ECP>::Domain dhA(s_curveOID);
+ Secret shared;
+ BOOST_REQUIRE(dhA.Agree(shared.data(), a.sec().data(), pubb));
+ BOOST_REQUIRE(shared);
}
-BOOST_AUTO_TEST_CASE(cryptopp_ecies_message)
+BOOST_AUTO_TEST_CASE(ecdhe)
{
- cnote << "Testing cryptopp_ecies_message...";
-
- string const message("Now is the time for all good persons to come to the aide of humanity.");
-
- ECIES<ECP>::Decryptor localDecryptor(pp::PRNG(), pp::secp256k1());
- SavePrivateKey(localDecryptor.GetPrivateKey());
+ cnote << "Testing ecdhe...";
- ECIES<ECP>::Encryptor localEncryptor(localDecryptor);
- SavePublicKey(localEncryptor.GetPublicKey());
-
- ECIES<ECP>::Decryptor futureDecryptor;
- LoadPrivateKey(futureDecryptor.AccessPrivateKey());
- futureDecryptor.GetPrivateKey().ThrowIfInvalid(pp::PRNG(), 3);
+ ECDHE a, b;
+ BOOST_CHECK_NE(a.pubkey(), b.pubkey());
- ECIES<ECP>::Encryptor futureEncryptor;
- LoadPublicKey(futureEncryptor.AccessPublicKey());
- futureEncryptor.GetPublicKey().ThrowIfInvalid(pp::PRNG(), 3);
-
- // encrypt/decrypt with local
- string cipherLocal;
- StringSource ss1 (message, true, new PK_EncryptorFilter(pp::PRNG(), localEncryptor, new StringSink(cipherLocal) ) );
- string plainLocal;
- StringSource ss2 (cipherLocal, true, new PK_DecryptorFilter(pp::PRNG(), localDecryptor, new StringSink(plainLocal) ) );
-
- // encrypt/decrypt with future
- string cipherFuture;
- StringSource ss3 (message, true, new PK_EncryptorFilter(pp::PRNG(), futureEncryptor, new StringSink(cipherFuture) ) );
- string plainFuture;
- StringSource ss4 (cipherFuture, true, new PK_DecryptorFilter(pp::PRNG(), futureDecryptor, new StringSink(plainFuture) ) );
+ ECDHE local;
+ ECDHE remote;
- // decrypt local w/future
- string plainFutureFromLocal;
- StringSource ss5 (cipherLocal, true, new PK_DecryptorFilter(pp::PRNG(), futureDecryptor, new StringSink(plainFutureFromLocal) ) );
+ // local tx pubkey -> remote
+ Secret sremote;
+ remote.agree(local.pubkey(), sremote);
- // decrypt future w/local
- string plainLocalFromFuture;
- StringSource ss6 (cipherFuture, true, new PK_DecryptorFilter(pp::PRNG(), localDecryptor, new StringSink(plainLocalFromFuture) ) );
+ // remote tx pbukey -> local
+ Secret slocal;
+ local.agree(remote.pubkey(), slocal);
+
+ BOOST_REQUIRE(sremote);
+ BOOST_REQUIRE(slocal);
+ BOOST_REQUIRE_EQUAL(sremote, slocal);
+}
+
+BOOST_AUTO_TEST_CASE(ecdhe_aes128_ctr_sha3mac)
+{
+ // New connections require new ECDH keypairs
+ // Every new connection requires a new EC keypair
+ // Every new trust requires a new EC keypair
+ // All connections should share seed for PRF (or PRNG) for nonces
- assert(plainLocal == message);
- assert(plainFuture == plainLocal);
- assert(plainFutureFromLocal == plainLocal);
- assert(plainLocalFromFuture == plainLocal);
}
BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
{
const int aesKeyLen = 16;
- assert(sizeof(char) == sizeof(byte));
+ BOOST_REQUIRE(sizeof(char) == sizeof(byte));
// generate test key
AutoSeededRandomPool rng;
@@ -235,22 +320,29 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
rng.GenerateBlock(key, key.size());
// cryptopp uses IV as nonce/counter which is same as using nonce w/0 ctr
- byte ctr[AES::BLOCKSIZE];
- rng.GenerateBlock(ctr, sizeof(ctr));
+ FixedHash<AES::BLOCKSIZE> ctr;
+ rng.GenerateBlock(ctr.data(), sizeof(ctr));
+
+ // used for decrypt
+ FixedHash<AES::BLOCKSIZE> ctrcopy(ctr);
- string text = "Now is the time for all good persons to come to the aide of humanity.";
- // c++11 ftw
+ string text = "Now is the time for all good persons to come to the aid of humanity.";
unsigned char const* in = (unsigned char*)&text[0];
unsigned char* out = (unsigned char*)&text[0];
string original = text;
+ string doublespeak = text + text;
string cipherCopy;
try
{
CTR_Mode<AES>::Encryption e;
- e.SetKeyWithIV(key, key.size(), ctr);
+ e.SetKeyWithIV(key, key.size(), ctr.data());
+
+ // 68 % 255 should be difference of counter
e.ProcessData(out, in, text.size());
- assert(text != original);
+ ctr = h128(u128(ctr) + text.size() % 16);
+
+ BOOST_REQUIRE(text != original);
cipherCopy = text;
}
catch(CryptoPP::Exception& e)
@@ -261,9 +353,9 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
try
{
CTR_Mode< AES >::Decryption d;
- d.SetKeyWithIV(key, key.size(), ctr);
+ d.SetKeyWithIV(key, key.size(), ctrcopy.data());
d.ProcessData(out, in, text.size());
- assert(text == original);
+ BOOST_REQUIRE(text == original);
}
catch(CryptoPP::Exception& e)
{
@@ -274,16 +366,16 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
// reencrypt ciphertext...
try
{
- assert(cipherCopy != text);
+ BOOST_REQUIRE(cipherCopy != text);
in = (unsigned char*)&cipherCopy[0];
out = (unsigned char*)&cipherCopy[0];
CTR_Mode<AES>::Encryption e;
- e.SetKeyWithIV(key, key.size(), ctr);
+ e.SetKeyWithIV(key, key.size(), ctrcopy.data());
e.ProcessData(out, in, text.size());
// yep, ctr mode.
- assert(cipherCopy == original);
+ BOOST_REQUIRE(cipherCopy == original);
}
catch(CryptoPP::Exception& e)
{
@@ -295,7 +387,7 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_ctr)
BOOST_AUTO_TEST_CASE(cryptopp_aes128_cbc)
{
const int aesKeyLen = 16;
- assert(sizeof(char) == sizeof(byte));
+ BOOST_REQUIRE(sizeof(char) == sizeof(byte));
AutoSeededRandomPool rng;
SecByteBlock key(0x00, aesKeyLen);
@@ -310,11 +402,11 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_cbc)
CryptoPP::CBC_Mode<Rijndael>::Encryption cbcEncryption(key, key.size(), iv);
cbcEncryption.ProcessData((byte*)&string128[0], (byte*)&string128[0], string128.size());
- assert(string128 != plainOriginal);
+ BOOST_REQUIRE(string128 != plainOriginal);
CBC_Mode<Rijndael>::Decryption cbcDecryption(key, key.size(), iv);
cbcDecryption.ProcessData((byte*)&string128[0], (byte*)&string128[0], string128.size());
- assert(plainOriginal == string128);
+ BOOST_REQUIRE(plainOriginal == string128);
// plaintext whose size isn't divisible by block size must use stream filter for padding
@@ -324,10 +416,10 @@ BOOST_AUTO_TEST_CASE(cryptopp_aes128_cbc)
string cipher;
StreamTransformationFilter* aesStream = new StreamTransformationFilter(cbcEncryption, new StringSink(cipher));
StringSource source(string192, true, aesStream);
- assert(cipher.size() == 32);
+ BOOST_REQUIRE(cipher.size() == 32);
cbcDecryption.ProcessData((byte*)&cipher[0], (byte*)&string192[0], cipher.size());
- assert(string192 == plainOriginal);
+ BOOST_REQUIRE(string192 == plainOriginal);
}
BOOST_AUTO_TEST_CASE(eth_keypairs)
@@ -339,20 +431,15 @@ BOOST_AUTO_TEST_CASE(eth_keypairs)
BOOST_REQUIRE(p.pub() == Public(fromHex("97466f2b32bc3bb76d4741ae51cd1d8578b48d3f1e68da206d47321aec267ce78549b514e4453d74ef11b0cd5e4e4c364effddac8b51bcfc8de80682f952896f")));
BOOST_REQUIRE(p.address() == Address(fromHex("8a40bfaa73256b60764c1bf40675a99083efb075")));
{
- eth::Transaction t;
- t.nonce = 0;
- t.type = eth::Transaction::MessageCall;
- t.receiveAddress = h160(fromHex("944400f4b88ac9589a0f17ed4671da26bddb668b"));
- t.value = 1000;
- auto rlp = t.rlp(false);
+ eth::Transaction t(1000, 0, 0, h160(fromHex("944400f4b88ac9589a0f17ed4671da26bddb668b")), bytes(), 0, p.secret());
+ auto rlp = t.rlp(eth::WithoutSignature);
cnote << RLP(rlp);
cnote << toHex(rlp);
- cnote << t.sha3(false);
- t.sign(p.secret());
- rlp = t.rlp(true);
+ cnote << t.sha3(eth::WithoutSignature);
+ rlp = t.rlp(eth::WithSignature);
cnote << RLP(rlp);
cnote << toHex(rlp);
- cnote << t.sha3(true);
+ cnote << t.sha3(eth::WithSignature);
BOOST_REQUIRE(t.sender() == p.address());
}
@@ -365,23 +452,18 @@ int cryptoTest()
secp256k1_start();
KeyPair p(Secret(fromHex("3ecb44df2159c26e0f995712d4f39b6f6e499b40749b1cf1246c37f9516cb6a4")));
- assert(p.pub() == Public(fromHex("97466f2b32bc3bb76d4741ae51cd1d8578b48d3f1e68da206d47321aec267ce78549b514e4453d74ef11b0cd5e4e4c364effddac8b51bcfc8de80682f952896f")));
- assert(p.address() == Address(fromHex("8a40bfaa73256b60764c1bf40675a99083efb075")));
+ BOOST_REQUIRE(p.pub() == Public(fromHex("97466f2b32bc3bb76d4741ae51cd1d8578b48d3f1e68da206d47321aec267ce78549b514e4453d74ef11b0cd5e4e4c364effddac8b51bcfc8de80682f952896f")));
+ BOOST_REQUIRE(p.address() == Address(fromHex("8a40bfaa73256b60764c1bf40675a99083efb075")));
{
- eth::Transaction t;
- t.nonce = 0;
- t.type = eth::Transaction::MessageCall;
- t.receiveAddress = h160(fromHex("944400f4b88ac9589a0f17ed4671da26bddb668b"));
- t.value = 1000;
- auto rlp = t.rlp(false);
+ eth::Transaction t(1000, 0, 0, h160(fromHex("944400f4b88ac9589a0f17ed4671da26bddb668b")), bytes(), 0, p.secret());
+ auto rlp = t.rlp(eth::WithoutSignature);
cnote << RLP(rlp);
cnote << toHex(rlp);
- cnote << t.sha3(false);
- t.sign(p.secret());
- rlp = t.rlp(true);
+ cnote << t.sha3(eth::WithoutSignature);
+ rlp = t.rlp(eth::WithSignature);
cnote << RLP(rlp);
cnote << toHex(rlp);
- cnote << t.sha3(true);
+ cnote << t.sha3(eth::WithSignature);
assert(t.sender() == p.address());
}
@@ -407,8 +489,8 @@ int cryptoTest()
auto msg = t.rlp(false);
cout << "TX w/o SIG: " << RLP(msg) << endl;
- cout << "RLP(TX w/o SIG): " << toHex(t.rlpString(false)) << endl;
- std::string hmsg = sha3(t.rlpString(false), false);
+ cout << "RLP(TX w/o SIG): " << toHex(t.rlp(false)) << endl;
+ std::string hmsg = sha3(t.rlp(false), false);
cout << "SHA256(RLP(TX w/o SIG)): 0x" << toHex(hmsg) << endl;
bytes privkey = sha3Bytes("123");
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 07:06:04 +0800