summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--ssh-vulnkey.12
-rw-r--r--ssh-vulnkey.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1df45586f..7c1c5fc49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low
48 * Add key type to ssh-vulnkey output. 48 * Add key type to ssh-vulnkey output.
49 * Fix error output if ssh-vulnkey fails to read key files, with the 49 * Fix error output if ssh-vulnkey fails to read key files, with the
50 exception of host keys unless -a was given (thanks, Hugh Daniel). 50 exception of host keys unless -a was given (thanks, Hugh Daniel).
51 * Make 'ssh-vulnkey -v' output each file name it examines (thanks, Hugh
52 Daniel).
51 53
52 -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200 54 -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200
53 55
diff --git a/ssh-vulnkey.1 b/ssh-vulnkey.1
index d0a450651..f8a575fe2 100644
--- a/ssh-vulnkey.1
+++ b/ssh-vulnkey.1
@@ -99,7 +99,7 @@ looks like this:
99.Pp 99.Pp
100Each line is of the following format (any lines beginning with 100Each line is of the following format (any lines beginning with
101.Dq # 101.Dq #
102should be ignored by scripts, although there will be none at present): 102should be ignored by scripts):
103.Pp 103.Pp
104.Dl Ar filename : Ns Ar line : Ar status : Ar type Ar size Ar fingerprint Ar comment 104.Dl Ar filename : Ns Ar line : Ar status : Ar type Ar size Ar fingerprint Ar comment
105.Pp 105.Pp
diff --git a/ssh-vulnkey.c b/ssh-vulnkey.c
index cade7b08a..3ffc3fa0c 100644
--- a/ssh-vulnkey.c
+++ b/ssh-vulnkey.c
@@ -154,6 +154,8 @@ do_filename(const char *filename, int quiet_open)
154 perror(filename); 154 perror(filename);
155 return -1; 155 return -1;
156 } 156 }
157 if (verbosity > 0)
158 printf("# %s\n", filename);
157 } else 159 } else
158 f = stdin; 160 f = stdin;
159 while (read_keyfile_line(f, filename, line, sizeof(line), 161 while (read_keyfile_line(f, filename, line, sizeof(line),