Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43988d76 authored by Steve French's avatar Steve French
Browse files

[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: default avatarShirish Pargaonkar <shirishpargaonkar@gmail.com>
CC: Dan Carpenter <error27@gmail.com>
Acked-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 25720873

fs/cifs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config CIFS 
	select CRYPTO_MD5

	select CRYPTO_HMAC

	select CRYPTO_ARC4

	select CRYPTO_DES

	help

	  This is the client VFS module for the Common Internet File System

	  (CIFS) protocol which is the successor to the Server Message Block

fs/cifs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
obj-$(CONFIG_CIFS) += cifs.o



cifs-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o \

	  link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o \

	  link.o misc.o netmisc.o smbencrypt.o transport.o asn1.o \

	  cifs_unicode.o nterr.o xattr.o cifsencrypt.o \

	  readdir.o ioctl.o sess.o export.o

fs/cifs/cifsencrypt.c

+5 −5
Original line number Diff line number Diff line
@@ -268,10 +268,11 @@ int setup_ntlm_response(struct cifsSesInfo *ses) 
}



#ifdef CONFIG_CIFS_WEAK_PW_HASH

void calc_lanman_hash(const char *password, const char *cryptkey, bool encrypt,

int calc_lanman_hash(const char *password, const char *cryptkey, bool encrypt,

			char *lnm_session_key)

{

	int i;

	int rc;

	char password_with_pad[CIFS_ENCPWD_SIZE];



	memset(password_with_pad, 0, CIFS_ENCPWD_SIZE);
@@ -282,7 +283,7 @@ void calc_lanman_hash(const char *password, const char *cryptkey, bool encrypt, 
		memset(lnm_session_key, 0, CIFS_SESS_KEY_SIZE);

		memcpy(lnm_session_key, password_with_pad,

			CIFS_ENCPWD_SIZE);

		return;

		return 0;

	}



	/* calculate old style session key */
@@ -299,10 +300,9 @@ void calc_lanman_hash(const char *password, const char *cryptkey, bool encrypt, 
	for (i = 0; i < CIFS_ENCPWD_SIZE; i++)

		password_with_pad[i] = toupper(password_with_pad[i]);



	SMBencrypt(password_with_pad, cryptkey, lnm_session_key);

	rc = SMBencrypt(password_with_pad, cryptkey, lnm_session_key);



	/* clear password before we return/free memory */

	memset(password_with_pad, 0, CIFS_ENCPWD_SIZE);

	return rc;

}

#endif /* CIFS_WEAK_PW_HASH */

fs/cifs/cifsproto.h

+2 −5
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ extern void cifs_crypto_shash_release(struct TCP_Server_Info *); 
extern int calc_seckey(struct cifsSesInfo *);



#ifdef CONFIG_CIFS_WEAK_PW_HASH

extern void calc_lanman_hash(const char *password, const char *cryptkey,

extern int calc_lanman_hash(const char *password, const char *cryptkey,

				bool encrypt, char *lnm_session_key);

#endif /* CIFS_WEAK_PW_HASH */

#ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* unused temporarily */
@@ -430,9 +430,6 @@ extern int CIFSCheckMFSymlink(struct cifs_fattr *fattr, 
		struct cifs_sb_info *cifs_sb, int xid);

extern int mdfour(unsigned char *, unsigned char *, int);

extern int E_md4hash(const unsigned char *passwd, unsigned char *p16);

extern void SMBencrypt(unsigned char *passwd, const unsigned char *c8,

			unsigned char *p24);

extern void E_P16(unsigned char *p14, unsigned char *p16);

extern void E_P24(unsigned char *p21, const unsigned char *c8,

extern int SMBencrypt(unsigned char *passwd, const unsigned char *c8,

			unsigned char *p24);

#endif			/* _CIFSPROTO_H */

fs/cifs/sess.c

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, 
		 * to use challenge/response method (i.e. Password bit is 1).

		 */



		calc_lanman_hash(ses->password, ses->server->cryptkey,

		rc = calc_lanman_hash(ses->password, ses->server->cryptkey,

				 ses->server->secMode & SECMODE_PW_ENCRYPT ?

					true : false, lnm_session_key);