diff options
| author | Jeff Layton <jlayton@redhat.com> | 2008-12-05 20:41:21 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-12-26 02:29:11 +0000 |
| commit | 4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3 (patch) | |
| tree | c3485a826f33e4b6f18b603a475a1bfef7bb7986 /fs/cifs/sess.c | |
| parent | 55162dec9371a6f6ac63ff546c182cc6144a649e (diff) | |
| download | op-kernel-dev-4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3.zip op-kernel-dev-4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3.tar.gz | |
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/sess.c')
| -rw-r--r-- | fs/cifs/sess.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 2851d5d..5f22de7 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -417,7 +417,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, /* BB calculate hash with password */ /* and copy into bcc */ - calc_lanman_hash(ses, lnm_session_key); + calc_lanman_hash(ses->password, ses->server->cryptKey, + ses->server->secMode & SECMODE_PW_ENCRYPT ? + true : false, lnm_session_key); + ses->flags |= CIFS_SES_LANMAN; memcpy(bcc_ptr, (char *)lnm_session_key, CIFS_SESS_KEY_SIZE); bcc_ptr += CIFS_SESS_KEY_SIZE; |
