diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | mac.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -12,6 +12,9 @@ | |||
12 | message (including the packet size) instead of the plaintext data; | 12 | message (including the packet size) instead of the plaintext data; |
13 | these EtM modes are considered more secure and used by default. | 13 | these EtM modes are considered more secure and used by default. |
14 | feedback and ok djm@ | 14 | feedback and ok djm@ |
15 | - sthen@cvs.openbsd.org 2012/12/11 22:51:45 | ||
16 | [mac.c] | ||
17 | fix typo, s/tem/etm in hmac-ripemd160-tem. ok markus@ | ||
15 | 18 | ||
16 | 20121207 | 19 | 20121207 |
17 | - (dtucker) OpenBSD CVS Sync | 20 | - (dtucker) OpenBSD CVS Sync |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mac.c,v 1.20 2012/12/11 22:31:18 markus Exp $ */ | 1 | /* $OpenBSD: mac.c,v 1.21 2012/12/11 22:51:45 sthen Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -81,7 +81,7 @@ struct { | |||
81 | #endif | 81 | #endif |
82 | { "hmac-md5-etm@openssh.com", SSH_EVP, EVP_md5, 0, 0, 0, 1 }, | 82 | { "hmac-md5-etm@openssh.com", SSH_EVP, EVP_md5, 0, 0, 0, 1 }, |
83 | { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 }, | 83 | { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 }, |
84 | { "hmac-ripemd160-tem@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 }, | 84 | { "hmac-ripemd160-etm@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 }, |
85 | { "umac-64-etm@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 1 }, | 85 | { "umac-64-etm@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 1 }, |
86 | { "umac-128-etm@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 1 }, | 86 | { "umac-128-etm@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 1 }, |
87 | 87 | ||