diff options
author | Damien Miller <djm@mindrot.org> | 2012-12-12 11:00:37 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-12-12 11:00:37 +1100 |
commit | 37834afe7be91de1aff4bdffbef2c54797ec58d6 (patch) | |
tree | ac7eb2c1689d8b3ab35d3dcba216194754ff75f6 /mac.c | |
parent | ec7ce9ace470aad20aeea0769ddc998dea307830 (diff) | |
download | openssh-git-37834afe7be91de1aff4bdffbef2c54797ec58d6.tar.gz |
- (djm) [mac.c] fix merge botch
Diffstat (limited to 'mac.c')
-rw-r--r-- | mac.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 }, |