tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/12/02 00:43:57 

[mac.c]
     fix bz#1934: newer OpenSSL versions will require HMAC_CTX_Init before
     HMAC_init (this change in policy seems insane to me)
     ok dtucker@
This commit is contained in:
Damien Miller 2011-12-19 10:51:39 +11:00
parent 5360dff2a0
commit d0e582c6da
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,11 @@
[mux.c] [mux.c]
fix bz#1948: ssh -f doesn't fork for multiplexed connection. fix bz#1948: ssh -f doesn't fork for multiplexed connection.
ok dtucker@ ok dtucker@
- djm@cvs.openbsd.org 2011/12/02 00:43:57
[mac.c]
fix bz#1934: newer OpenSSL versions will require HMAC_CTX_Init before
HMAC_init (this change in policy seems insane to me)
ok dtucker@
20111125 20111125
- OpenBSD CVS Sync - OpenBSD CVS Sync

3
mac.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mac.c,v 1.16 2011/08/02 01:22:11 djm Exp $ */ /* $OpenBSD: mac.c,v 1.17 2011/12/02 00:43:57 djm Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -116,6 +116,7 @@ mac_init(Mac *mac)
case SSH_EVP: case SSH_EVP:
if (mac->evp_md == NULL) if (mac->evp_md == NULL)
return -1; return -1;
HMAC_CTX_init(&mac->evp_ctx);
HMAC_Init(&mac->evp_ctx, mac->key, mac->key_len, mac->evp_md); HMAC_Init(&mac->evp_ctx, mac->key, mac->key_len, mac->evp_md);
return 0; return 0;
case SSH_UMAC: case SSH_UMAC: