summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-01-09 16:12:19 +1100
committerDamien Miller <djm@mindrot.org>2013-01-09 16:12:19 +1100
commit1d75abfe23cadf8cdba0bd2cfd54f3bc1ca80dc5 (patch)
treeb717aa08dcc3c018d6fdae575017b3cb5fd92767 /kex.h
parentaa7ad3039c671c157bb99217d60674dad8154a22 (diff)
- markus@cvs.openbsd.org 2013/01/08 18:49:04
[PROTOCOL authfile.c cipher.c cipher.h kex.c kex.h monitor_wrap.c] [myproposal.h packet.c ssh_config.5 sshd_config.5] support AES-GCM as defined in RFC 5647 (but with simpler KEX handling) ok and feedback djm@
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/kex.h b/kex.h
index 03b984cc8..46731fa45 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.53 2012/12/11 22:31:18 markus 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.
@@ -89,6 +89,7 @@ struct Enc {
89 Cipher *cipher; 89 Cipher *cipher;
90 int enabled; 90 int enabled;
91 u_int key_len; 91 u_int key_len;
92 u_int iv_len;
92 u_int block_size; 93 u_int block_size;
93 u_char *key; 94 u_char *key;
94 u_char *iv; 95 u_char *iv;