diff options
| author | Jeff Layton | 2008-12-06 02:41:21 +0100 |
|---|---|---|
| committer | Steve French | 2008-12-26 03:29:11 +0100 |
| commit | 4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3 (patch) | |
| tree | c3485a826f33e4b6f18b603a475a1bfef7bb7986 /fs/cifs/connect.c | |
| parent | cifs: zero out session password before freeing it (diff) | |
| download | kernel-qcow2-linux-4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3.tar.gz kernel-qcow2-linux-4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3.tar.xz kernel-qcow2-linux-4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3.zip | |
cifs: have calc_lanman_hash take more granular args
cifs: have calc_lanman_hash take more granular args
We need to use this routine to encrypt passwords associated with the
tcon too. Don't assume that the password will be attached to the
smb_session.
Also, make some of the values in the lower encryption functions
const since they aren't changed.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 6107ee42b093..3a84a375cb6f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -3533,7 +3533,10 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, #ifdef CONFIG_CIFS_WEAK_PW_HASH if ((extended_security & CIFSSEC_MAY_LANMAN) && (ses->server->secType == LANMAN)) - calc_lanman_hash(ses, bcc_ptr); + calc_lanman_hash(ses->password, ses->server->cryptKey, + ses->server->secMode & + SECMODE_PW_ENCRYPT ? true : false, + bcc_ptr); else #endif /* CIFS_WEAK_PW_HASH */ SMBNTencrypt(ses->password, |