librex 0.0.65 → 0.0.66

data/lib/rex/proto/ntlm/exceptions.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module NTLM

data/lib/rex/proto/ntlm/message.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 #
 # An NTLM Authentication Library for Ruby
 #
@@ -6,7 +7,7 @@
 # http://jp.rubyist.net/magazine/?0013-CodeReview
 # -------------------------------------------------------------
 # Copyright (c) 2005,2006 yrock
-# 
+#
 # This program is free software.
 # You can distribute/modify this program under the terms of the
 # Ruby License.
@@ -18,8 +19,8 @@
 # -------------------------------------------------------------
 #
 # All protocol information used to write this code stems from
-# "The NTLM Authentication Protocol" by Eric Glass. The author 
-# would thank to him for this tremendous work and making it 
+# "The NTLM Authentication Protocol" by Eric Glass. The author
+# would thank to him for this tremendous work and making it
 # available on the net.
 # http://davenport.sourceforge.net/ntlm.html
 # -------------------------------------------------------------
@@ -28,7 +29,7 @@
 # Permission to use, copy, modify, and distribute this document
 # for any purpose and without any fee is hereby granted,
 # provided that the above copyright notice and this list of
-# conditions appear in all copies. 
+# conditions appear in all copies.
 # -------------------------------------------------------------
 #
 # The author also looked Mozilla-Firefox-1.0.7 source code,
@@ -37,7 +38,7 @@
 # "http://x2a.org/websvn/filedetails.php?
 # repname=libntlm-ruby&path=%2Ftrunk%2Fntlm.rb&sc=1"
 # The latter has a minor bug in its separate_keys function.
-# The third key has to begin from the 14th character of the 
+# The third key has to begin from the 14th character of the
 # input string instead of 13th:)
 #--
 # $Id: ntlm.rb 11678 2011-01-30 19:26:35Z hdm $
@@ -212,13 +213,13 @@ CRYPT = Rex::Proto::NTLM::Crypt
 			if usr.nil? or pwd.nil?
 				raise ArgumentError, "user and password have to be supplied"
 			end
-  
+
 			if opt[:workstation]
 				ws = opt[:workstation]
 			else
 				ws = ""
 			end
-  
+
 			if opt[:client_challenge]
 				cc  = opt[:client_challenge]
 			else
@@ -245,9 +246,9 @@ CRYPT = Rex::Proto::NTLM::Crypt
 			ti = self.target_info
 
 			chal = self[:challenge].serialize
-  
+
 			if opt[:ntlmv2]
-				ar = {	:ntlmv2_hash => CRYPT::ntlmv2_hash(usr, pwd, tgt, opt), 
+				ar = {	:ntlmv2_hash => CRYPT::ntlmv2_hash(usr, pwd, tgt, opt),
 					:challenge => chal, :target_info => ti}
 				lm_res = CRYPT::lmv2_response(ar, opt)
 				ntlm_res = CRYPT::ntlmv2_response(ar, opt)
@@ -258,7 +259,7 @@ CRYPT = Rex::Proto::NTLM::Crypt
 				lm_res = CRYPT::lm_response(pwd, chal)
 				ntlm_res = CRYPT::ntlm_response(pwd, chal)
 			end
-  
+
 			Type3.create({
 				:lm_response => lm_res,
 				:ntlm_response => ntlm_res,
@@ -270,7 +271,7 @@ CRYPT = Rex::Proto::NTLM::Crypt
 		end
 	end
 
-    
+
 	Type3 = Message.define{
 		string          :sign,          {:size => 8, :value => CONST::SSP_SIGN}
 		int32LE         :type,          {:value => 3}
@@ -298,7 +299,7 @@ CRYPT = Rex::Proto::NTLM::Crypt
 			t.domain = arg[:domain]
 			t.user = arg[:user]
 			t.workstation = arg[:workstation]
-    
+
 			if arg[:session_key]
 				t.enable(:session_key)
 				t.session_key = arg[session_key]
@@ -387,7 +388,7 @@ CRYPT = Rex::Proto::NTLM::Crypt
 			host_len = decode[44,2].unpack("v").first
 			host_offset = decode[48,2].unpack("v").first
 			host = decode[host_offset, host_len]
-		
+
 			return domain, user, host, lm, nt
 		else
 			return "", "", "", "", ""
@@ -395,11 +396,11 @@ CRYPT = Rex::Proto::NTLM::Crypt
 	end
 
 
-	
-	#	 
+
+	#
 	# Process Type 1 NTLM Messages, return a Base64 Type 2 Message
 	#
-	def self.process_type1_message(message, nonce = "\x11\x22\x33\x44\x55\x66\x77\x88", win_domain = 'DOMAIN', 
+	def self.process_type1_message(message, nonce = "\x11\x22\x33\x44\x55\x66\x77\x88", win_domain = 'DOMAIN',
 					win_name = 'SERVER', dns_name = 'server', dns_domain = 'example.com', downgrade = true)
 
 		dns_name = Rex::Text.to_unicode(dns_name + "." + dns_domain)
@@ -425,14 +426,14 @@ CRYPT = Rex::Proto::NTLM::Crypt
 					end
 					if (reqflags & CONST::NEGOTIATE_ALWAYS_SIGN) == CONST::NEGOTIATE_ALWAYS_SIGN
 						reqflags = reqflags - CONST::NEGOTIATE_ALWAYS_SIGN
-					end				
+					end
 				end
 
-				flags = reqflags + CONST::TARGET_TYPE_DOMAIN + CONST::TARGET_TYPE_SERVER				
+				flags = reqflags + CONST::TARGET_TYPE_DOMAIN + CONST::TARGET_TYPE_SERVER
 				tid = true
 
 				tidoffset = 48 + win_domain.length
-				tidbuff = 
+				tidbuff =
 					[2].pack('v') +				# tid type, win domain
 					[win_domain.length].pack('v') +
 					win_domain +
@@ -460,9 +461,9 @@ CRYPT = Rex::Proto::NTLM::Crypt
 			end
 
 			type2msg +="\x30\x00\x00\x00" + #		Offset, 4 bytes
-				 [flags].pack('V') +	# flags, 4 bytes
-				 nonce +		# the nonce, 8 bytes
-			 	 "\x00" * 8		# Context (all 0s), 8 bytes
+					[flags].pack('V') +	# flags, 4 bytes
+					nonce +		# the nonce, 8 bytes
+					"\x00" * 8		# Context (all 0s), 8 bytes
 
 			if (tid)
 				type2msg +=		# Target information security buffer. Filled if REQUEST_TARGET
@@ -485,7 +486,7 @@ CRYPT = Rex::Proto::NTLM::Crypt
 
 		return type2msg
 	end
-	
+
 	#
 	# Downgrading Type messages to LMv1/NTLMv1 and removing signing
 	#
@@ -506,8 +507,8 @@ CRYPT = Rex::Proto::NTLM::Crypt
 			end
 			if (reqflags & CONST::NEGOTIATE_ALWAYS_SIGN) == CONST::NEGOTIATE_ALWAYS_SIGN
 				reqflags = reqflags - CONST::NEGOTIATE_ALWAYS_SIGN
-			end				
-			
+			end
+
 			# Return the flags back to the decode so we can base64 it again
 			flags = reqflags.to_s(16)
 			0.upto(8) do |idx|
@@ -525,12 +526,12 @@ CRYPT = Rex::Proto::NTLM::Crypt
 				end
 				idx += 2
 			end
-			
+
 		end
-		return Rex::Text.encode_base64(decode).delete("\n") # base64 encode and remove the returns 
+		return Rex::Text.encode_base64(decode).delete("\n") # base64 encode and remove the returns
 	end
-	
-end 
+
+end
 end
 end
 end

data/lib/rex/proto/ntlm/utils.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/ntlm/constants'
 require 'rex/proto/ntlm/crypt'
 require 'rex/proto/ntlm/exceptions'
@@ -57,29 +58,29 @@ class Utils
 	# mechTypes: 2 items :
 	# 	-MechType: 1.3.6.1.4.1.311.2.2.30 (SNMPv2-SMI::enterprises.311.2.2.30)
 	# 	-MechType: 1.3.6.1.4.1.311.2.2.10 (NTLMSSP - Microsoft NTLM Security Support Provider)
-	# 
+	#
 	# this is the default on Win7
 	def self.make_simple_negotiate_secblob_resp
-		blob = 
-		"\x60" + self.asn1encode(		
+		blob =
+		"\x60" + self.asn1encode(
 			"\x06" + self.asn1encode(
 				"\x2b\x06\x01\x05\x05\x02"
-			) +	
+			) +
 			"\xa0" + self.asn1encode(
 				"\x30" + self.asn1encode(
 					"\xa0" + self.asn1encode(
-						"\x30" + self.asn1encode(	
+						"\x30" + self.asn1encode(
 							"\x06" + self.asn1encode(
 								"\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a"
-							)																						
+							)
 						)
-					) 
+					)
 				)
 			)
 		)
 
-		return blob	
-	end	
+		return blob
+	end
 
 	# GSS BLOB usefull for SMB_NEGOCIATE_RESPONSE message
 	# mechTypes: 4 items :
@@ -87,14 +88,14 @@ class Utils
 	# 	MechType: 1.2.840.113554.1.2.2 (KRB5 - Kerberos 5)
 	# 	MechType: 1.2.840.113554.1.2.2.3 (KRB5 - Kerberos 5 - User to User)
 	# 	MechType: 1.3.6.1.4.1.311.2.2.10 (NTLMSSP - Microsoft NTLM Security Support Provider)
-	# mechListMIC: 
+	# mechListMIC:
 	# 	principal: account@domain
 	def self.make_negotiate_secblob_resp(account, domain)
-		blob = 
-		"\x60" + self.asn1encode(		
+		blob =
+		"\x60" + self.asn1encode(
 			"\x06" + self.asn1encode(
 				"\x2b\x06\x01\x05\x05\x02"
-			) +	
+			) +
 			"\xa0" + self.asn1encode(
 				"\x30" + self.asn1encode(
 					"\xa0" + self.asn1encode(
@@ -107,10 +108,10 @@ class Utils
 							) +
 							"\x06" + self.asn1encode(
 								"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x03"
-							) +	
+							) +
 							"\x06" + self.asn1encode(
 								"\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a"
-							)																						
+							)
 						)
 					) +
 					"\xa3" + self.asn1encode(
@@ -126,8 +127,8 @@ class Utils
 			)
 		)
 
-		return blob	
-	end	
+		return blob
+	end
 
 	# BLOB without GSS usefull for ntlmssp type 1 message
 	def self.make_ntlmssp_blob_init(domain = 'WORKGROUP', name = 'WORKSTATION', flags=0x80201)
@@ -144,7 +145,7 @@ class Utils
 				name.length,	#length
 				name.length, 	#max length
 				domain.length + 32
-			].pack('vvV') +	
+			].pack('vvV') +
 
 			domain + name
 		return blob
