diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
commit | a25ec0b132c44c9e341e08464ff830de06b81126 (patch) | |
tree | e20842d80f9e25cb6cf09525abea63f7bf655dd7 /sshd_config.5 | |
parent | 1b816ea846aca3ee89e7995373ace609e9518424 (diff) | |
parent | 70847d299887abb96f8703ca99db6d817b78960e (diff) |
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index ce9888d03..5e1c7943c 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -34,8 +34,8 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd_config.5,v 1.74 2007/03/01 16:19:33 jmc Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.77 2007/06/08 07:48:09 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd $Mdocdate: June 11 2007 $ |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -512,7 +512,10 @@ The MAC algorithm is used in protocol version 2 | |||
512 | for data integrity protection. | 512 | for data integrity protection. |
513 | Multiple algorithms must be comma-separated. | 513 | Multiple algorithms must be comma-separated. |
514 | The default is: | 514 | The default is: |
515 | .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . | 515 | .Bd -literal -offset indent |
516 | hmac-md5,hmac-sha1,umac-64@openssh.com, | ||
517 | hmac-ripemd160,hmac-sha1-96,hmac-md5-96 | ||
518 | .Ed | ||
516 | .It Cm Match | 519 | .It Cm Match |
517 | Introduces a conditional block. | 520 | Introduces a conditional block. |
518 | If all of the criteria on the | 521 | If all of the criteria on the |