From 0e9f0da51f0ab708d904ca5b8896ec2d98ccfc1e Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 6 Jan 2015 19:09:04 +0000
Subject: [PATCH] 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>
---
 src/allmydata/frontends/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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]
-- 
2.45.2