@@ -152,11 +153,11 @@ class Utils
 
 	# GSS BLOB usefull for ntlmssp type 1 message
 	def self.make_ntlmssp_secblob_init(domain = 'WORKGROUP', name = 'WORKSTATION', flags=0x80201)
-		blob = 
-		"\x60" + self.asn1encode(		
+		blob =
+		"\x60" + self.asn1encode(
 			"\x06" + self.asn1encode(
 				"\x2b\x06\x01\x05\x05\x02"
-			) +	
+			) +
 			"\xa0" + self.asn1encode(
 				"\x30" + self.asn1encode(
 					"\xa0" + self.asn1encode(
@@ -175,11 +176,11 @@ class Utils
 			)
 		)
 
-		return blob	
+		return blob
 	end
 
 
-	# BLOB without GSS usefull for ntlm type 2 message 
+	# BLOB without GSS usefull for ntlm type 2 message
 	def self.make_ntlmssp_blob_chall(win_domain, win_name, dns_domain, dns_name, chall, flags)
 
 		addr_list  = ''
@@ -189,7 +190,7 @@ class Utils
 		addr_list  << [3, dns_name.length].pack('vv') + dns_name
 		addr_list  << [0, 0].pack('vv')
 
-		ptr  = 0 
+		ptr  = 0
 		blob =	"NTLMSSP\x00" +
 				[2].pack('V') +
 				[
@@ -198,21 +199,21 @@ class Utils
 					(ptr += 48) # offset
 				].pack('vvV') +
 				[ flags ].pack('V') +
-				chall + 
+				chall +
 				"\x00\x00\x00\x00\x00\x00\x00\x00" +
 				[
 					addr_list.length,  # length
 					addr_list.length,  # max length
-					(ptr += win_domain.length) 
+					(ptr += win_domain.length)
 				].pack('vvV') +
-				win_domain + 
+				win_domain +
 				addr_list
 		return blob
 	end
 
 	# GSS BLOB usefull for ntlmssp type 2 message
 	def self.make_ntlmssp_secblob_chall(win_domain, win_name, dns_domain, dns_name, chall, flags)
-		
+
 		blob =
 			"\xa1" + self.asn1encode(
 				"\x30" + self.asn1encode(
@@ -231,7 +232,7 @@ class Utils
 							make_ntlmssp_blob_chall(win_domain, win_name, dns_domain, dns_name, chall, flags)
 						)
 					)
-				)	
+				)
 			)
 
 		return blob
