[BACK]Return to sshd_config.5 CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sshd_config.5 between version 1.187 and 1.188

version 1.187, 2014/12/22 08:24:17 version 1.188, 2014/12/22 09:05:17
Line 419 
Line 419 
 The list of available ciphers may also be obtained using the  The list of available ciphers may also be obtained using the
 .Fl Q  .Fl Q
 option of  option of
 .Xr ssh 1 .  .Xr ssh 1
   with an argument of
   .Dq cipher .
 .It Cm ClientAliveCountMax  .It Cm ClientAliveCountMax
 Sets the number of client alive messages (see below) which may be  Sets the number of client alive messages (see below) which may be
 sent without  sent without
Line 761 
Line 763 
 diffie-hellman-group-exchange-sha256,  diffie-hellman-group-exchange-sha256,
 diffie-hellman-group14-sha1  diffie-hellman-group14-sha1
 .Ed  .Ed
   .Pp
   The list of available key exchange algorithms may also be obtained using the
   .Fl Q
   option of
   .Xr ssh 1
   with an argument of
   .Dq kex .
 .It Cm KeyRegenerationInterval  .It Cm KeyRegenerationInterval
 In protocol version 1, the ephemeral server key is automatically regenerated  In protocol version 1, the ephemeral server key is automatically regenerated
 after this many seconds (if it has been used).  after this many seconds (if it has been used).
Line 879 
Line 888 
 umac-64@openssh.com,umac-128@openssh.com,  umac-64@openssh.com,umac-128@openssh.com,
 hmac-sha2-256,hmac-sha2-512  hmac-sha2-256,hmac-sha2-512
 .Ed  .Ed
   .Pp
   The list of available MAC algorithms may also be obtained using the
   .Fl Q
   option of
   .Xr ssh 1
   with an argument of
   .Dq mac .
 .It Cm Match  .It Cm Match
 Introduces a conditional block.  Introduces a conditional block.
 If all of the criteria on the  If all of the criteria on the
Legend:
Removed from v.1.187  
changed lines
  Added in v.1.188