[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.207 and 1.208

version 1.207, 2015/07/20 00:30:01 version 1.208, 2015/07/30 00:01:34
Line 435 
Line 435 
 .It Cm Ciphers  .It Cm Ciphers
 Specifies the ciphers allowed for protocol version 2.  Specifies the ciphers allowed for protocol version 2.
 Multiple ciphers must be comma-separated.  Multiple ciphers must be comma-separated.
   If the specified value begins with a
   .Sq +
   character, then the specified ciphers will be appended to the default set
   instead of replacing them.
   .Pp
 The supported ciphers are:  The supported ciphers are:
 .Pp  .Pp
 .Bl -item -compact -offset indent  .Bl -item -compact -offset indent
Line 641 
Line 646 
 .It Cm HostbasedAcceptedKeyTypes  .It Cm HostbasedAcceptedKeyTypes
 Specifies the key types that will be accepted for hostbased authentication  Specifies the key types that will be accepted for hostbased authentication
 as a comma-separated pattern list.  as a comma-separated pattern list.
   Alternately if the specified value begins with a
   .Sq +
   character, then the specified key types will be appended to the default set
   instead of replacing them.
 The default for this option is:  The default for this option is:
 .Bd -literal -offset 3n  .Bd -literal -offset 3n
 ecdsa-sha2-nistp256-cert-v01@openssh.com,  ecdsa-sha2-nistp256-cert-v01@openssh.com,
Line 856 
Line 865 
 .It Cm KexAlgorithms  .It Cm KexAlgorithms
 Specifies the available KEX (Key Exchange) algorithms.  Specifies the available KEX (Key Exchange) algorithms.
 Multiple algorithms must be comma-separated.  Multiple algorithms must be comma-separated.
   Alternately if the specified value begins with a
   .Sq +
   character, then the specified methods will be appended to the default set
   instead of replacing them.
 The supported algorithms are:  The supported algorithms are:
 .Pp  .Pp
 .Bl -item -compact -offset indent  .Bl -item -compact -offset indent
Line 954 
Line 967 
 The MAC algorithm is used in protocol version 2  The MAC algorithm is used in protocol version 2
 for data integrity protection.  for data integrity protection.
 Multiple algorithms must be comma-separated.  Multiple algorithms must be comma-separated.
   If the specified value begins with a
   .Sq +
   character, then the specified algorithms will be appended to the default set
   instead of replacing them.
   .Pp
 The algorithms that contain  The algorithms that contain
 .Dq -etm  .Dq -etm
 calculate the MAC after encryption (encrypt-then-mac).  calculate the MAC after encryption (encrypt-then-mac).
Line 1314 
Line 1332 
 .It Cm PubkeyAcceptedKeyTypes  .It Cm PubkeyAcceptedKeyTypes
 Specifies the key types that will be accepted for public key authentication  Specifies the key types that will be accepted for public key authentication
 as a comma-separated pattern list.  as a comma-separated pattern list.
   Alternately if the specified value begins with a
   .Sq +
   character, then the specified key types will be appended to the default set
   instead of replacing them.
 The default for this option is:  The default for this option is:
 .Bd -literal -offset 3n  .Bd -literal -offset 3n
 ecdsa-sha2-nistp256-cert-v01@openssh.com,  ecdsa-sha2-nistp256-cert-v01@openssh.com,
Legend:
Removed from v.1.207  
changed lines
  Added in v.1.208