summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2011-12-02 00:43:58 +0000
committerDamien Miller <djm@cvs.openbsd.org>2011-12-02 00:43:58 +0000
commitfcc9b4c4e292b712411220c52dbfd514453e0927 (patch)
tree9aa37ee3e873e9cfb0b13a3b1962bfff51e5bc1b /usr.bin
parente0ddcfbf0ce14466da0c5e1f21729749ae43e669 (diff)
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 'usr.bin')
-rw-r--r--usr.bin/ssh/mac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c
index 252f8bf1a9e..1fdad8745e8 100644
--- a/usr.bin/ssh/mac.c
+++ b/usr.bin/ssh/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.
*
@@ -111,6 +111,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: