diff options
author | Damien Miller <djm@mindrot.org> | 2014-05-15 14:35:03 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-05-15 14:35:03 +1000 |
commit | 294c58a007cfb2f3bddc4fc3217e255857ffb9bf (patch) | |
tree | e767521e04240fa051486e4d7521bb13363d2c0c /myproposal.h | |
parent | 05e82c3b963c33048128baf72a6f6b3a1c10b4c1 (diff) |
- 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@
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index 020f35c77..30cb20b44 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.39 2014/04/29 18:01:49 markus Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.40 2014/04/30 19:07:48 naddy Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -146,8 +146,12 @@ | |||
146 | "aes128-ctr,aes192-ctr,aes256-ctr," \ | 146 | "aes128-ctr,aes192-ctr,aes256-ctr," \ |
147 | "chacha20-poly1305@openssh.com" | 147 | "chacha20-poly1305@openssh.com" |
148 | #define KEX_SERVER_MAC \ | 148 | #define KEX_SERVER_MAC \ |
149 | "umac-64-etm@openssh.com," \ | ||
150 | "umac-128-etm@openssh.com," \ | ||
149 | "hmac-sha2-256-etm@openssh.com," \ | 151 | "hmac-sha2-256-etm@openssh.com," \ |
150 | "hmac-sha2-512-etm@openssh.com," \ | 152 | "hmac-sha2-512-etm@openssh.com," \ |
153 | "umac-64@openssh.com," \ | ||
154 | "umac-128@openssh.com," \ | ||
151 | "hmac-sha2-256," \ | 155 | "hmac-sha2-256," \ |
152 | "hmac-sha2-512" | 156 | "hmac-sha2-512" |
153 | 157 | ||