monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 20:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7063

Browse source 
7982ef5 crypto: fix non zero scalar being 0 after reducing (moneromooo-monero)
This commit is contained in:
luigi1111 2020-12-07 10:20:19 -06:00
commit 43788ffd2a
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 548 additions and 555 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/crypto/crypto.cpp
View file

@ -123,13 +123,17 @@ namespace crypto {
void random32_unbiased(unsigned char *bytes) void random32_unbiased(unsigned char *bytes)
{ {
// l = 2^252 + 27742317777372353535851937790883648493. // l = 2^252 + 27742317777372353535851937790883648493.
// it fits 15 in 32 bytes // l fits 15 times in 32 bytes (iow, 15 l is the highest multiple of l that fits in 32 bytes)
static const unsigned char limit[32] = { 0xe3, 0x6a, 0x67, 0x72, 0x8b, 0xce, 0x13, 0x29, 0x8f, 0x30, 0x82, 0x8c, 0x0b, 0xa4, 0x10, 0x39, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0 }; static const unsigned char limit[32] = { 0xe3, 0x6a, 0x67, 0x72, 0x8b, 0xce, 0x13, 0x29, 0x8f, 0x30, 0x82, 0x8c, 0x0b, 0xa4, 0x10, 0x39, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0 };
do while(1)
{ {
generate_random_bytes_thread_safe(32, bytes); generate_random_bytes_thread_safe(32, bytes);
} while (!sc_isnonzero(bytes) && !less32(bytes, limit)); // should be good about 15/16 of the time if (!less32(bytes, limit))
continue;
sc_reduce32(bytes); sc_reduce32(bytes);
if (sc_isnonzero(bytes))
break;
}
} }
/* generate a random 32-byte (256-bit) integer and copy it to res */ /* generate a random 32-byte (256-bit) integer and copy it to res */
static inline void random_scalar(ec_scalar &res) { static inline void random_scalar(ec_scalar &res) {

1091
tests/crypto/tests.txt
View file

File diff suppressed because one or more lines are too long