diff options
author | Damien Miller <djm@mindrot.org> | 2012-12-12 11:00:37 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-12-12 11:00:37 +1100 |
commit | 37834afe7be91de1aff4bdffbef2c54797ec58d6 (patch) | |
tree | ac7eb2c1689d8b3ab35d3dcba216194754ff75f6 | |
parent | ec7ce9ace470aad20aeea0769ddc998dea307830 (diff) |
- (djm) [mac.c] fix merge botch
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | mac.c | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -24,6 +24,7 @@ | |||
24 | - markus@cvs.openbsd.org 2012/12/11 23:12:13 | 24 | - markus@cvs.openbsd.org 2012/12/11 23:12:13 |
25 | [try-ciphers.sh] | 25 | [try-ciphers.sh] |
26 | add hmac-ripemd160-etm@openssh.com | 26 | add hmac-ripemd160-etm@openssh.com |
27 | - (djm) [mac.c] fix merge botch | ||
27 | 28 | ||
28 | 20121207 | 29 | 20121207 |
29 | - (dtucker) OpenBSD CVS Sync | 30 | - (dtucker) OpenBSD CVS Sync |
@@ -57,6 +57,7 @@ struct { | |||
57 | int truncatebits; /* truncate digest if != 0 */ | 57 | int truncatebits; /* truncate digest if != 0 */ |
58 | int key_len; /* just for UMAC */ | 58 | int key_len; /* just for UMAC */ |
59 | int len; /* just for UMAC */ | 59 | int len; /* just for UMAC */ |
60 | int etm; /* Encrypt-then-MAC */ | ||
60 | } macs[] = { | 61 | } macs[] = { |
61 | /* Encrypt-and-MAC (encrypt-and-authenticate) variants */ | 62 | /* Encrypt-and-MAC (encrypt-and-authenticate) variants */ |
62 | { "hmac-sha1", SSH_EVP, EVP_sha1, 0, 0, 0, 0 }, | 63 | { "hmac-sha1", SSH_EVP, EVP_sha1, 0, 0, 0, 0 }, |