aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsproto.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2011-04-19 14:23:31 -0400
committerSteve French <sfrench@us.ibm.com>2011-05-19 10:10:49 -0400
commit43988d76851077d2945080665e3c4e2e636d700a (patch)
tree8fe4d82c49687c47f496803197f2a8736a8e2dfc /fs/cifs/cifsproto.h
parent257208736acc694def83627fa0de2892490a5d42 (diff)
[CIFS] Use ecb des kernel crypto APIs instead of
local cifs functions (repost) Using kernel crypto APIs for DES encryption during LM and NT hash generation instead of local functions within cifs. Source file smbdes.c is deleted sans four functions, one of which uses ecb des functionality provided by kernel crypto APIs. Remove function SMBOWFencrypt. Add return codes to various functions such as calc_lanman_hash, SMBencrypt, and SMBNTencrypt. Includes fix noticed by Dan Carpenter. Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com> CC: Dan Carpenter <error27@gmail.com> Acked-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsproto.h')
-rw-r--r--fs/cifs/cifsproto.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index da7a4923783f..e94526949677 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -384,7 +384,7 @@ extern void cifs_crypto_shash_release(struct TCP_Server_Info *);
384extern int calc_seckey(struct cifsSesInfo *); 384extern int calc_seckey(struct cifsSesInfo *);
385 385
386#ifdef CONFIG_CIFS_WEAK_PW_HASH 386#ifdef CONFIG_CIFS_WEAK_PW_HASH
387extern void calc_lanman_hash(const char *password, const char *cryptkey, 387extern int calc_lanman_hash(const char *password, const char *cryptkey,
388 bool encrypt, char *lnm_session_key); 388 bool encrypt, char *lnm_session_key);
389#endif /* CIFS_WEAK_PW_HASH */ 389#endif /* CIFS_WEAK_PW_HASH */
390#ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */ 390#ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */
@@ -430,9 +430,6 @@ extern int CIFSCheckMFSymlink(struct cifs_fattr *fattr,
430 struct cifs_sb_info *cifs_sb, int xid); 430 struct cifs_sb_info *cifs_sb, int xid);
431extern int mdfour(unsigned char *, unsigned char *, int); 431extern int mdfour(unsigned char *, unsigned char *, int);
432extern int E_md4hash(const unsigned char *passwd, unsigned char *p16); 432extern int E_md4hash(const unsigned char *passwd, unsigned char *p16);
433extern void SMBencrypt(unsigned char *passwd, const unsigned char *c8, 433extern int SMBencrypt(unsigned char *passwd, const unsigned char *c8,
434 unsigned char *p24);
435extern void E_P16(unsigned char *p14, unsigned char *p16);
436extern void E_P24(unsigned char *p21, const unsigned char *c8,
437 unsigned char *p24); 434 unsigned char *p24);
438#endif /* _CIFSPROTO_H */ 435#endif /* _CIFSPROTO_H */