Fixing key generation and exception handling

minikerberos/common.py

@@ -9,6 +9,7 @@
 import hashlib
 import collections
 from minikerberos.constants import *
+from minikerberos.encryption import string_to_key, Enctype
 
 
 # this is from impacket, a bit modified
@@ -72,14 +73,14 @@ def get_key_for_enctype(self, etype):
 				return bytes.fromhex(self.kerberos_key_aes_256)
 			if self.password is not None:
 				salt = (self.domain.upper() + self.username).encode()
-				return string_to_key(Enctype.AES256, self.password, salt).contents
+				return string_to_key(Enctype.AES256, self.password.encode(), salt).contents
 			raise Exception('There is no key for AES256 encryption')
 		elif etype == EncryptionType.AES128_CTS_HMAC_SHA1_96:
 			if self.kerberos_key_aes_128:
 				return bytes.fromhex(self.kerberos_key_aes_128)
 			if self.password is not None:
 				salt = (self.domain.upper() + self.username).encode()
-				return string_to_key(Enctype.AES128, self.password, salt).contents
+				return string_to_key(Enctype.AES128, self.password.encode(), salt).contents
 			raise Exception('There is no key for AES128 encryption')
 		elif etype == EncryptionType.ARCFOUR_HMAC_MD5:
 			if self.kerberos_key_rc4:
@@ -96,7 +97,7 @@ def get_key_for_enctype(self, etype):
 				return bytes.fromhex(self.kerberos_key_des)
 			elif self.password:
 				salt = (self.domain.upper() + self.username).encode()
-				return string_to_key(Enctype.DES3, self.password, salt).contents
+				return string_to_key(Enctype.DES3, self.password.encode(), salt).contents
 			else:
 				raise Exception('There is no key for DES3 encryption')
 
@@ -105,7 +106,7 @@ def get_key_for_enctype(self, etype):
 				return bytes.fromhex(self.kerberos_key_des)
 			elif self.password:
 				salt = (self.domain.upper() + self.username).encode()
-				return string_to_key(Enctype.DES_MD5, self.password, salt).contents
+				return string_to_key(Enctype.DES_MD5, self.password.encode(), salt).contents
 			else:
 				raise Exception('There is no key for DES3 encryption')
 

minikerberos/security.py

@@ -107,7 +107,7 @@ def run(self, targets, override_etype = [2, 3, 16, 23, 17, 18]):
 				self.kcomm.get_TGT()
 			except Exception as e:
 				logger.exception('Failed to get TGT ticket! Reason: %s' % str(e))
-				return
+
 
 		tgss = []
 		for target in targets:

setup.py

@@ -5,7 +5,7 @@
 	name="minikerberos",
 
 	# Version number (initial):
-	version="0.0.6",
+	version="0.0.7",
 
 	# Application author details:
 	author="Tamas Jos",