new cipher framework

1 files changed, 4 insertions, 6 deletions

diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h
index 36af701e495..93c77cac062 100644
--- a/usr.bin/ssh/kex.h
+++ b/usr.bin/ssh/kex.h
@@ -59,22 +59,20 @@ typedef struct Comp Comp;
 typedef struct Enc Enc;
 
 struct Enc {
+	char		*name;
 	int		type;
+	Cipher		*cipher;
 	int		enabled;
-	int		block_size;
 	unsigned char	*key;
 	unsigned char	*iv;
-	int		key_len;
-	int		iv_len;
-	char		*name;
 };
 struct Mac {
-	EVP_MD		*md;
+	char		*name;
 	int		enabled;
+	EVP_MD		*md;
 	int		mac_len;
 	unsigned char	*key;
 	int		key_len;
-	char		*name;
 };
 struct Comp {
 	int		type;