- (djm) [mac.c] fix merge botch

1 files changed, 1 insertions, 0 deletions

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 },