summaryrefslogtreecommitdiffstats
path: root/mac.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-12-19 00:51:39 +0100
committerDamien Miller <djm@mindrot.org>2011-12-19 00:51:39 +0100
commitd0e582c6da52377417474e157632d63be55bdbd2 (patch)
tree069e6012ac0091b7d9cfebb2ba6d3000e9e089d6 /mac.c
parent - djm@cvs.openbsd.org 2011/12/02 00:41:56 (diff)
downloadopenssh-d0e582c6da52377417474e157632d63be55bdbd2.tar.xz
openssh-d0e582c6da52377417474e157632d63be55bdbd2.zip
- 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@
Diffstat (limited to 'mac.c')
-rw-r--r--mac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mac.c b/mac.c
index eef50f48d..da7b5d8bb 100644
--- a/mac.c
+++ b/mac.c
@@ -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.
*
@@ -116,6 +116,7 @@ mac_init(Mac *mac)
case SSH_EVP:
if (mac->evp_md == NULL)
return -1;
+ HMAC_CTX_init(&mac->evp_ctx);
HMAC_Init(&mac->evp_ctx, mac->key, mac->key_len, mac->evp_md);
return 0;
case SSH_UMAC: