1 files changed, 38 insertions, 20 deletions

diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index fc07e8861..bda5f0c24 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -13,28 +13,28 @@ Index: b/moduli.5
 --- a/moduli.5
 +++ b/moduli.5
 @@ -21,7 +21,7 @@
- .Nd Diffie Hellman moduli
+ .Nd Diffie-Hellman moduli
  .Sh DESCRIPTION
  The
 -.Pa /etc/moduli
 +.Pa /etc/ssh/moduli
- file contains prime numbers and generators for use by 
+ file contains prime numbers and generators for use by
  .Xr sshd 8
  in the Diffie-Hellman Group Exchange key exchange method.
-@@ -111,7 +111,7 @@
- Diffie Hellman output to sufficiently key the selected symmetric cipher.
+@@ -110,7 +110,7 @@
+ Diffie-Hellman output to sufficiently key the selected symmetric cipher.
  .Xr sshd 8
  then randomly selects a modulus from
 -.Fa /etc/moduli
 +.Fa /etc/ssh/moduli
  that best meets the size requirement.
- .Pp
  .Sh SEE ALSO
+ .Xr ssh-keygen 1 ,
 Index: b/ssh-keygen.1
 ===================================================================
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
-@@ -147,9 +147,7 @@
+@@ -149,9 +149,7 @@
  .Pa ~/.ssh/id_dsa
  or
  .Pa ~/.ssh/id_rsa .
@@ -45,22 +45,40 @@ Index: b/ssh-keygen.1
  .Pp
  Normally this program generates the key and asks for a file in which
  to store the private key.
-@@ -393,9 +391,7 @@
- .It Fl q
- Silence
- .Nm ssh-keygen .
--Used by
+@@ -197,9 +195,7 @@
+ For each of the key types (rsa1, rsa, dsa and ecdsa) for which host keys
+ do not exist, generate the host keys with the default key file path,
+ an empty passphrase, default bits for the key type, and default comment.
+-This is used by
 -.Pa /etc/rc
--when creating a new key.
-+Used by system administration scripts when creating a new key.
- .It Fl R Ar hostname
- Removes all keys belonging to
- .Ar hostname
+-to generate new host keys.
++This is used by system administration scripts to generate new host keys.
+ .It Fl a Ar trials
+ Specifies the number of primality tests to perform when screening DH-GEX
+ candidates using the
+@@ -535,7 +531,7 @@
+ Valid generator values are 2, 3, and 5.
+ .Pp
+ Screened DH groups may be installed in
+-.Pa /etc/moduli .
++.Pa /etc/ssh/moduli .
+ It is important that this file contains moduli of a range of bit lengths and
+ that both ends of a connection share common moduli.
+ .Sh CERTIFICATES
+@@ -661,7 +657,7 @@
+ where the user wishes to log in using public key authentication.
+ There is no need to keep the contents of this file secret.
+ .Pp
+-.It Pa /etc/moduli
++.It Pa /etc/ssh/moduli
+ Contains Diffie-Hellman groups used for DH-GEX.
+ The file format is described in
+ .Xr moduli 5 .
 Index: b/ssh.1
 ===================================================================
 --- a/ssh.1
 +++ b/ssh.1
-@@ -726,6 +726,10 @@
+@@ -731,6 +731,10 @@
  .Sx HISTORY
  section of
  .Xr ssl 8
@@ -84,7 +102,7 @@ Index: b/sshd.8
  It forks a new
  daemon for each incoming connection.
  The forked daemons handle
-@@ -850,7 +850,7 @@
+@@ -853,7 +853,7 @@
  .Xr ssh 1 ) .
  It should only be writable by root.
  .Pp
@@ -93,7 +111,7 @@ Index: b/sshd.8
  Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange".
  The file format is described in
  .Xr moduli 5 .
-@@ -948,7 +948,6 @@
+@@ -951,7 +951,6 @@
  .Xr ssh-vulnkey 1 ,
  .Xr chroot 2 ,
  .Xr hosts_access 5 ,
@@ -105,7 +123,7 @@ Index: b/sshd_config.5
 ===================================================================
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -221,8 +221,7 @@
+@@ -222,8 +222,7 @@
  By default, no banner is displayed.
  .It Cm ChallengeResponseAuthentication
  Specifies whether challenge-response authentication is allowed (e.g. via