diff options
| author |   markus <markus@openbsd.org> | 2012-10-04 13:21:50 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2012-10-04 13:21:50 +0000 |
| commit | 197253e3ef9f0745db16f42cacf8bf1cf1908780 (patch) | |
| tree | 3dd4039f354a3d5a8f56a12219bb1e838340f306 /usr.bin/ssh/sshd_config.5 | |
| parent | backout pgroup/job control from make, there is something deeply bogus (diff) | |
| download | wireguard-openbsd-197253e3ef9f0745db16f42cacf8bf1cf1908780.tar.xz wireguard-openbsd-197253e3ef9f0745db16f42cacf8bf1cf1908780.zip | |
add umac128 variant; ok djm@ at n2k12
Diffstat (limited to 'usr.bin/ssh/sshd_config.5')
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index d1431e61290..18f6a2f218a 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.144 2012/06/29 13:57:25 naddy Exp $ -.Dd $Mdocdate: June 29 2012 $ +.\" $OpenBSD: sshd_config.5,v 1.145 2012/10/04 13:21:50 markus Exp $ +.Dd $Mdocdate: October 4 2012 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -657,7 +657,7 @@ for data integrity protection. Multiple algorithms must be comma-separated. The default is: .Bd -literal -offset indent -hmac-md5,hmac-sha1,umac-64@openssh.com, +hmac-md5,hmac-sha1,umac-64@openssh.com,umac-128@openssh.com, hmac-sha2-256,hmac-sha2-512,hmac-ripemd160, hmac-sha1-96,hmac-md5-96 .Ed |