From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 6 Jan 2015 19:09:04 +0000 (+0000)
Subject: Reserve all keytypes starting with "ssh-" in an accounts file, rather than only ... 
X-Git-Tag: allmydata-tahoe-1.10.1a1~87
X-Git-Url: https://git.rkrishnan.org/about.html?a=commitdiff_plain;h=0e9f0da51f0ab708d904ca5b8896ec2d98ccfc1e;p=tahoe-lafs%2Ftahoe-lafs.git

Reserve all keytypes starting with "ssh-" in an accounts file, rather than only "ssh-rsa" and "ssh-dsa".

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/frontends/auth.py b/src/allmydata/frontends/auth.py
index 4a874d8d..fa7fd379 100644
--- a/src/allmydata/frontends/auth.py
+++ b/src/allmydata/frontends/auth.py
@@ -33,7 +33,7 @@ class AccountFileChecker:
             if line.startswith("#") or not line:
                 continue
             name, passwd, rest = line.split(None, 2)
-            if passwd in ("ssh-dss", "ssh-rsa"):
+            if passwd.startswith("ssh-"):
                 bits = rest.split()
                 keystring = " ".join([passwd] + bits[:-1])
                 rootcap = bits[-1]