rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-27 13:23:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1414

Browse Source 
3b005275 ringct: add sc_check calls in MLSAG_Ver for ss and cc (moneromooo-monero)
2f1732a7 ringct: guard against bad data exceptions in worker threads (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-12-08 23:44:09 +02:00
commit e6b05ed95a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ringct/rctSigs.cpp
View File

@ -231,6 +231,11 @@ namespace rct {
} }
CHECK_AND_ASSERT_MES(dsRows <= rows, false, "Bad dsRows value"); CHECK_AND_ASSERT_MES(dsRows <= rows, false, "Bad dsRows value");
for (size_t i = 0; i < rv.ss.size(); ++i)
for (size_t j = 0; j < rv.ss[i].size(); ++j)
CHECK_AND_ASSERT_MES(sc_check(rv.ss[i][j].bytes) == 0, false, "Bad ss slot");
CHECK_AND_ASSERT_MES(sc_check(rv.cc.bytes) == 0, false, "Bad cc");
size_t i = 0, j = 0, ii = 0; size_t i = 0, j = 0, ii = 0;
key c, L, R, Hi; key c, L, R, Hi;
key c_old = copy(rv.cc); key c_old = copy(rv.cc);
@ -307,6 +312,8 @@ namespace rct {
// mask is a such that C = aG + bH, and b = amount // mask is a such that C = aG + bH, and b = amount
//verRange verifies that \sum Ci = C and that each Ci is a commitment to 0 or 2^i //verRange verifies that \sum Ci = C and that each Ci is a commitment to 0 or 2^i
bool verRange(const key & C, const rangeSig & as) { bool verRange(const key & C, const rangeSig & as) {
try
{
PERF_TIMER(verRange); PERF_TIMER(verRange);
key64 CiH; key64 CiH;
int i = 0; int i = 0;
@ -320,6 +327,9 @@ namespace rct {
if (!verifyBorromean(as.asig, as.Ci, CiH)) if (!verifyBorromean(as.asig, as.Ci, CiH))
return false; return false;
return true; return true;
}
// we can get deep throws from ge_frombytes_vartime if input isn't valid
catch (...) { return false; }
} }
key get_pre_mlsag_hash(const rctSig &rv) key get_pre_mlsag_hash(const rctSig &rv)
@ -485,6 +495,8 @@ namespace rct {
//This does a simplified version, assuming only post Rct //This does a simplified version, assuming only post Rct
//inputs //inputs
bool verRctMGSimple(const key &message, const mgSig &mg, const ctkeyV & pubs, const key & C) { bool verRctMGSimple(const key &message, const mgSig &mg, const ctkeyV & pubs, const key & C) {
try
{
PERF_TIMER(verRctMGSimple); PERF_TIMER(verRctMGSimple);
//setup vars //setup vars
size_t rows = 1; size_t rows = 1;
@ -500,6 +512,8 @@ namespace rct {
} }
//DP(C); //DP(C);
return MLSAG_Ver(message, M, mg, rows); return MLSAG_Ver(message, M, mg, rows);
}
catch (...) { return false; }
} }
@ -762,6 +776,8 @@ namespace rct {
//ver RingCT simple //ver RingCT simple
//assumes only post-rct style inputs (at least for max anonymity) //assumes only post-rct style inputs (at least for max anonymity)
bool verRctSimple(const rctSig & rv) { bool verRctSimple(const rctSig & rv) {
try
{
PERF_TIMER(verRctSimple); PERF_TIMER(verRctSimple);
CHECK_AND_ASSERT_MES(rv.type == RCTTypeSimple, false, "verRctSimple called on non simple rctSig"); CHECK_AND_ASSERT_MES(rv.type == RCTTypeSimple, false, "verRctSimple called on non simple rctSig");
@ -832,6 +848,9 @@ namespace rct {
} }
return true; return true;
}
// we can get deep throws from ge_frombytes_vartime if input isn't valid
catch (...) { return false; }
} }
//RingCT protocol //RingCT protocol