diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-08-11 13:14:26 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-08-11 13:14:26 +0000 |
| commit | ae6ab63f242f9e1da446737d9293c2415365bbc2 (patch) | |
| tree | debd8b10f5c7296444f074f8147d0b2d4818cd75 | |
| parent | 9c52846fe5ab6f0d2ef99f665844037f910a62cc (diff) | |
| parent | fe5a9db1e6d32f6d706140a6ddda6b40db80434a (diff) | |
| download | tor-ae6ab63f242f9e1da446737d9293c2415365bbc2.tar.gz tor-ae6ab63f242f9e1da446737d9293c2415365bbc2.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | changes/bug40078 | 3 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_ed25519.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug40078 b/changes/bug40078 new file mode 100644 index 0000000000..717309e076 --- /dev/null +++ b/changes/bug40078 @@ -0,0 +1,3 @@ + o Minor bugfix (crypto): + - Disable the unused batch verification feature of ed25519-donna. Fixes + bug 40078; bugfix on 0.2.6.1-alpha. Found by Henry de Valence.
\ No newline at end of file diff --git a/src/lib/crypt_ops/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c index 0a442bb739..98beaf75f8 100644 --- a/src/lib/crypt_ops/crypto_ed25519.c +++ b/src/lib/crypt_ops/crypto_ed25519.c @@ -102,7 +102,7 @@ static const ed25519_impl_t impl_donna = { ed25519_donna_open, ed25519_donna_sign, - ed25519_sign_open_batch_donna, + NULL, /* Don't use donna's batching code because of #40078 */ ed25519_donna_blind_secret_key, ed25519_donna_blind_public_key, |