From 37834afe7be91de1aff4bdffbef2c54797ec58d6 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 12 Dec 2012 11:00:37 +1100 Subject: [PATCH] - (djm) [mac.c] fix merge botch --- ChangeLog | 1 + mac.c | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 05a3b078d..ed58d1ced 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 e55face40..3f2dc6f2a 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 },