nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restore the operation of extra_strong in ed25519_secret_key_generate

Browse Source
This commit is contained in:
Nick Mathewson 2014-08-26 23:15:14 -04:00
parent 006e6d3b6f
commit 22760c4899
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/crypto_ed25519.c
View File

@ -21,10 +21,15 @@ int
ed25519_secret_key_generate(ed25519_secret_key_t *seckey_out,
int extra_strong)
{
(void) extra_strong;
if (ed25519_ref10_seckey(seckey_out->seckey) < 0)
return -1;
return 0;
int r;
uint8_t seed[32];
if (! extra_strong || crypto_strongest_rand(seed, sizeof(seed)) < 0)
crypto_rand((char*)seed, sizeof(seed));
r = ed25519_ref10_seckey_expand(seckey_out->seckey, seed);
memwipe(seed, 0, sizeof(seed));
return r < 0 ? -1 : 0;
}
int
@ -51,10 +56,10 @@ ed25519_public_key_generate(ed25519_public_key_t *pubkey_out,
int
ed25519_keypair_generate(ed25519_keypair_t *keypair_out, int extra_strong)
{
(void) extra_strong;
if (ed25519_ref10_keygen(keypair_out->pubkey.pubkey,
keypair_out->seckey.seckey)<0)
if (ed25519_secret_key_generate(&keypair_out->seckey, extra_strong) < 0)
return -1;
if (ed25519_public_key_generate(&keypair_out->pubkey,
&keypair_out->seckey)<0)
return -1;
return 0;
}