[tor-commits] [tor/master] Enable DISABLE_DISABLING_ED25519.

[nickm at torproject.org]

commit 9504fabb02788bde6bd698fb2a148f25330dc021
Author: Fernando Fernandez Mancera <ffmancera at riseup.net>
Date:   Thu Apr 5 16:19:40 2018 +0200

    Enable DISABLE_DISABLING_ED25519.
    
    We are going to stop recommending 0.2.5 so there is no reason to keep the
    undef statement anymore.
    
    Fixes #20522.
    
    Signed-off-by: Fernando Fernandez Mancera <ffmancera at riseup.net>
---
 src/or/dirserv.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 68727f071..b3aaa25bf 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -259,11 +259,12 @@ dirserv_load_fingerprint_file(void)
  * identity to stop doing so.  This is going to be essential for good identity
  * security: otherwise anybody who can attack RSA-1024 but not Ed25519 could
  * just sign fake descriptors missing the Ed25519 key.  But we won't actually
- * be able to prevent that kind of thing until we're confident that there
- * isn't actually a legit reason to downgrade to 0.2.5.  So for now, we have
- * to leave this #undef.
+ * be able to prevent that kind of thing until we're confident that there isn't
+ * actually a legit reason to downgrade to 0.2.5.  Now we are not recommending
+ * 0.2.5 anymore so there is no reason to keep the #undef.
  */
-#undef DISABLE_DISABLING_ED25519
+
+#define DISABLE_DISABLING_ED25519
 
 /** Check whether <b>router</b> has a nickname/identity key combination that
  * we recognize from the fingerprint list, or an IP we automatically act on