torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'teor/ticket24001'

Browse Source
This commit is contained in:
Nick Mathewson
2018-01-02 10:07:13 -05:00
parent 996328f374 53f350182e
commit d53f779853
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/ticket24001
+4
View File
@@ -0,0 +1,4 @@
o Minor features (code correctness, descriptors):
- Check that microdesc ed25519 ids are non-zero in node_get_ed25519_id(),
before returning them.
Implements 24001, patch by "aruna1234".
src/or/nodelist.c
+7
View File
@@ -908,9 +908,12 @@ node_get_ed25519_id(const node_t *node)
{
const ed25519_public_key_t *ri_pk = NULL;
const ed25519_public_key_t *md_pk = NULL;
if (node->ri) {
if (node->ri->cache_info.signing_key_cert) {
ri_pk = &node->ri->cache_info.signing_key_cert->signing_key;
/* Checking whether routerinfo ed25519 is all zero.
* Our descriptor parser should make sure this never happens. */
if (BUG(ed25519_public_key_is_zero(ri_pk)))
ri_pk = NULL;
}
@@ -919,6 +922,10 @@ node_get_ed25519_id(const node_t *node)
if (node->md) {
if (node->md->ed25519_identity_pkey) {
md_pk = node->md->ed25519_identity_pkey;
/* Checking whether microdesc ed25519 is all zero.
* Our descriptor parser should make sure this never happens. */
if (BUG(ed25519_public_key_is_zero(md_pk)))
md_pk = NULL;
}
}