X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fntlm.el;h=9626aef558d7d8a3c23c40329aba2495cf30d305;hb=873ba7b51ddfb07246cd874b7de72662308236c9;hp=126f6688f0d64b261697ae1288407d7c141dfac6;hpb=b58d62328adf02b341b460a98819a54a0d629b60;p=gnus diff --git a/lisp/ntlm.el b/lisp/ntlm.el index 126f6688f..9626aef55 100644 --- a/lisp/ntlm.el +++ b/lisp/ntlm.el @@ -1,6 +1,6 @@ ;;; ntlm.el --- NTLM (NT LanManager) authentication support -;; Copyright (C) 2001, 2007 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2007-2012 Free Software Foundation, Inc. ;; Author: Taro Kawagishi ;; Keywords: NTLM, SASL @@ -9,10 +9,10 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,18 +20,16 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: ;; This library is a direct translation of the Samba release 2.2.0 ;; implementation of Windows NT and LanManager compatible password ;; encryption. -;; +;; ;; Interface functions: -;; +;; ;; ntlm-build-auth-request ;; This will return a binary string, which should be used in the ;; base64 encoded form and it is the caller's responsibility to encode @@ -42,7 +40,7 @@ ;; (which will be a binary string) as the first argument and to ;; encode the returned string with base64. The second argument user ;; should be given in user@domain format. -;; +;; ;; ntlm-get-password-hashes ;; ;; @@ -104,8 +102,8 @@ is not given." (md4-pack-int16 ld) ;domain field, count field (md4-pack-int16 ld) ;domain field, max count field (md4-pack-int32 (cons 0 off-d)) ;domain field, offset field - user ;bufer field - domain ;bufer field + user ;buffer field + domain ;buffer field ))) (eval-when-compile @@ -209,16 +207,16 @@ by PASSWORD-HASHES. PASSWORD-HASHES should be a return value of ;; buffer field lmRespData ;lmResponse, 24 bytes ntRespData ;ntResponse, 24 bytes - (ntlm-ascii2unicode domain ;unicode domain string, 2*ld bytes + (ntlm-ascii2unicode domain ;Unicode domain string, 2*ld bytes (length domain)) ; - (ntlm-ascii2unicode user ;unicode user string, 2*lu bytes + (ntlm-ascii2unicode user ;Unicode user string, 2*lu bytes (length user)) ; - (ntlm-ascii2unicode user ;unicode user string, 2*lu bytes + (ntlm-ascii2unicode user ;Unicode user string, 2*lu bytes (length user)) ; ))) (defun ntlm-get-password-hashes (password) - "Return a pair of SMB hash and NT MD4 hash of the given password PASSWORD" + "Return a pair of SMB hash and NT MD4 hash of the given password PASSWORD." (list (ntlm-smb-passwd-hash password) (ntlm-md4hash password))) @@ -442,7 +440,7 @@ length of STR is LEN." (defun ntlm-smb-dohash (in key forw) "Return the hash value for a string IN and a string KEY. -Length of IN and KEY are 64. FORW non nill means forward, nil means +Length of IN and KEY are 64. FORW non-nil means forward, nil means backward." (let (pk1 ;string of length 56 c ;string of length 28 @@ -528,7 +526,7 @@ into a Unicode string. PASSWD is truncated to 128 bytes if longer." (setq len (length passwd)) (if (> len 128) (setq len 128)) - ;; Password must be converted to NT unicode + ;; Password must be converted to NT Unicode (setq wpwd (ntlm-ascii2unicode passwd len)) ;; Calculate length in bytes (setq len (* len 2)) @@ -536,5 +534,4 @@ into a Unicode string. PASSWD is truncated to 128 bytes if longer." (provide 'ntlm) -;;; arch-tag: 348ace18-f8e2-4176-8fe9-d9ab4e96f296 ;;; ntlm.el ends here