Commite0b6043

committed

Fix Scrypt crash when blockSize is 0 (GH#842)

This may change in the future. I prefer to recover, and use default block size when block size is 0. But this stops the immediate problem of a crash.

1 parent2c0455e commite0b6043Copy full SHA for e0b6043

File tree

-0

lines changed

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,15 @@ void Scrypt::ValidateParameters(size_t derivedLen, word64 cost, word64 blockSize`
`190`	`190`	`CRYPTOPP_ASSERT(blockSize !=0);`
`191`	`191`	`CRYPTOPP_ASSERT(parallelization !=0);`
`192`	`192`
	`193`	`+if (cost ==0)`
	`194`	`+throwInvalidArgument("Scrypt: cost cannot be 0");`
	`195`	`+`
	`196`	`+if (blockSize ==0)`
	`197`	`+throwInvalidArgument("Scrypt: block size cannot be 0");`
	`198`	`+`
	`199`	`+if (parallelization ==0)`
	`200`	`+throwInvalidArgument("Scrypt: parallelization cannot be 0");`
	`201`	`+`
`193`	`202`	`// Optimizer should remove this on 32-bit platforms`
`194`	`203`	`if (std::numeric_limits<size_t>::max() > std::numeric_limits<word32>::max())`
`195`	`204`	`{`

Comments

(0)