tor

commit d53f779853ee112ca152198f7695ac3b940719ae
parent 996328f374cb3f3b9820278b7e76ba1ee40dbfed
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  2 Jan 2018 10:07:13 -0500

Merge remote-tracking branch 'teor/ticket24001'

Diffstat:
A
changes/ticket24001
 | 
4
++++
M
src/or/nodelist.c
 | 
7
+++++++

2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/changes/ticket24001 b/changes/ticket24001
@@ -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".
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
@@ -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;
     }
   }