diff options
author | Shirish Pargaonkar <shirishpargaonkar@gmail.com> | 2011-01-27 10:58:04 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-01-27 14:58:13 -0500 |
commit | ee2c9258501f83d3ed0fd09ce5df1cec53312cf0 (patch) | |
tree | 2690ab3e75343be23a4969846a0c71f0df842dc7 /fs/cifs/link.c | |
parent | d39454ffe4a3c85428483b8a8a8e5e797b6363d5 (diff) |
cifs: More crypto cleanup (try #2)
Replaced md4 hashing function local to cifs module with kernel crypto APIs.
As a result, md4 hashing function and its supporting functions in
file md4.c are not needed anymore.
Cleaned up function declarations, removed forward function declarations,
and removed a header file that is being deleted from being included.
Verified that sec=ntlm/i, sec=ntlmv2/i, and sec=ntlmssp/i work correctly.
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/link.c')
-rw-r--r-- | fs/cifs/link.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/cifs/link.c b/fs/cifs/link.c index d3444ea6ac71..02cd60aefbff 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c | |||
@@ -54,10 +54,9 @@ symlink_hash(unsigned int link_len, const char *link_str, u8 *md5_hash) | |||
54 | struct sdesc *sdescmd5; | 54 | struct sdesc *sdescmd5; |
55 | 55 | ||
56 | md5 = crypto_alloc_shash("md5", 0, 0); | 56 | md5 = crypto_alloc_shash("md5", 0, 0); |
57 | if (!md5 || IS_ERR(md5)) { | 57 | if (IS_ERR(md5)) { |
58 | rc = PTR_ERR(md5); | ||
59 | cERROR(1, "%s: Crypto md5 allocation error %d\n", __func__, rc); | 58 | cERROR(1, "%s: Crypto md5 allocation error %d\n", __func__, rc); |
60 | return rc; | 59 | return PTR_ERR(md5); |
61 | } | 60 | } |
62 | size = sizeof(struct shash_desc) + crypto_shash_descsize(md5); | 61 | size = sizeof(struct shash_desc) + crypto_shash_descsize(md5); |
63 | sdescmd5 = kmalloc(size, GFP_KERNEL); | 62 | sdescmd5 = kmalloc(size, GFP_KERNEL); |