Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 09:14:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/net/ntlm.el (ntlm-build-auth-request): Add NTLM2 Session support.

Browse source 
Fixes: debbugs:15603
This commit is contained in:
Thomas Fitzsimmons 2014-10-04 12:23:42 -07:00 committed by Glenn Morris
parent 9ed4c74e8b
commit 87318e3d76
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-10-04 Thomas Fitzsimmons <fitzsim@fitzsim.org>
* net/ntlm.el (ntlm-build-auth-request):
Add NTLM2 Session support. (Bug#15603)
2014-10-04 Glenn Morris <rgm@gnu.org>
* apropos.el (apropos-symbols-internal):

38
lisp/net/ntlm.el
View file

@ -80,8 +80,8 @@ is not given."
(request-msgType (concat (make-string 1 1) (make-string 3 0)))
;0x01 0x00 0x00 0x00
(request-flags (concat (make-string 1 7) (make-string 1 178)
(make-string 2 0)))
;0x07 0xb2 0x00 0x00
(make-string 1 8) (make-string 1 0)))
;0x07 0xb2 0x08 0x00
lu ld off-d off-u)
(when (string-match "@" user)
(unless domain
@ -144,11 +144,35 @@ by PASSWORD-HASHES. PASSWORD-HASHES should be a return value of
(setq domain (substring user (1+ (match-beginning 0))))
(setq user (substring user 0 (match-beginning 0))))
;; generate response data
(setq lmRespData
(ntlm-smb-owf-encrypt (car password-hashes) challengeData))
(setq ntRespData
(ntlm-smb-owf-encrypt (cadr password-hashes) challengeData))
;; check if "negotiate NTLM2 key" flag is set in type 2 message
(if (not (zerop (logand (aref flags 2) 8)))
(let (randomString
sessionHash)
;; generate NTLM2 session response data
(setq randomString (string-make-unibyte
(concat
(make-string 1 (random 256))
(make-string 1 (random 256))
(make-string 1 (random 256))
(make-string 1 (random 256))
(make-string 1 (random 256))
(make-string 1 (random 256))
(make-string 1 (random 256))
(make-string 1 (random 256)))))
(setq sessionHash (secure-hash 'md5
(concat challengeData randomString)
nil nil t))
(setq sessionHash (substring sessionHash 0 8))
(setq lmRespData (concat randomString (make-string 16 0)))
(setq ntRespData (ntlm-smb-owf-encrypt
(cadr password-hashes) sessionHash)))
(progn
;; generate response data
(setq lmRespData
(ntlm-smb-owf-encrypt (car password-hashes) challengeData))
(setq ntRespData
(ntlm-smb-owf-encrypt (cadr password-hashes) challengeData))))
;; get offsets to fields to pack the response struct in a string
(setq lu (length user))