diff options
| author | des <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
| commit | 00f3582ac62b9883e85e2cb420c3d9f5d9028188 (patch) | |
| tree | eafe8a40bcffb53c6bb88d75ac823cdc99ac92fe /crypto/openssh/mac.c | |
| parent | d00fafff0e6a902c30e2a606c69d740558908f1d (diff) | |
| download | FreeBSD-src-00f3582ac62b9883e85e2cb420c3d9f5d9028188.zip FreeBSD-src-00f3582ac62b9883e85e2cb420c3d9f5d9028188.tar.gz | |
Upgrade OpenSSH to 6.1p1.
Diffstat (limited to 'crypto/openssh/mac.c')
| -rw-r--r-- | crypto/openssh/mac.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssh/mac.c b/crypto/openssh/mac.c index eef50f4..9b450e4 100644 --- a/crypto/openssh/mac.c +++ b/crypto/openssh/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.18 2012/06/28 05:07:45 dtucker Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -44,6 +44,8 @@ #include "umac.h" +#include "openbsd-compat/openssl-compat.h" + #define SSH_EVP 1 /* OpenSSL EVP-based MAC */ #define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */ @@ -59,9 +61,7 @@ struct { { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 }, #ifdef HAVE_EVP_SHA256 { "hmac-sha2-256", SSH_EVP, EVP_sha256, 0, -1, -1 }, - { "hmac-sha2-256-96", SSH_EVP, EVP_sha256, 96, -1, -1 }, { "hmac-sha2-512", SSH_EVP, EVP_sha512, 0, -1, -1 }, - { "hmac-sha2-512-96", SSH_EVP, EVP_sha512, 96, -1, -1 }, #endif { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, @@ -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: |
