dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct a bug on ntlm signing 

git-svn-id: file:///home/svn/framework3/trunk@12211 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
amaloteaux 2011-04-01 20:58:11 +00:00
parent cd9b742960
commit c5e137d7d3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/rex/proto/ntlm/utils.rb
View File

@ -629,7 +629,7 @@ class Utils
end
# create the session key
def self.create_session_key(server_ntlmssp_flags, user, pass, domain, challenge_key,
def self.create_session_key(ntlmssp_flags, server_ntlmssp_flags, user, pass, domain, challenge_key,
client_challenge = '', ntlm_cli_challenge = '' , opt = {} )
usentlm2_session = opt[:usentlm2_session] != nil ? opt[:usentlm2_session] : true
@ -669,7 +669,6 @@ class Utils
ntlmssp_flags |= CONST::NEGOTIATE_56
end
end
# Generate the user session key
lanman_weak = false
if send_ntlm # Should be default
@ -750,7 +749,7 @@ class Utils
signing_key = user_session_key
end
return signing_key, enc_session_key
return signing_key, enc_session_key, ntlmssp_flags
end

6
lib/rex/proto/smb/client.rb
View File

@ -871,9 +871,11 @@ NTLM_UTILS = Rex::Proto::NTLM::Utils
self.spnopt, ntlm_options)
enc_session_key = ''
self.sequence_counter = 0
if self.require_signing
self.signing_key, enc_session_key = NTLM_UTILS.create_session_key(server_ntlmssp_flags, user, pass, domain, self.challenge_key,
client_challenge, ntlm_cli_challenge, ntlm_options)
self.signing_key, enc_session_key, ntlmssp_flags = NTLM_UTILS.create_session_key(ntlmssp_flags, server_ntlmssp_flags, user, pass, domain,
self.challenge_key, client_challenge, ntlm_cli_challenge,
ntlm_options)
end
# Create the security blob data