[tor-commits] [tor/master] protovers: during voting, assert that we are not voting to shut down.

[nickm at torproject.org]

commit 501fc3bbc6e6e4003c99b0bfd95deb06b2df9580
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 22 10:25:02 2016 -0400

    protovers: during voting, assert that we are not voting to shut down.
    
    As a failsafe, we should make sure that no authority ever votes for
    a set of protocol versions that it does not itself support.
---
 src/or/dirserv.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index d7a707d..e8d60d0 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2934,6 +2934,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
     tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
                "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
 
+  /* We are not allowed to vote to require anything we don't have. */
+  tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));
+  tor_assert(protover_all_supported(v3_out->required_client_protocols, NULL));
+
+  /* We should not recommend anything we don't have. */
+  tor_assert_nonfatal(protover_all_supported(
+                         v3_out->recommended_relay_protocols, NULL));
+  tor_assert_nonfatal(protover_all_supported(
+                         v3_out->recommended_client_protocols, NULL));
+
   v3_out->package_lines = smartlist_new();
   {
     config_line_t *cl;