diff options
author | Colin Watson <cjwatson@debian.org> | 2008-06-08 17:41:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2008-06-08 17:41:03 +0000 |
commit | e26f750fce722ef7350ce881b87acdd0fa3912c9 (patch) | |
tree | ac47e3d6bfc5532f7bf6cb5d8c75a32af368dbd9 | |
parent | da162da0416abb367ea8a415eb90d072a01fa020 (diff) |
Add cross-references to ssh-vulnkey(1) to ssh(1), ssh-add(1),
ssh-keygen(1), and sshd(8) (closes: #484451).
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | ssh-add.1 | 5 | ||||
-rw-r--r-- | ssh-keygen.1 | 1 | ||||
-rw-r--r-- | ssh.1 | 1 | ||||
-rw-r--r-- | sshd.8 | 1 |
5 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index cb05066eb..98afc3a11 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -6,6 +6,8 @@ openssh (1:4.7p1-13) UNRELEASED; urgency=low | |||
6 | server (LP: #232391). To override the blacklist check in ssh | 6 | server (LP: #232391). To override the blacklist check in ssh |
7 | temporarily, use 'ssh -o UseBlacklistedKeys=yes'; there is no override | 7 | temporarily, use 'ssh -o UseBlacklistedKeys=yes'; there is no override |
8 | for the blacklist check in ssh-add. | 8 | for the blacklist check in ssh-add. |
9 | * Add cross-references to ssh-vulnkey(1) to ssh(1), ssh-add(1), | ||
10 | ssh-keygen(1), and sshd(8) (closes: #484451). | ||
9 | 11 | ||
10 | -- Colin Watson <cjwatson@debian.org> Fri, 30 May 2008 23:26:25 +0100 | 12 | -- Colin Watson <cjwatson@debian.org> Fri, 30 May 2008 23:26:25 +0100 |
11 | 13 | ||
@@ -75,6 +75,10 @@ environment variable must contain the name of its socket for | |||
75 | .Nm | 75 | .Nm |
76 | to work. | 76 | to work. |
77 | .Pp | 77 | .Pp |
78 | Any keys recorded in the blacklist of known-compromised keys (see | ||
79 | .Xr ssh-vulnkey 1 ) | ||
80 | will be refused. | ||
81 | .Pp | ||
78 | The options are as follows: | 82 | The options are as follows: |
79 | .Bl -tag -width Ds | 83 | .Bl -tag -width Ds |
80 | .It Fl c | 84 | .It Fl c |
@@ -174,6 +178,7 @@ is unable to contact the authentication agent. | |||
174 | .Xr ssh 1 , | 178 | .Xr ssh 1 , |
175 | .Xr ssh-agent 1 , | 179 | .Xr ssh-agent 1 , |
176 | .Xr ssh-keygen 1 , | 180 | .Xr ssh-keygen 1 , |
181 | .Xr ssh-vulnkey 1 , | ||
177 | .Xr sshd 8 | 182 | .Xr sshd 8 |
178 | .Sh AUTHORS | 183 | .Sh AUTHORS |
179 | OpenSSH is a derivative of the original and free | 184 | OpenSSH is a derivative of the original and free |
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 4e629de74..fc460b5ac 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -447,6 +447,7 @@ The file format is described in | |||
447 | .Xr ssh 1 , | 447 | .Xr ssh 1 , |
448 | .Xr ssh-add 1 , | 448 | .Xr ssh-add 1 , |
449 | .Xr ssh-agent 1 , | 449 | .Xr ssh-agent 1 , |
450 | .Xr ssh-vulnkey 1 , | ||
450 | .Xr moduli 5 , | 451 | .Xr moduli 5 , |
451 | .Xr sshd 8 | 452 | .Xr sshd 8 |
452 | .Rs | 453 | .Rs |
@@ -1372,6 +1372,7 @@ manual page for more information. | |||
1372 | .Xr ssh-argv0 1 , | 1372 | .Xr ssh-argv0 1 , |
1373 | .Xr ssh-keygen 1 , | 1373 | .Xr ssh-keygen 1 , |
1374 | .Xr ssh-keyscan 1 , | 1374 | .Xr ssh-keyscan 1 , |
1375 | .Xr ssh-vulnkey 1 , | ||
1375 | .Xr tun 4 , | 1376 | .Xr tun 4 , |
1376 | .Xr hosts.equiv 5 , | 1377 | .Xr hosts.equiv 5 , |
1377 | .Xr ssh_config 5 , | 1378 | .Xr ssh_config 5 , |
@@ -837,6 +837,7 @@ The content of this file is not sensitive; it can be world-readable. | |||
837 | .Xr ssh-agent 1 , | 837 | .Xr ssh-agent 1 , |
838 | .Xr ssh-keygen 1 , | 838 | .Xr ssh-keygen 1 , |
839 | .Xr ssh-keyscan 1 , | 839 | .Xr ssh-keyscan 1 , |
840 | .Xr ssh-vulnkey 1 , | ||
840 | .Xr chroot 2 , | 841 | .Xr chroot 2 , |
841 | .Xr hosts_access 5 , | 842 | .Xr hosts_access 5 , |
842 | .Xr login.conf 5 , | 843 | .Xr login.conf 5 , |