Skip to content

Commit 0784964

Browse files
committed
Make sure that the ntlm blob data is pasrsed into UTF-8
1 parent 85c26c6 commit 0784964

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

lib/rex/proto/ntlm/utils.rb

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,16 +402,20 @@ def self.parse_ntlm_type_2_blob(blob)
402402
data[:default_name] = temp_name.encode("UTF-8")
403403
when 2
404404
#netbios domain
405-
data[:default_domain] = addr
406-
data[:default_domain].force_encoding("UTF-16LE")
405+
temp_domain = addr
406+
temp_domain.force_encoding("UTF-16LE")
407+
data[:default_domain] = temp_domain.encode("UTF-8")
407408
when 3
408409
#dns name
409-
data[:dns_host_name] = addr
410-
data[:dns_host_name].force_encoding("UTF-16LE")
410+
temp_dns = addr
411+
temp_dns.force_encoding("UTF-16LE")
412+
data[:dns_host_name] = temp_dns.encode("UTF-8")
413+
411414
when 4
412415
#dns domain
413-
data[:dns_domain_name] = addr
414-
data[:dns_domain_name].force_encoding("UTF-16LE")
416+
temp_dns_domain = addr
417+
temp_dns_domain.force_encoding("UTF-16LE")
418+
data[:dns_domain_name] = temp_dns_domain.encode("UTF-8")
415419
when 5
416420
#The FQDN of the forest.
417421
when 6

0 commit comments

Comments
 (0)