diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-09-09 01:09:27 +0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-09-09 01:09:27 +0400 |
| commit | 745e507a9c79c6e1385d3414d5e56f3d4621a375 (patch) | |
| tree | 14dff030b56724604256c9cfedd04804a586bbc0 /fs/cifs/cifsencrypt.c | |
| parent | 56234e2767496c125a858f880f1b3a62e04a3406 (diff) | |
| download | linux-745e507a9c79c6e1385d3414d5e56f3d4621a375.tar.xz | |
Revert "missing changes during ntlmv2/ntlmssp auth and sign"
This reverts commit 3ec6bbcdb4e85403f2c5958876ca9492afdf4031.
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/cifsencrypt.c')
| -rw-r--r-- | fs/cifs/cifsencrypt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index eef78c24e0cc..051d00011ca3 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -553,8 +553,6 @@ calc_seckey(struct TCP_Server_Info *server) return 1; } - desc.tfm = tfm_arc4; - crypto_blkcipher_setkey(tfm_arc4, server->session_key.data.ntlmv2.key, CIFS_CPHTXT_SIZE); sg_init_one(&sgin, sec_key, CIFS_CPHTXT_SIZE); |