63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From: Vincent Pelletier <plr.vincent@gmail.com>
|
|
Date: Sun, 9 Sep 2018 04:09:27 +0000
|
|
Subject: scsi: target: iscsi: Use bin2hex instead of a re-implementation
|
|
Origin: https://git.kernel.org/linus/8c39e2699f8acb2e29782a834e56306da24937fe
|
|
|
|
Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com>
|
|
Reviewed-by: Mike Christie <mchristi@redhat.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
---
|
|
drivers/target/iscsi/iscsi_target_auth.c | 15 +++------------
|
|
1 file changed, 3 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
|
|
index 6c3b4c022894..4e680d753941 100644
|
|
--- a/drivers/target/iscsi/iscsi_target_auth.c
|
|
+++ b/drivers/target/iscsi/iscsi_target_auth.c
|
|
@@ -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 int chap_gen_challenge(
|
|
struct iscsi_conn *conn,
|
|
int caller,
|
|
@@ -50,7 +41,7 @@ static int chap_gen_challenge(
|
|
ret = get_random_bytes_wait(chap->challenge, CHAP_CHALLENGE_LENGTH);
|
|
if (unlikely(ret))
|
|
return ret;
|
|
- 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.
|
|
@@ -289,7 +280,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) {
|
|
@@ -411,7 +402,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;
|
|
--
|
|
2.11.0
|
|
|