restore: sanity check --keyfile

turnkeylinux · Oct 23, 2013 · 49067c7 · 49067c7
1 parent 21738a6
commit 49067c7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/cmd_restore.py b/cmd_restore.py
@@ -312,6 +312,11 @@ def main():
                 fatal("keyfile %s does not exist or is not a file" % `val`)
 
             opt_key = file(val).read()
+            try:
+                keypacket.fingerprint(opt_key)
+            except keypacket.Error:
+                fatal("'%s' is not a valid keyfile created with tklbam-escrow" % val)
+
         elif opt == '--address':
             opt_address = val
         elif opt == '--time':