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.0 | |
parent | 1b816ea846aca3ee89e7995373ace609e9518424 (diff) | |
parent | 70847d299887abb96f8703ca99db6d817b78960e (diff) |
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'sshd_config.0')
-rw-r--r-- | sshd_config.0 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sshd_config.0 b/sshd_config.0 index c9a09a4ff..0b340ad20 100644 --- a/sshd_config.0 +++ b/sshd_config.0 | |||
@@ -282,8 +282,10 @@ DESCRIPTION | |||
282 | MACs Specifies the available MAC (message authentication code) algo- | 282 | MACs Specifies the available MAC (message authentication code) algo- |
283 | rithms. The MAC algorithm is used in protocol version 2 for data | 283 | rithms. The MAC algorithm is used in protocol version 2 for data |
284 | integrity protection. Multiple algorithms must be comma-separat- | 284 | integrity protection. Multiple algorithms must be comma-separat- |
285 | ed. The default is: ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac- | 285 | ed. The default is: |
286 | sha1-96,hmac-md5-96''. | 286 | |
287 | hmac-md5,hmac-sha1,umac-64@openssh.com, | ||
288 | hmac-ripemd160,hmac-sha1-96,hmac-md5-96 | ||
287 | 289 | ||
288 | Match Introduces a conditional block. If all of the criteria on the | 290 | Match Introduces a conditional block. If all of the criteria on the |
289 | Match line are satisfied, the keywords on the following lines | 291 | Match line are satisfied, the keywords on the following lines |
@@ -570,4 +572,4 @@ AUTHORS | |||
570 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support | 572 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support |
571 | for privilege separation. | 573 | for privilege separation. |
572 | 574 | ||
573 | OpenBSD 4.1 September 25, 1999 9 | 575 | OpenBSD 4.2 June 11, 2007 9 |