[tor-commits] [metrics-lib/master] Actually return the signing key digest in votes.

[karsten at torproject.org]

commit 4299213a36517cff283db0d026230b2aa3a7f3ac
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri May 20 11:38:41 2016 +0200

    Actually return the signing key digest in votes.
---
 CHANGELOG.md                                                      | 1 +
 .../torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java    | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45ce45f..66da859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
      read for 0 <= x <= 100 rather than just x = { 10, 20, ..., 90 }.
    - Rename properties for overriding default descriptor source
      implementation classes.
+   - Actually return the signing key digest in network status votes.
 
  * Minor changes
    - Include a Torperf results line with more than one unrecognized
diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java
index 886612f..68f3b38 100644
--- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java
+++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java
@@ -488,9 +488,13 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl
     return this.dirKeyExpiresMillis;
   }
 
-  private String signingKeyDigest;
   public String getSigningKeyDigest() {
-    return this.signingKeyDigest;
+    String signingKeyDigest = null;
+    if (!this.directorySignatures.isEmpty()) {
+      signingKeyDigest = this.directorySignatures.get(
+          this.directorySignatures.firstKey()).getSigningKeyDigest();
+    }
+    return signingKeyDigest;
   }
 
   private int networkStatusVersion;