diff options
| author |   Steve French <sfrench@us.ibm.com> | 2010-09-08 21:10:58 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-09-08 21:10:58 +0000 |
| commit | c8e56f1f4fb9f82f63e4ce6d73a14501d0432c76 (patch) | |
| tree | 6d0988317a6eaf4b454c73a1dd95f89184f5b1ed /fs/cifs/cifspdu.h | |
| parent | Revert "missing changes during ntlmv2/ntlmssp auth and sign" (diff) | |
| download | linux-dev-c8e56f1f4fb9f82f63e4ce6d73a14501d0432c76.tar.xz linux-dev-c8e56f1f4fb9f82f63e4ce6d73a14501d0432c76.zip | |
Revert "[CIFS] Fix ntlmv2 auth with ntlmssp"
This reverts commit 9fbc590860e75785bdaf8b83e48fabfe4d4f7d58.
The change to kernel crypto and fixes to ntlvm2 and ntlmssp
series, introduced a regression. Deferring this patch series
to 2.6.37 after Shirish fixes it.
Signed-off-by: Steve French <sfrench@us.ibm.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
CC: Shirish Pargaonkar <shirishp@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifspdu.h')
| -rw-r--r-- | fs/cifs/cifspdu.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index 320e0fd0ba7b..14d036d8db11 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -134,12 +134,6 @@ * Size of the session key (crypto key encrypted with the password */ #define CIFS_SESS_KEY_SIZE (24) -#define CIFS_CLIENT_CHALLENGE_SIZE (8) -#define CIFS_SERVER_CHALLENGE_SIZE (8) -#define CIFS_HMAC_MD5_HASH_SIZE (16) -#define CIFS_CPHTXT_SIZE (16) -#define CIFS_NTLMV2_SESSKEY_SIZE (16) -#define CIFS_NTHASH_SIZE (16) /* * Maximum user name length @@ -669,6 +663,7 @@ struct ntlmv2_resp { __le64 time; __u64 client_chal; /* random */ __u32 reserved2; + struct ntlmssp2_name names[2]; /* array of name entries could follow ending in minimum 4 byte struct */ } __attribute__((packed)); |