[CIFS] Fix packet signatures for NTLMv2 case

Signed-off-by: Yehuda Sadeh Weinraub <Yehuda.Sadeh@expand.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index e16a2c473003..0a7813175a27 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -104,6 +104,17 @@ enum protocolEnum {
         /* Netbios frames protocol not supported at this time */
 };
 
+struct mac_key {
+        unsigned int len;
+        union {
+                char ntlm[CIFS_SESS_KEY_SIZE + 16];
+                struct {
+                        char key[16];
+                        struct ntlmv2_resp resp;
+                } ntlmv2;
+        } data;
+};
+
 /*
  *****************************************************************
  * Except the CIFS PDUs themselves all the
@@ -159,7 +170,8 @@ struct TCP_Server_Info {
         /* 16th byte of RFC1001 workstation name is always null */
         char workstation_RFC1001_name[SERVER_NAME_LEN_WITH_NULL];
         __u32 sequence_number; /* needed for CIFS PDU signature */
-        char mac_signing_key[CIFS_SESS_KEY_SIZE + 16];
+        struct mac_key mac_signing_key;
+        char ntlmv2_hash[16];
         unsigned long lstrp; /* when we got last response from this server */
 };