summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--mac.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 75d9a0863..de12bbef0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
4 [mux.c] 4 [mux.c]
5 fix bz#1948: ssh -f doesn't fork for multiplexed connection. 5 fix bz#1948: ssh -f doesn't fork for multiplexed connection.
6 ok dtucker@ 6 ok dtucker@
7 - djm@cvs.openbsd.org 2011/12/02 00:43:57
8 [mac.c]
9 fix bz#1934: newer OpenSSL versions will require HMAC_CTX_Init before
10 HMAC_init (this change in policy seems insane to me)
11 ok dtucker@
7 12
820111125 1320111125
9 - OpenBSD CVS Sync 14 - OpenBSD CVS Sync
diff --git a/mac.c b/mac.c
index eef50f48d..da7b5d8bb 100644
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mac.c,v 1.16 2011/08/02 01:22:11 djm Exp $ */ 1/* $OpenBSD: mac.c,v 1.17 2011/12/02 00:43:57 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -116,6 +116,7 @@ mac_init(Mac *mac)
116 case SSH_EVP: 116 case SSH_EVP:
117 if (mac->evp_md == NULL) 117 if (mac->evp_md == NULL)
118 return -1; 118 return -1;
119 HMAC_CTX_init(&mac->evp_ctx);
119 HMAC_Init(&mac->evp_ctx, mac->key, mac->key_len, mac->evp_md); 120 HMAC_Init(&mac->evp_ctx, mac->key, mac->key_len, mac->evp_md);
120 return 0; 121 return 0;
121 case SSH_UMAC: 122 case SSH_UMAC: