diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 18:21:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 18:21:14 -0800 |
| commit | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (patch) | |
| tree | eb4eee66ed54915fab3e75781affbefb402d6a11 /fs/cifs/md5.h | |
| parent | 1737ef7598d3515fdc11cb9ba7e054f334404e04 (diff) | |
| parent | a9ac49d303f967be0dabd97cb722c4a13109c6c2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: make sure we allocate enough storage for socket address
[CIFS] Make socket retry timeouts consistent between blocking and nonblocking cases
[CIFS] some cleanup to dir.c prior to addition of posix_open
[CIFS] revalidate parent inode when rmdir done within that directory
[CIFS] Rename md5 functions to avoid collision with new rt modules
cifs: turn smb_send into a wrapper around smb_sendv
Diffstat (limited to 'fs/cifs/md5.h')
| -rw-r--r-- | fs/cifs/md5.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/md5.h b/fs/cifs/md5.h index f7d4f4197ba..6fba8cb402f 100644 --- a/fs/cifs/md5.h +++ b/fs/cifs/md5.h @@ -20,10 +20,10 @@ struct HMACMD5Context { }; #endif /* _HMAC_MD5_H */ -void MD5Init(struct MD5Context *context); -void MD5Update(struct MD5Context *context, unsigned char const *buf, +void cifs_MD5_init(struct MD5Context *context); +void cifs_MD5_update(struct MD5Context *context, unsigned char const *buf, unsigned len); -void MD5Final(unsigned char digest[16], struct MD5Context *context); +void cifs_MD5_final(unsigned char digest[16], struct MD5Context *context); /* The following definitions come from lib/hmacmd5.c */ |