summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/kex.h b/kex.h
index fa50b2ccb..8013ab8a4 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.52 2010/09/22 05:01:29 djm Exp $ */ 1/* $OpenBSD: kex.h,v 1.54 2013/01/08 18:49:04 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.
@@ -92,6 +92,7 @@ struct Enc {
92 Cipher *cipher; 92 Cipher *cipher;
93 int enabled; 93 int enabled;
94 u_int key_len; 94 u_int key_len;
95 u_int iv_len;
95 u_int block_size; 96 u_int block_size;
96 u_char *key; 97 u_char *key;
97 u_char *iv; 98 u_char *iv;
@@ -103,6 +104,7 @@ struct Mac {
103 u_char *key; 104 u_char *key;
104 u_int key_len; 105 u_int key_len;
105 int type; 106 int type;
107 int etm; /* Encrypt-then-MAC */
106 const EVP_MD *evp_md; 108 const EVP_MD *evp_md;
107 HMAC_CTX evp_ctx; 109 HMAC_CTX evp_ctx;
108 struct umac_ctx *umac_ctx; 110 struct umac_ctx *umac_ctx;