From 294c58a007cfb2f3bddc4fc3217e255857ffb9bf Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 15 May 2014 14:35:03 +1000 Subject: - naddy@cvs.openbsd.org 2014/04/30 19:07:48 [mac.c myproposal.h umac.c] UMAC can use our local fallback implementation of AES when OpenSSL isn't available. Glue code straight from Ted Krovetz's original umac.c. ok markus@ --- myproposal.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'myproposal.h') diff --git a/myproposal.h b/myproposal.h index 020f35c77..30cb20b44 100644 --- a/myproposal.h +++ b/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.39 2014/04/29 18:01:49 markus Exp $ */ +/* $OpenBSD: myproposal.h,v 1.40 2014/04/30 19:07:48 naddy Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -146,8 +146,12 @@ "aes128-ctr,aes192-ctr,aes256-ctr," \ "chacha20-poly1305@openssh.com" #define KEX_SERVER_MAC \ + "umac-64-etm@openssh.com," \ + "umac-128-etm@openssh.com," \ "hmac-sha2-256-etm@openssh.com," \ "hmac-sha2-512-etm@openssh.com," \ + "umac-64@openssh.com," \ + "umac-128@openssh.com," \ "hmac-sha2-256," \ "hmac-sha2-512" -- cgit v1.2.3