2 files changed, 42 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index b61c9dc54..299842d51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:4.7p1-10) UNRELEASED; urgency=low
+
+  * Add a FILES section to ssh-vulnkey(1) (thanks, Hugh Daniel).
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 14 May 2008 09:47:29 +0100
+
 openssh (1:4.7p1-9) unstable; urgency=critical
 
   * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-8.
diff --git a/ssh-vulnkey.1 b/ssh-vulnkey.1
index 9286e73c0..41de104de 100644
--- a/ssh-vulnkey.1
+++ b/ssh-vulnkey.1
@@ -138,6 +138,42 @@ The key fingerprint may be generated using
 .Pp
 This strict format is necessary to allow the blacklist file to be checked
 quickly, using a binary-search algorithm.
+.Sh FILES
+.Bl -tag -width Ds
+.It Pa ~/.ssh/id_rsa
+If present, contains the protocol version 2 RSA authentication identity of
+the user.
+.It Pa ~/.ssh/id_dsa
+If present, contains the protocol version 2 DSA authentication identity of
+the user.
+.It Pa ~/.ssh/identity
+If present, contains the protocol version 1 RSA authentication identity of
+the user.
+.It Pa ~/.ssh/authorized_keys
+If present, lists the public keys (RSA/DSA) that can be used for logging in
+as this user.
+.It Pa ~/.ssh/authorized_keys2
+Obsolete name for
+.Pa ~/.ssh/authorized_keys .
+This file may still be present on some old systems, but should not be
+created if it is missing.
+.It Pa /etc/ssh/ssh_host_rsa_key
+If present, contains the protocol version 2 RSA identity of the system.
+.It Pa /etc/ssh/ssh_host_dsa_key
+If present, contains the protocol version 2 DSA identity of the system.
+.It Pa /etc/ssh/ssh_host_key
+If present, contains the protocol version 1 RSA identity of the system.
+.It Pa /etc/ssh/blacklist. Ns Ar TYPE Ns Pa - Ns Ar LENGTH
+If present, lists the blacklisted keys of type
+.Ar TYPE
+.Pf ( Dq RSA1 ,
+.Dq RSA ,
+or
+.Dq DSA )
+and bit length
+.Ar LENGTH .
+The format of this file is described above.
+.El
 .Sh SEE ALSO
 .Xr ssh-keygen 1 ,
 .Xr sshd 8