@@ -240,53 +241,53 @@ class Utils
 	# BLOB without GSS Usefull for ntlmssp type 3 message
 	def self.make_ntlmssp_blob_auth(domain, name, user, lm, ntlm, enc_session_key, flags = 0x080201)
 		lm ||= "\x00" * 24
-		ntlm ||= "\x00" * 24		
-	
+		ntlm ||= "\x00" * 24
+
 		domain_uni = Rex::Text.to_unicode(domain)
 		user_uni   = Rex::Text.to_unicode(user)
 		name_uni   = Rex::Text.to_unicode(name)
 		session    = enc_session_key
 
-		ptr  = 64 
+		ptr  = 64
 
 		blob = "NTLMSSP\x00" +
 			[ 3 ].pack('V') +
-		
+
 			[	# Lan Manager Response
 				lm.length,
 				lm.length,
 				(ptr)
 			].pack('vvV') +
-		
+
 			[	# NTLM Manager Response
 				ntlm.length,
 				ntlm.length,
 				(ptr += lm.length)
-			].pack('vvV') +		
-				
+			].pack('vvV') +
+
 			[	# Domain Name
 				domain_uni.length,
 				domain_uni.length,
 				(ptr += ntlm.length)
-			].pack('vvV') +		
+			].pack('vvV') +
 
 			[	# Username
 				user_uni.length,
 				user_uni.length,
 				(ptr += domain_uni.length)
-			].pack('vvV') +		
+			].pack('vvV') +
 
 			[	# Hostname
 				name_uni.length,
 				name_uni.length,
 				(ptr += user_uni.length)
-			].pack('vvV') +		
-		
+			].pack('vvV') +
+
 			[	# Session Key (none)
 				session.length,
 				session.length,
 				(ptr += name_uni.length)
-			].pack('vvV') +		
+			].pack('vvV') +
 
 			[ flags ].pack('V') +
 
@@ -294,8 +295,8 @@ class Utils
 			ntlm +
 			domain_uni +
 			user_uni +
-			name_uni + 
-			session + "\x00" 
+			name_uni +
+			session + "\x00"
 		return blob
 
 	end
@@ -327,7 +328,7 @@ class Utils
 							"\x00"
 						)
 					)
-				)	
+				)
 			)
 		return blob
 	end
@@ -342,7 +343,7 @@ class Utils
 		send_ntlm 		= opt[:send_ntlm] 		!= nil ? opt[:send_ntlm] : true
 		use_lanman_key 		= opt[:use_lanman_key] 		!= nil ? opt[:use_lanman_key] : false
 
-		if signing 
+		if signing
 			ntlmssp_flags = 0xe2088215
 		else
 
@@ -352,7 +353,7 @@ class Utils
 		if usentlm2_session
 			if use_ntlmv2
 				#set Negotiate Target Info
-				ntlmssp_flags |= CONST::NEGOTIATE_TARGET_INFO	
+				ntlmssp_flags |= CONST::NEGOTIATE_TARGET_INFO
 			end
 
 		else
@@ -363,7 +364,7 @@ class Utils
 				ntlmssp_flags |= CONST::NEGOTIATE_LMKEY if use_lanman_key
 			end
 		end
-	
+
 		#we can also downgrade ntlm2_session when we send only lmv1
 		ntlmssp_flags &= 0xfff7ffff if usentlm2_session && (not use_ntlmv2) && (not send_ntlm)
 
@@ -414,9 +415,9 @@ class Utils
 				#Client time
 				data[:chall_MsvAvTimestamp] = addr
 			when 8
-				#A Restriction_Encoding structure 
+				#A Restriction_Encoding structure
 			when 9
-				#The SPN of the target server. 
+				#The SPN of the target server.
 			when 10
 				#A channel bindings hash.
 			end
@@ -426,9 +427,9 @@ class Utils
 
 	# This function return an ntlmv2 client challenge
 	# This is a partial implementation, full description is in [MS-NLMP].pdf around 3.1.5.2.1 :-/
