summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--mac.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 05a3b078..ed58d1ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
- markus@cvs.openbsd.org 2012/12/11 23:12:13
[try-ciphers.sh]
add hmac-ripemd160-etm@openssh.com
+ - (djm) [mac.c] fix merge botch
20121207
- (dtucker) OpenBSD CVS Sync
diff --git a/mac.c b/mac.c
index e55face4..3f2dc6f2 100644
--- a/mac.c
+++ b/mac.c
@@ -57,6 +57,7 @@ struct {
int truncatebits; /* truncate digest if != 0 */
int key_len; /* just for UMAC */
int len; /* just for UMAC */
+ int etm; /* Encrypt-then-MAC */
} macs[] = {
/* Encrypt-and-MAC (encrypt-and-authenticate) variants */
{ "hmac-sha1", SSH_EVP, EVP_sha1, 0, 0, 0, 0 },