summaryrefslogtreecommitdiff
path: root/mac.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-12 11:00:37 +1100
committerDamien Miller <djm@mindrot.org>2012-12-12 11:00:37 +1100
commit37834afe7be91de1aff4bdffbef2c54797ec58d6 (patch)
treeac7eb2c1689d8b3ab35d3dcba216194754ff75f6 /mac.c
parentec7ce9ace470aad20aeea0769ddc998dea307830 (diff)
- (djm) [mac.c] fix merge botch
Diffstat (limited to 'mac.c')
-rw-r--r--mac.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mac.c b/mac.c
index e55face40..3f2dc6f2a 100644
--- a/mac.c
+++ b/mac.c
@@ -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 },