summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh_config.5
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2012-10-04 13:21:51 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2012-10-04 13:21:51 +0000
commit7c324e9ea63a12dacd00bf7dc1608165c5b601aa (patch)
tree5d60e97875465a8a5a1cf34295310e42258552d5 /usr.bin/ssh/ssh_config.5
parent6573209291d93ea765708d799c08a5a75a49dfb4 (diff)
add umac128 variant; ok djm@ at n2k12
Diffstat (limited to 'usr.bin/ssh/ssh_config.5')
-rw-r--r--usr.bin/ssh/ssh_config.56
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 36b1af195d6..d3e801df0da 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_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: ssh_config.5,v 1.157 2012/06/29 13:57:25 naddy Exp $
-.Dd $Mdocdate: June 29 2012 $
+.\" $OpenBSD: ssh_config.5,v 1.158 2012/10/04 13:21:50 markus Exp $
+.Dd $Mdocdate: October 4 2012 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -792,7 +792,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