diff options
author | Damien Miller <djm@mindrot.org> | 2011-12-19 10:51:39 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-12-19 10:51:39 +1100 |
commit | d0e582c6da52377417474e157632d63be55bdbd2 (patch) | |
tree | 069e6012ac0091b7d9cfebb2ba6d3000e9e089d6 /mac.c | |
parent | 5360dff2a011ab2de10f92450aa9cb10703b9a01 (diff) |
- 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.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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: |