summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/kex.h
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-03-25 11:05:34 +0000
committerdes <des@FreeBSD.org>2014-03-25 11:05:34 +0000
commitae82763de4683ce610990c6d07ce39f518dd8505 (patch)
tree5f5bce301eb69c1bba7123161572915c7e55375b /crypto/openssh/kex.h
parent144450f3a924f7cbb9c11bfe0c90b21044097086 (diff)
parentab9e0bc08282397f61df5d0ea89a81a2322ec040 (diff)
downloadFreeBSD-src-ae82763de4683ce610990c6d07ce39f518dd8505.zip
FreeBSD-src-ae82763de4683ce610990c6d07ce39f518dd8505.tar.gz
Upgrade to OpenSSH 6.6p1.
Diffstat (limited to 'crypto/openssh/kex.h')
-rw-r--r--crypto/openssh/kex.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/openssh/kex.h b/crypto/openssh/kex.h
index 8c842c9..0d5c362 100644
--- a/crypto/openssh/kex.h
+++ b/crypto/openssh/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.61 2014/01/25 10:12:50 dtucker Exp $ */
+/* $OpenBSD: kex.h,v 1.62 2014/01/27 18:58:14 markus Exp $ */
/* $FreeBSD$ */
/*
@@ -106,9 +106,8 @@ struct Mac {
u_int key_len;
int type;
int etm; /* Encrypt-then-MAC */
- const EVP_MD *evp_md;
- HMAC_CTX evp_ctx;
- struct umac_ctx *umac_ctx;
+ struct ssh_hmac_ctx *hmac_ctx;
+ struct umac_ctx *umac_ctx;
};
struct Comp {
int type;
OpenPOWER on IntegriCloud