RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Damien Miller 2012-12-12 11:00:37 +11:00
parent ec7ce9ace4
commit 37834afe7b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -24,6 +24,7 @@
- markus@cvs.openbsd.org 2012/12/11 23:12:13 - markus@cvs.openbsd.org 2012/12/11 23:12:13
[try-ciphers.sh] [try-ciphers.sh]
add hmac-ripemd160-etm@openssh.com add hmac-ripemd160-etm@openssh.com
- (djm) [mac.c] fix merge botch
20121207 20121207
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

1
mac.c
View File

@ -57,6 +57,7 @@ struct {
int truncatebits; /* truncate digest if != 0 */ int truncatebits; /* truncate digest if != 0 */
int key_len; /* just for UMAC */ int key_len; /* just for UMAC */
int len; /* just for UMAC */ int len; /* just for UMAC */
int etm; /* Encrypt-then-MAC */
} macs[] = { } macs[] = {
/* Encrypt-and-MAC (encrypt-and-authenticate) variants */ /* Encrypt-and-MAC (encrypt-and-authenticate) variants */
{ "hmac-sha1", SSH_EVP, EVP_sha1, 0, 0, 0, 0 }, { "hmac-sha1", SSH_EVP, EVP_sha1, 0, 0, 0, 0 },