From d0e582c6da52377417474e157632d63be55bdbd2 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 19 Dec 2011 10:51:39 +1100 Subject: - 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@ --- ChangeLog | 5 +++++ mac.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 75d9a086..de12bbef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ [mux.c] fix bz#1948: ssh -f doesn't fork for multiplexed connection. 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 - OpenBSD CVS Sync diff --git a/mac.c b/mac.c index eef50f48..da7b5d8b 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: -- cgit v1.2.3