diff options
author | djm <djm> | 2012-12-12 00:00:37 +0000 |
---|---|---|
committer | djm <djm> | 2012-12-12 00:00:37 +0000 |
commit | f956ad441cff7bd5686af55392d35794f9e79859 (patch) | |
tree | 9b091c6713a913ae776fe11050ff859774dddbbd | |
parent | 585ddf927268ad3f4c666eb4684f58d8be56b5a2 (diff) | |
download | openssh-f956ad441cff7bd5686af55392d35794f9e79859.tar.gz |
- (djm) [mac.c] fix merge botch
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | mac.c | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -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 @@ -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 }, |