diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-13 11:09:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-13 11:09:29 -0400 |
| commit | 12e36b2f41b6cbc67386fcb9c59c32a3e2033905 (patch) | |
| tree | ec1794bae2f96eef6cc2afb2fa5c48e6fd346316 /fs/cifs/md5.h | |
| parent | 1baaf0b424fe611a99cf3e2e59e84df0561d679a (diff) | |
| parent | 1a4e15a04ec69cb3552f4120079f5472377df5f7 (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: (27 commits)
[CIFS] Missing flags2 for DFS
[CIFS] Workaround incomplete byte length returned by some
[CIFS] cifs Kconfig: don't select CONNECTOR
[CIFS] Level 1 QPathInfo needed for proper OS2 support
[CIFS] fix typo in previous patch
[CIFS] Fix old DOS time conversion to handle timezone
[CIFS] Do not need to adjust for Jan/Feb for leap day
[CIFS] Fix leaps year calculation for years after 2100
[CIFS] readdir (ffirst) enablement of accurate timestamps from legacy servers
[CIFS] Fix compiler warning with previous patch
[CIFS] Fix typo
[CIFS] Allow for 15 minute TZs (e.g. Nepal) and be more explicit about
[CIFS] Fix readdir of large directories for backlevel servers
[CIFS] Allow LANMAN21 support even in both POSIX non-POSIX path
[CIFS] Make use of newer QFSInfo dependent on capability bit instead of
[CIFS] Do not send newer QFSInfo to legacy servers which can not support it
[CIFS] Fix typo in name of new cifs_show_stats
[CIFS] Rename server time zone field
[CIFS] Handle legacy servers which return undefined time zone
[CIFS] CIFS support for /proc/<pid>/mountstats part 1
...
Manual conflict resolution in fs/cifs/connect.c
Diffstat (limited to 'fs/cifs/md5.h')
| -rw-r--r-- | fs/cifs/md5.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/md5.h b/fs/cifs/md5.h index 00e1c5394fe1..f7d4f4197bac 100644 --- a/fs/cifs/md5.h +++ b/fs/cifs/md5.h | |||
| @@ -27,12 +27,12 @@ void MD5Final(unsigned char digest[16], struct MD5Context *context); | |||
| 27 | 27 | ||
| 28 | /* The following definitions come from lib/hmacmd5.c */ | 28 | /* The following definitions come from lib/hmacmd5.c */ |
| 29 | 29 | ||
| 30 | void hmac_md5_init_rfc2104(unsigned char *key, int key_len, | 30 | /* void hmac_md5_init_rfc2104(unsigned char *key, int key_len, |
| 31 | struct HMACMD5Context *ctx); | 31 | struct HMACMD5Context *ctx);*/ |
| 32 | void hmac_md5_init_limK_to_64(const unsigned char *key, int key_len, | 32 | void hmac_md5_init_limK_to_64(const unsigned char *key, int key_len, |
| 33 | struct HMACMD5Context *ctx); | 33 | struct HMACMD5Context *ctx); |
| 34 | void hmac_md5_update(const unsigned char *text, int text_len, | 34 | void hmac_md5_update(const unsigned char *text, int text_len, |
| 35 | struct HMACMD5Context *ctx); | 35 | struct HMACMD5Context *ctx); |
| 36 | void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx); | 36 | void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx); |
| 37 | void hmac_md5(unsigned char key[16], unsigned char *data, int data_len, | 37 | /* void hmac_md5(unsigned char key[16], unsigned char *data, int data_len, |
| 38 | unsigned char *digest); | 38 | unsigned char *digest);*/ |