summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-04 11:02:42 +1100
committerDamien Miller <djm@mindrot.org>2014-02-04 11:02:42 +1100
commit4e8d937af79ce4e253f77ec93489d098b25becc3 (patch)
tree83b0293313eea8dfebcc7f906c5058f530238e8b /kex.h
parent69d0d09f76bab5aec86fbf78489169f63bd16475 (diff)
- markus@cvs.openbsd.org 2014/01/27 18:58:14
[Makefile.in digest.c digest.h hostfile.c kex.h mac.c hmac.c hmac.h] replace openssl HMAC with an implementation based on our ssh_digest_* ok and feedback djm@
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/kex.h b/kex.h
index 1aa3ec26a..c85680eea 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.61 2014/01/25 10:12:50 dtucker Exp $ */ 1/* $OpenBSD: kex.h,v 1.62 2014/01/27 18:58:14 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -105,9 +105,8 @@ struct Mac {
105 u_int key_len; 105 u_int key_len;
106 int type; 106 int type;
107 int etm; /* Encrypt-then-MAC */ 107 int etm; /* Encrypt-then-MAC */
108 const EVP_MD *evp_md; 108 struct ssh_hmac_ctx *hmac_ctx;
109 HMAC_CTX evp_ctx; 109 struct umac_ctx *umac_ctx;
110 struct umac_ctx *umac_ctx;
111}; 110};
112struct Comp { 111struct Comp {
113 int type; 112 int type;