diff options
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | ssh-vulnkey.1 | 8 | ||||
-rw-r--r-- | ssh-vulnkey.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 083e9058e..c094f6f63 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -45,6 +45,7 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low | |||
45 | * Move ssh-vulnkey's exit status documentation to a separate section | 45 | * Move ssh-vulnkey's exit status documentation to a separate section |
46 | (thanks, Hugh Daniel). | 46 | (thanks, Hugh Daniel). |
47 | * Document ssh-vulnkey key status descriptions (thanks, Hugh Daniel). | 47 | * Document ssh-vulnkey key status descriptions (thanks, Hugh Daniel). |
48 | * Add key type to ssh-vulnkey output. | ||
48 | 49 | ||
49 | -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200 | 50 | -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200 |
50 | 51 | ||
diff --git a/ssh-vulnkey.1 b/ssh-vulnkey.1 index ffbe3b085..0b999bdc8 100644 --- a/ssh-vulnkey.1 +++ b/ssh-vulnkey.1 | |||
@@ -92,14 +92,14 @@ The output from | |||
92 | looks like this: | 92 | looks like this: |
93 | .Pp | 93 | .Pp |
94 | .Bd -literal -offset indent | 94 | .Bd -literal -offset indent |
95 | /etc/ssh/ssh_host_key:1: COMPROMISED: 2048 xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx root@host | 95 | /etc/ssh/ssh_host_key:1: COMPROMISED: RSA1 2048 xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx root@host |
96 | /home/user/.ssh/id_dsa:1: Not blacklisted: 1024 xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx /home/user/.ssh/id_dsa.pub | 96 | /home/user/.ssh/id_dsa:1: Not blacklisted: DSA 1024 xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx /home/user/.ssh/id_dsa.pub |
97 | /home/user/.ssh/authorized_keys:3: Unknown (no blacklist information): 1024 xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx user@host | 97 | /home/user/.ssh/authorized_keys:3: Unknown (no blacklist information): RSA 1024 xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx user@host |
98 | .Ed | 98 | .Ed |
99 | .Pp | 99 | .Pp |
100 | Each line is of the following format: | 100 | Each line is of the following format: |
101 | .Pp | 101 | .Pp |
102 | .Dl Ar filename : Ns Ar line : Ar status : Ar length Ar fingerprint Ar comment | 102 | .Dl Ar filename : Ns Ar line : Ar status : Ar type Ar size Ar fingerprint Ar comment |
103 | .Pp | 103 | .Pp |
104 | It is important to distinguish between the possible values of | 104 | It is important to distinguish between the possible values of |
105 | .Ar status : | 105 | .Ar status : |
diff --git a/ssh-vulnkey.c b/ssh-vulnkey.c index 39c984db2..60ec7413f 100644 --- a/ssh-vulnkey.c +++ b/ssh-vulnkey.c | |||
@@ -80,8 +80,8 @@ describe_key(const char *filename, u_long linenum, const char *msg, | |||
80 | 80 | ||
81 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); | 81 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); |
82 | if (verbosity >= min_verbosity) | 82 | if (verbosity >= min_verbosity) |
83 | printf("%s:%lu: %s: %u %s %s\n", filename, linenum, msg, | 83 | printf("%s:%lu: %s: %s %u %s %s\n", filename, linenum, msg, |
84 | key_size(key), fp, comment); | 84 | key_type(key), key_size(key), fp, comment); |
85 | xfree(fp); | 85 | xfree(fp); |
86 | } | 86 | } |
87 | 87 | ||