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>

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,