arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-13 19:18:56 +00:00
Code Issues Releases Wiki Activity

crypto: fix valgrind issue with ed25519-donna, clean local variables

Browse Source
This commit is contained in:
Pavol Rusnak 2019-08-30 16:57:49 +02:00
parent 324cb651c6
commit db86092319
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/test.yml
View File

@ -50,6 +50,7 @@ test crypto:
- ./tests/test_check
- ./tests/test_openssl 1000
- ITERS=10 pipenv run pytest tests
- CK_TIMEOUT_MULTIPLIER=20 valgrind -q --error-exitcode=1 ./tests/test_check
# Legacy

9
crypto/ed25519-donna/ed25519-donna-impl-base.c
View File

@ -313,6 +313,8 @@ void ge25519_double_scalarmult_vartime(ge25519 *r, const ge25519 *p1, const bign
ge25519_p1p1_to_partial(r, &t);
}
curve25519_mul(r->t, t.x, t.y);
memzero(slide1, sizeof(slide1));
memzero(slide2, sizeof(slide2));
}
/* computes [s1]p1 + [s2]p2 */
@ -361,6 +363,8 @@ void ge25519_double_scalarmult_vartime2(ge25519 *r, const ge25519 *p1, const big
ge25519_p1p1_to_partial(r, &t);
}
curve25519_mul(r->t, t.x, t.y);
memzero(slide1, sizeof(slide1));
memzero(slide2, sizeof(slide2));
}
#endif
@ -376,7 +380,7 @@ void ge25519_double_scalarmult_vartime2(ge25519 *r, const ge25519 *p1, const big
static void ge25519_cmove_stride4(long * r, long * p, long * pos, long * n, int stride) {
long x0=r[0], x1=r[1], x2=r[2], x3=r[3], y0, y1, y2, y3;
for(; p<n; p+=stride) {
int flag=(p==pos);
volatile int flag=(p==pos);
y0 = p[0];
y1 = p[1];
y2 = p[2];
@ -396,7 +400,7 @@ static void ge25519_cmove_stride4(long * r, long * p, long * pos, long * n, int
static void ge25519_cmove_stride4b(long * r, long * p, long * pos, long * n, int stride) {
long x0=p[0], x1=p[1], x2=p[2], x3=p[3], y0, y1, y2, y3;
for(p+=stride; p<n; p+=stride) {
int flag=(p==pos);
volatile int flag=(p==pos);
y0 = p[0];
y1 = p[1];
y2 = p[2];
@ -476,6 +480,7 @@ void ge25519_scalarmult(ge25519 *r, const ge25519 *p1, const bignum256modm s1) {
ge25519_p1p1_to_partial(r, &t);
}
curve25519_mul(r->t, t.x, t.y);
memzero(slide1, sizeof(slide1));
}
void ge25519_scalarmult_base_choose_niels(ge25519_niels *t, const uint8_t table[256][96], uint32_t pos, signed char b) {