cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

EVMHost: Add size%192 check to bn128pairing

Browse Source 
And also refactor resultWithFailure
This commit is contained in:
Alex Beregszaszi 2022-09-26 20:41:16 +02:00
parent 8b7010872c
commit f40d1d654d
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/EVMHost.cpp
View File

@ -495,9 +495,7 @@ evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
evmc::result EVMHost::precompileModExp(evmc_message const&) noexcept evmc::result EVMHost::precompileModExp(evmc_message const&) noexcept
{ {
// TODO implement // TODO implement
evmc::result result({}); return resultWithFailure();
result.status_code = EVMC_FAILURE;
return result;
} }
evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noexcept evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noexcept
@ -773,6 +771,11 @@ evmc::result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noex
evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept
{ {
// Input must be divisible by 192.
// TODO: validate points
if (_message.input_size % 192)
return resultWithFailure();
// This is a partial implementation - it always returns "success" // This is a partial implementation - it always returns "success"
bytes static data = fromHex("0000000000000000000000000000000000000000000000000000000000000001"); bytes static data = fromHex("0000000000000000000000000000000000000000000000000000000000000001");
return resultWithGas(_message, data); return resultWithGas(_message, data);
@ -786,11 +789,14 @@ evmc::result EVMHost::precompileGeneric(
if (_inOut.count(input)) if (_inOut.count(input))
return resultWithGas(_message, _inOut.at(input)); return resultWithGas(_message, _inOut.at(input));
else else
{ return resultWithFailure();
}
evmc::result EVMHost::resultWithFailure() noexcept
{
evmc::result result({}); evmc::result result({});
result.status_code = EVMC_FAILURE; result.status_code = EVMC_FAILURE;
return result; return result;
}
} }
evmc::result EVMHost::resultWithGas( evmc::result EVMHost::resultWithGas(

1
test/EVMHost.h
View File

@ -116,6 +116,7 @@ private:
/// @returns a result object with no gas usage and result data taken from @a _data. /// @returns a result object with no gas usage and result data taken from @a _data.
/// @note The return value is only valid as long as @a _data is alive! /// @note The return value is only valid as long as @a _data is alive!
static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept; static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept;
static evmc::result resultWithFailure() noexcept;
evmc::VM& m_vm; evmc::VM& m_vm;
/// EVM version requested by the testing tool /// EVM version requested by the testing tool