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

Commit 3d04174b authored by Vincent Pelletier's avatar Vincent Pelletier Committed by Greg Kroah-Hartman
Browse files

scsi: target: iscsi: Use bin2hex instead of a re-implementation 



commit 8c39e2699f8acb2e29782a834e56306da24937fe upstream.

Signed-off-by: default avatarVincent Pelletier <plr.vincent@gmail.com>
Reviewed-by: default avatarMike Christie <mchristi@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
[plr.vincent@gmail.com: hunk context change for 4.4 and 4.9, no code change]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b2e23202

drivers/target/iscsi/iscsi_target_auth.c

+3 −12
Original line number Diff line number Diff line
@@ -26,15 +26,6 @@ 
#include "iscsi_target_nego.h"

#include "iscsi_target_auth.h"



static void chap_binaryhex_to_asciihex(char *dst, char *src, int src_len)

{

	int i;



	for (i = 0; i < src_len; i++) {

		sprintf(&dst[i*2], "%02x", (int) src[i] & 0xff);

	}

}



static void chap_gen_challenge(

	struct iscsi_conn *conn,

	int caller,
@@ -47,7 +38,7 @@ static void chap_gen_challenge( 
	memset(challenge_asciihex, 0, CHAP_CHALLENGE_LENGTH * 2 + 1);



	get_random_bytes(chap->challenge, CHAP_CHALLENGE_LENGTH);

	chap_binaryhex_to_asciihex(challenge_asciihex, chap->challenge,

	bin2hex(challenge_asciihex, chap->challenge,

				CHAP_CHALLENGE_LENGTH);

	/*

	 * Set CHAP_C, and copy the generated challenge into c_str.
@@ -281,7 +272,7 @@ static int chap_server_compute_md5( 
		goto out;

	}



	chap_binaryhex_to_asciihex(response, server_digest, MD5_SIGNATURE_SIZE);

	bin2hex(response, server_digest, MD5_SIGNATURE_SIZE);

	pr_debug("[server] MD5 Server Digest: %s\n", response);



	if (memcmp(server_digest, client_digest, MD5_SIGNATURE_SIZE) != 0) {
@@ -403,7 +394,7 @@ static int chap_server_compute_md5( 
	/*

	 * Convert response from binary hex to ascii hext.

	 */

	chap_binaryhex_to_asciihex(response, digest, MD5_SIGNATURE_SIZE);

	bin2hex(response, digest, MD5_SIGNATURE_SIZE);

	*nr_out_len += sprintf(nr_out_ptr + *nr_out_len, "CHAP_R=0x%s",

			response);

	*nr_out_len += 1;