* New upstream release (http://www.openssh.org/txt/release-5.9).

  - Introduce sandboxing of the pre-auth privsep child using an optional
    sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
    mandatory restrictions on the syscalls the privsep child can perform.
  - Add new SHA256-based HMAC transport integrity modes from
    http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt.
  - The pre-authentication sshd(8) privilege separation slave process now
    logs via a socket shared with the master process, avoiding the need to
    maintain /dev/log inside the chroot (closes: #75043, #429243,
    #599240).
  - ssh(1) now warns when a server refuses X11 forwarding (closes:
    #504757).
  - sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths,
    separated by whitespace (closes: #76312).  The authorized_keys2
    fallback is deprecated but documented (closes: #560156).
  - ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4
    ToS/DSCP (closes: #498297).
  - ssh-add(1) now accepts keys piped from standard input.  E.g. "ssh-add
    - < /path/to/key" (closes: #229124).
  - Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691).
  - Say "required" rather than "recommended" in unprotected-private-key
    warning (LP: #663455).

1 files changed, 15 insertions, 15 deletions

diff --git a/moduli.0 b/moduli.0
index ded094ff0..c529488b2 100644
--- a/moduli.0
+++ b/moduli.0
@@ -1,7 +1,7 @@
 MODULI(5)                 OpenBSD Programmer's Manual                MODULI(5)
 
 NAME
-     moduli - Diffie Hellman moduli
+     moduli - Diffie-Hellman moduli
 
 DESCRIPTION
      The /etc/moduli file contains prime numbers and generators for use by
@@ -10,12 +10,12 @@ DESCRIPTION
      New moduli may be generated with ssh-keygen(1) using a two-step process.
      An initial candidate generation pass, using ssh-keygen -G, calculates
      numbers that are likely to be useful.  A second primality testing pass,
-     using ssh-keygen -T provides a high degree of assurance that the numbers
-     are prime and are safe for use in Diffie Hellman operations by sshd(8).
+     using ssh-keygen -T, provides a high degree of assurance that the numbers
+     are prime and are safe for use in Diffie-Hellman operations by sshd(8).
      This moduli format is used as the output from each pass.
 
      The file consists of newline-separated records, one per modulus,
-     containing seven space separated fields.  These fields are as follows:
+     containing seven space-separated fields.  These fields are as follows:
 
            timestamp    The time that the modulus was last processed as
                         YYYYMMDDHHMMSS.
@@ -23,12 +23,12 @@ DESCRIPTION
            type         Decimal number specifying the internal structure of
                         the prime modulus.  Supported types are:
 
-                        0     Unknown, not tested
+                        0     Unknown, not tested.
                         2     "Safe" prime; (p-1)/2 is also prime.
                         4     Sophie Germain; (p+1)*2 is also prime.
 
                         Moduli candidates initially produced by ssh-keygen(1)
-                        are Sophie Germain primes (type 4).  Futher primality
+                        are Sophie Germain primes (type 4).  Further primality
                         testing with ssh-keygen(1) produces safe prime moduli
                         (type 2) that are ready for use in sshd(8).  Other
                         types are not used by OpenSSH.
@@ -37,18 +37,18 @@ DESCRIPTION
                         that the number has been subjected to represented as a
                         bitmask of the following values:
 
-                        0x00  Not tested
+                        0x00  Not tested.
                         0x01  Composite number - not prime.
-                        0x02  Sieve of Eratosthenes
-                        0x04  Probabalistic Miller-Rabin primality tests.
+                        0x02  Sieve of Eratosthenes.
+                        0x04  Probabilistic Miller-Rabin primality tests.
 
                         The ssh-keygen(1) moduli candidate generation uses the
                         Sieve of Eratosthenes (flag 0x02).  Subsequent
                         ssh-keygen(1) primality tests are Miller-Rabin tests
                         (flag 0x04).
 
-           trials       Decimal number indicating of primaility trials that
-                        have been performed on the modulus.
+           trials       Decimal number indicating the number of primality
+                        trials that have been performed on the modulus.
 
            size         Decimal number indicating the size of the prime in
                         bits.
@@ -58,15 +58,15 @@ DESCRIPTION
 
            modulus      The modulus itself in hexadecimal.
 
-     When performing Diffie Hellman Group Exchange, sshd(8) first estimates
-     the size of the modulus required to produce enough Diffie Hellman output
+     When performing Diffie-Hellman Group Exchange, sshd(8) first estimates
+     the size of the modulus required to produce enough Diffie-Hellman output
      to sufficiently key the selected symmetric cipher.  sshd(8) then randomly
      selects a modulus from /etc/moduli that best meets the size requirement.
 
 SEE ALSO
-     ssh-keygen(1), sshd(8),
+     ssh-keygen(1), sshd(8)
 
      Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer
      Protocol, RFC 4419, 2006.
 
-OpenBSD 4.9                      June 26, 2008                     OpenBSD 4.9
+OpenBSD 5.0                    October 14, 2010                    OpenBSD 5.0