mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'teor/bug18384'

Browse Source
This commit is contained in:
Nick Mathewson 2016-02-25 13:46:34 -05:00
commit 3687526c66
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug18384 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (crypto, static analysis):
- Silence spurious clang-scan warnings in the ed25519_donna code
by explicitly initialising some objects.
Fixes bug 18384; bugfix on 0f3eeca9 in 0.2.7.2-alpha.
Patch by "teor".

8
src/ext/ed25519/donna/ed25519_tor.c
View File

@ -168,8 +168,8 @@ ed25519_donna_seckey_expand(unsigned char *sk, const unsigned char *skseed)
int
ed25519_donna_pubkey(unsigned char *pk, const unsigned char *sk)
{
bignum256modm a;
ge25519 ALIGN(16) A;
bignum256modm a = {0};
ge25519 ALIGN(16) A = {{0}, {0}, {0}, {0}};
/* A = aB */
expand256_modm(a, sk, 32);
@ -204,8 +204,8 @@ ed25519_donna_sign(unsigned char *sig, const unsigned char *m, size_t mlen,
const unsigned char *sk, const unsigned char *pk)
{
ed25519_hash_context ctx;
bignum256modm r, S, a;
ge25519 ALIGN(16) R;
bignum256modm r = {0}, S, a;
ge25519 ALIGN(16) R = {{0}, {0}, {0}, {0}};
hash_512bits hashr, hram;
/* This is equivalent to the removed `ED25519_FN(ed25519_sign)` routine,