-	def self.make_ntlmv2_clientchallenge(win_domain, win_name, dns_domain, dns_name, 
+	def self.make_ntlmv2_clientchallenge(win_domain, win_name, dns_domain, dns_name,
 						client_challenge = nil, chall_MsvAvTimestamp = nil, spnopt = {})
-		
+
 		client_challenge ||= Rex::Text.rand_text(8)
 		# We have to set the timestamps here to the one in the challenge message from server if present
 		# If we don't do that, recent server like Seven/2008 will send a STATUS_INVALID_PARAMETER error packet
@@ -448,28 +449,28 @@ class Utils
 
 		# Windows Seven / 2008r2 Request this type if in local security policies,
 		# Microsoft network server : Server SPN target name validation level is set to <Required from client>
-		# otherwise it send an STATUS_ACCESS_DENIED packet 
+		# otherwise it send an STATUS_ACCESS_DENIED packet
 		if spnopt[:use_spn]
 			spn= Rex::Text.to_unicode("cifs/#{spnopt[:name] || 'unknow'}")
 			addr_list  << [9, spn.length].pack('vv') + spn
 		end
-		
+
 		# MAY BE USEFUL FOR FUTURE
-		# Seven (client) add at least one more av that is of type MsAvRestrictions (8)	
-		# maybe this will be usefull with future windows OSs but has no use at all for the moment afaik		
+		# Seven (client) add at least one more av that is of type MsAvRestrictions (8)
+		# maybe this will be usefull with future windows OSs but has no use at all for the moment afaik
 		# restriction_encoding = 	[48,0,0,0].pack("VVV") + # Size, Z4, IntegrityLevel, SubjectIntegrityLevel
 		# 			Rex::Text.rand_text(32)	 # MachineId generated on startup on win7 and above
 		# addr_list  << [8, restriction_encoding.length].pack('vv') + restriction_encoding
-		
+
 		# Seven (client) and maybe others versions also add an av of type MsvChannelBindings (10) but the hash is "\x00" * 16
 		# addr_list  << [10, 16].pack('vv') + "\x00" * 16
-		
+
 
 		addr_list  << [0, 0].pack('vv')
 		ntlm_clientchallenge = 	[1,1,0,0].pack("CCvV") + #RespType, HiRespType, Reserved1, Reserved2
 					timestamp + #Timestamp
 					client_challenge + 	#clientchallenge
-					[0].pack("V")  +	#Reserved3 
+					[0].pack("V")  +	#Reserved3
 					addr_list + "\x00" * 4
 
 	end
@@ -492,46 +493,46 @@ class Utils
 		if send_ntlm  #should be default
 			if usentlm2_session
 				if use_ntlmv2
-					ntlm_cli_challenge = self.make_ntlmv2_clientchallenge(default_domain, default_name, dns_domain_name, 
-												dns_host_name,client_challenge , 
+					ntlm_cli_challenge = self.make_ntlmv2_clientchallenge(default_domain, default_name, dns_domain_name,
+												dns_host_name,client_challenge ,
 												chall_MsvAvTimestamp, spnopt)
 					if self.is_pass_ntlm_hash?(pass)
-						argntlm = { 	
+						argntlm = {
 							:ntlmv2_hash =>  CRYPT::ntlmv2_hash(
-												user, 
-												[ pass.upcase()[33,65] ].pack('H32'), 
+												user,
+												[ pass.upcase()[33,65] ].pack('H32'),
 												domain,{:pass_is_hash => true}
 											),
-							:challenge   => challenge_key 
+							:challenge   => challenge_key
 						}
 					else
 						argntlm = {
 							:ntlmv2_hash =>  CRYPT::ntlmv2_hash(user, pass, domain),
-							:challenge   =>  challenge_key 
+							:challenge   =>  challenge_key
 						}
 					end
 
 					optntlm = { :nt_client_challenge => ntlm_cli_challenge}
 					ntlmv2_response = CRYPT::ntlmv2_response(argntlm,optntlm)
-					resp_ntlm = ntlmv2_response 
-					
+					resp_ntlm = ntlmv2_response
+
 					if send_lm
 						if self.is_pass_ntlm_hash?(pass)
 							arglm = {
 								:ntlmv2_hash =>  CRYPT::ntlmv2_hash(
-													user, 								
-													[ pass.upcase()[33,65] ].pack('H32'), 
+													user,
+													[ pass.upcase()[33,65] ].pack('H32'),
 													domain,{:pass_is_hash => true}
 												),
-								:challenge   => challenge_key 
+								:challenge   => challenge_key
 							}
 						else
 							arglm = {
 								:ntlmv2_hash =>  CRYPT::ntlmv2_hash(user,pass, domain),
-								:challenge   => challenge_key 
+								:challenge   => challenge_key
 							}
 						end
-						
+
 						optlm = { :client_challenge => client_challenge }
 						resp_lm = CRYPT::lmv2_response(arglm, optlm)
 					else
@@ -540,20 +541,20 @@ class Utils
 
 				else # ntlm2_session
 					if self.is_pass_ntlm_hash?(pass)
-						argntlm = { 
-							:ntlm_hash =>  [ pass.upcase()[33,65] ].pack('H32'), 
-							:challenge => challenge_key 
+						argntlm = {
+							:ntlm_hash =>  [ pass.upcase()[33,65] ].pack('H32'),
+							:challenge => challenge_key
 						}
 					else
 						argntlm = {
-							:ntlm_hash =>  CRYPT::ntlm_hash(pass), 
-							:challenge => challenge_key 
+							:ntlm_hash =>  CRYPT::ntlm_hash(pass),
+							:challenge => challenge_key
 						}
 					end
-					
+
 					optntlm = {	:client_challenge => client_challenge}
 					resp_ntlm = CRYPT::ntlm2_session(argntlm,optntlm).join[24,24]
-					
+
 					# Generate the fake LANMAN hash
 					resp_lm = client_challenge + ("\x00" * 16)
 				end
@@ -561,27 +562,27 @@ class Utils
 			else # we use lmv1/ntlmv1
 				if self.is_pass_ntlm_hash?(pass)
 					argntlm = {
-						:ntlm_hash =>  [ pass.upcase()[33,65] ].pack('H32'), 
-						:challenge =>  challenge_key 
+						:ntlm_hash =>  [ pass.upcase()[33,65] ].pack('H32'),
+						:challenge =>  challenge_key
 					}
 				else
 					argntlm = {
-						:ntlm_hash =>  CRYPT::ntlm_hash(pass), 
-						:challenge =>  challenge_key 
+						:ntlm_hash =>  CRYPT::ntlm_hash(pass),
+						:challenge =>  challenge_key
 					}
 				end
-				
+
 				resp_ntlm = CRYPT::ntlm_response(argntlm)
 				if send_lm
 					if self.is_pass_ntlm_hash?(pass)
 						arglm = {
 							:lm_hash => [ pass.upcase()[0,32] ].pack('H32'),
-							:challenge =>  challenge_key 
+							:challenge =>  challenge_key
 						}
 					else
 						arglm = {
 							:lm_hash => CRYPT::lm_hash(pass),
-							:challenge =>  challenge_key 
+							:challenge =>  challenge_key
 						}
 					end
 					resp_lm = CRYPT::lm_response(arglm)
@@ -591,22 +592,22 @@ class Utils
 					resp_lm  = resp_ntlm
 				end
 			end
-		else #send_ntlm = false 
+		else #send_ntlm = false
 			#lmv2
 			if usentlm2_session && use_ntlmv2
 				if self.is_pass_ntlm_hash?(pass)
 					arglm = {
 						:ntlmv2_hash =>  CRYPT::ntlmv2_hash(
-											user, 
-											[ pass.upcase()[33,65] ].pack('H32'), 
+											user,
+											[ pass.upcase()[33,65] ].pack('H32'),
 											domain,{:pass_is_hash => true}
 										),
-						:challenge => challenge_key 
+						:challenge => challenge_key
 					}
 				else
 					arglm = {
 						:ntlmv2_hash =>  CRYPT::ntlmv2_hash(user,pass, domain),
-						:challenge => challenge_key 
+						:challenge => challenge_key
 					}
 				end
 				optlm = { :client_challenge => client_challenge }
@@ -615,12 +616,12 @@ class Utils
 				if self.is_pass_ntlm_hash?(pass)
 					arglm = {
 						:lm_hash => [ pass.upcase()[0,32] ].pack('H32'),
-						:challenge =>  challenge_key 
+						:challenge =>  challenge_key
 					}
 				else
 					arglm = {
 						:lm_hash => CRYPT::lm_hash(pass),
-						:challenge =>  challenge_key 
+						:challenge =>  challenge_key
 					}
 				end
 				resp_lm = CRYPT::lm_response(arglm)
@@ -677,39 +678,39 @@ class Utils
 			if usentlm2_session
 				if use_ntlmv2
 					if self.is_pass_ntlm_hash?(pass)
-						user_session_key = CRYPT::ntlmv2_user_session_key(user, 
+						user_session_key = CRYPT::ntlmv2_user_session_key(user,
 												[ pass.upcase()[33,65] ].pack('H32'),
-										 		domain, 
-												challenge_key, ntlm_cli_challenge, 
+												domain,
+												challenge_key, ntlm_cli_challenge,
 												{:pass_is_hash => true})
 					else
-						user_session_key = CRYPT::ntlmv2_user_session_key(user, pass, domain, 
+						user_session_key = CRYPT::ntlmv2_user_session_key(user, pass, domain,
 											challenge_key, ntlm_cli_challenge)
 					end
 				else
 					if self.is_pass_ntlm_hash?(pass)
-						user_session_key = CRYPT::ntlm2_session_user_session_key([ pass.upcase()[33,65] ].pack('H32'), 
-														challenge_key, 
-														client_challenge, 
+						user_session_key = CRYPT::ntlm2_session_user_session_key([ pass.upcase()[33,65] ].pack('H32'),
+														challenge_key,
+														client_challenge,
 														{:pass_is_hash => true})
 					else
-						user_session_key = CRYPT::ntlm2_session_user_session_key(pass, challenge_key, 
+						user_session_key = CRYPT::ntlm2_session_user_session_key(pass, challenge_key,
 														client_challenge)
 					end
 				end
 			else # lmv1/ntlmv1
 				# lanman_key may also be used without ntlm response but it is not so much used
-				# so we don't care about this feature 
+				# so we don't care about this feature
 				if send_lm && use_lanman_key
 					if self.is_pass_ntlm_hash?(pass)
-						user_session_key = CRYPT::lanman_session_key([ pass.upcase()[0,32] ].pack('H32'), 
-												challenge_key, 
+						user_session_key = CRYPT::lanman_session_key([ pass.upcase()[0,32] ].pack('H32'),
+												challenge_key,
 												{:pass_is_hash => true})
 					else
 						user_session_key = CRYPT::lanman_session_key(pass, challenge_key)
 					end
 					lanman_weak = true
-				
+
 
 				else
 					if self.is_pass_ntlm_hash?(pass)
@@ -723,17 +724,17 @@ class Utils
 		else
 				if usentlm2_session && use_ntlmv2
 					if self.is_pass_ntlm_hash?(pass)
-						user_session_key = CRYPT::lmv2_user_session_key(user, [ pass.upcase()[33,65] ].pack('H32'), 
-												domain, 
-												challenge_key, client_challenge, 
+						user_session_key = CRYPT::lmv2_user_session_key(user, [ pass.upcase()[33,65] ].pack('H32'),
+												domain,
+												challenge_key, client_challenge,
 												{:pass_is_hash => true})
 					else
-						user_session_key = CRYPT::lmv2_user_session_key(user, pass, domain, 
+						user_session_key = CRYPT::lmv2_user_session_key(user, pass, domain,
 												challenge_key, client_challenge)
 					end
 				else
 					if self.is_pass_ntlm_hash?(pass)
-						user_session_key = CRYPT::lmv1_user_session_key([ pass.upcase()[0,32] ].pack('H32'), 
+						user_session_key = CRYPT::lmv1_user_session_key([ pass.upcase()[0,32] ].pack('H32'),
 													{:pass_is_hash => true})
 					else
 						user_session_key = CRYPT::lmv1_user_session_key(pass)
@@ -741,7 +742,7 @@ class Utils
 				end
 		end
 
-		user_session_key = CRYPT::make_weak_sessionkey(user_session_key,key_size, lanman_weak)			
+		user_session_key = CRYPT::make_weak_sessionkey(user_session_key,key_size, lanman_weak)
 
 		# Sessionkey and encrypted session key
 		if key_exchange
@@ -750,12 +751,12 @@ class Utils
 		else
 			signing_key = user_session_key
 		end
-		
+
 		return signing_key, enc_session_key, ntlmssp_flags
-	
-		
+
+
 	end
-	
+
 
 
 end