diff options
| author | djm <djm> | 2011-12-18 23:51:39 +0000 |
|---|---|---|
| committer | djm <djm> | 2011-12-18 23:51:39 +0000 |
| commit | 69b76fb12483630a7c9be83497c945baa4b3bbbf (patch) | |
| tree | c3b92675a0a9f956a755e98af8d64036419b8e49 | |
| parent | 57d03efa76f1238ccf4838239f1a5c9366fc9d74 (diff) | |
| download | openssh-69b76fb12483630a7c9be83497c945baa4b3bbbf.tar.gz | |
- 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@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | mac.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -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 @@ -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: |