| commit | 37834afe7be91de1aff4bdffbef2c54797ec58d6 | [log] [tgz] |
|---|---|---|
| author | Damien Miller <djm@mindrot.org> | Wed Dec 12 11:00:37 2012 +1100 |
| committer | Damien Miller <djm@mindrot.org> | Wed Dec 12 11:00:37 2012 +1100 |
| tree | ac7eb2c1689d8b3ab35d3dcba216194754ff75f6 | |
| parent | ec7ce9ace470aad20aeea0769ddc998dea307830 [diff] [blame] |
- (djm) [mac.c] fix merge botch
diff --git a/mac.c b/mac.c index e55face..3f2dc6f 100644 --- a/mac.c +++ b/mac.c
@@ -57,6 +57,7 @@ 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 },