Move Kex to SSH2.

ssh-audit.py

@@ -147,40 +147,90 @@ class OutputBuffer(list):
 		sys.stdout = self.__stdout
 
 
-class KexParty(object):
+class SSH2(object):
-	encryption = []
+	class KexParty(object):
-	mac = []
+		def __init__(self, enc, mac, compression, languages):
-	compression = []
+			self.__enc = enc
-	languages = []
+			self.__mac = mac
-
+			self.__compression = compression
-
+			self.__languages = languages
-class Kex(object):
+		
-	cookie = None
+		@property
-	kex_algorithms = []
+		def encryption(self):
-	key_algorithms = []
+			return self.__enc
-	server = KexParty()
+		
-	client = KexParty()
+		@property
-	follows = False
+		def mac(self):
-	unused = 0
+			return self.__mac
+		
+		@property
+		def compression(self):
+			return self.__compression
+		
+		@property
+		def languages(self):
+			return self.__languages
 	
-	@classmethod
+	class Kex(object):
-	def parse(cls, payload):
+		def __init__(self, cookie, kex_algs, key_algs, cli, srv, follows, unused=0):
-		kex = cls()
+			self.__cookie = cookie
-		buf = ReadBuf(payload)
+			self.__kex_algs = kex_algs
-		kex.cookie = buf.read(16)
+			self.__key_algs = key_algs
-		kex.kex_algorithms = buf.read_list()
+			self.__client = cli
-		kex.key_algorithms = buf.read_list()
+			self.__server = srv
-		kex.client.encryption = buf.read_list()
+			self.__follows = follows
-		kex.server.encryption = buf.read_list()
+			self.__unused = unused
-		kex.client.mac = buf.read_list()
+		
-		kex.server.mac = buf.read_list()
+		@property
-		kex.client.compression = buf.read_list()
+		def cookie(self):
-		kex.server.compression = buf.read_list()
+			return self.__cookie
-		kex.client.languages = buf.read_list()
+		
-		kex.server.languages = buf.read_list()
+		@property
-		kex.follows = buf.read_bool()
+		def kex_algorithms(self):
-		kex.unused = buf.read_int()
+			return self.__kex_algs
-		return kex
+		
+		@property
+		def key_algorithms(self):
+			return self.__key_algs
+		
+		# client_to_server
+		@property
+		def client(self):
+			return self.__client
+		
+		# server_to_client
+		@property
+		def server(self):
+			return self.__server
+		
+		@property
+		def follows(self):
+			return self.__follows
+		
+		@property
+		def unused(self):
+			return self.__unused
+		
+		@classmethod
+		def parse(cls, payload):
+			buf = ReadBuf(payload)
+			cookie = buf.read(16)
+			kex_algs = buf.read_list()
+			key_algs = buf.read_list()
+			cli_enc = buf.read_list()
+			srv_enc = buf.read_list()
+			cli_mac = buf.read_list()
+			srv_mac = buf.read_list()
+			cli_compression = buf.read_list()
+			srv_compression = buf.read_list()
+			cli_languages = buf.read_list()
+			srv_languages = buf.read_list()
+			follows = buf.read_bool()
+			unused = buf.read_int()
+			cli = SSH2.KexParty(cli_enc, cli_mac, cli_compression, cli_languages)
+			srv = SSH2.KexParty(srv_enc, srv_mac, srv_compression, srv_languages)
+			kex = cls(cookie, kex_algs, key_algs, cli, srv, follows, unused)
+			return kex
 
 
 class SSH1(object):
@@ -1570,7 +1620,7 @@ def audit(conf, sshv=None):
 		pkm = SSH1.PublicKeyMessage.parse(payload)
 		output(banner, header, pkm=pkm)
 	elif sshv == 2:
-		kex = Kex.parse(payload)
+		kex = SSH2.Kex.parse(payload)
 		output(banner, header, kex=kex)