patch from karsten to not use or accept expired certs. fixes bug 851.

svn:r17208

diff --git a/ChangeLog b/ChangeLog
index 283b4f4d1090262a597f6a240f7703a480f402ec..9be7dccba84503c289abbdb45358c2be9b2e40b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ Changes in version 0.2.1.7-alpha - 2008-11-07
       detailed logging on credential switching, set CREDENTIAL_LOG_LEVEL
       in common/compat.c to LOG_NOTICE or higher. Patch by Jacob Appelbaum
       and Steven Murdoch.
+    - Do not use or believe expired certificates.  Patch from Karsten.
+      Fixes bug 851.
 
   o Minor features:
     - Now NodeFamily and MyFamily config options allow spaces in

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 611ee4e704006b49554500e899b475a6aa0ee34f..07bbb159b95a1d41276a65289ff7e62badee8a77 100644 (file)
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1568,6 +1568,7 @@ dirvote_perform_vote(void)
   networkstatus_t *ns;
   char *contents;
   pending_vote_t *pending_vote;
+  time_t now = time(NULL);
 
   int status;
   const char *msg = "";
@@ -1575,6 +1576,9 @@ dirvote_perform_vote(void)
   if (!cert || !key) {
     log_warn(LD_NET, "Didn't find key/certificate to generate v3 vote");
     return -1;
+  } else if (now < cert->expires) {
+    log_warn(LD_NET, "Can't generate v3 vote with expired certificate");
+    return -1;
   }
   if (!(ns = dirserv_generate_networkstatus_vote_obj(key, cert)))
     return -1;

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 889c0e70c58ce41ec5e6311abdc7d83e0fbdca02..6458d0c04a197a55f2290c5e2bf395896839637e 100644 (file)
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -387,6 +387,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
   smartlist_t *unrecognized = smartlist_create();
   smartlist_t *missing_authorities = smartlist_create();
   int severity;
+  time_t now = time(NULL);
 
   tor_assert(consensus->type == NS_TYPE_CONSENSUS);
 
@@ -403,7 +404,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
         smartlist_add(unrecognized, voter);
         ++n_unknown;
         continue;
-      } else if (!cert) {
+      } else if (!cert || now > cert->expires) {
         smartlist_add(need_certs_from, voter);
         ++n_missing_key;
         continue;