Commit 4e54b1a0 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Ben Walker
Browse files

iscsi: Support Base64 constants for iSCSI certification CHAP test 



A major iSCSI initiator requires iSCSI targets to handle base64
constants for CHAP packets from the initiator.

This patch enables the SPDK iSCSI target to handle base64 constants
for CHAP packets from the initiator.

Change-Id: I276eb73113c40baa322904fe562d5b6016cccf33
Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/431086


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ec257c5f

lib/iscsi/iscsi.c

+39 −7
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include "spdk/stdinc.h"



#include "spdk/base64.h"

#include "spdk/crc32.h"

#include "spdk/endian.h"

#include "spdk/env.h"
@@ -795,6 +796,7 @@ spdk_iscsi_auth_params(struct spdk_iscsi_conn *conn, 
		uint8_t resmd5[SPDK_MD5DIGEST_LEN];

		uint8_t tgtmd5[SPDK_MD5DIGEST_LEN];

		struct spdk_md5ctx md5ctx;

		size_t decoded_len = 0;



		if (conn->auth.chap_phase != ISCSI_CHAP_PHASE_WAIT_NR) {

			SPDK_ERRLOG("CHAP sequence error\n");
@@ -806,11 +808,25 @@ spdk_iscsi_auth_params(struct spdk_iscsi_conn *conn, 
			SPDK_ERRLOG("no response\n");

			goto error_return;

		}

		if (response[0] == '0' &&

		    (response[1] == 'x' || response[1] == 'X')) {

			rc = spdk_hex2bin(resmd5, SPDK_MD5DIGEST_LEN, response);

			if (rc < 0 || rc != SPDK_MD5DIGEST_LEN) {

				SPDK_ERRLOG("response format error\n");

				goto error_return;

			}

		} else if (response[0] == '0' &&

			   (response[1] == 'b' || response[1] == 'B')) {

			response += 2;

			rc = spdk_base64_decode(resmd5, &decoded_len, response);

			if (rc < 0 || decoded_len != SPDK_MD5DIGEST_LEN) {

				SPDK_ERRLOG("response format error\n");

				goto error_return;

			}

		} else {

			SPDK_ERRLOG("response format error\n");

			goto error_return;

		}

		SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "got CHAP_N/CHAP_R\n");



		rc = spdk_iscsi_get_authinfo(conn, name);
@@ -865,6 +881,8 @@ spdk_iscsi_auth_params(struct spdk_iscsi_conn *conn, 
				SPDK_ERRLOG("CHAP sequence error\n");

				goto error_return;

			}

			if (challenge[0] == '0' &&

			    (challenge[1] == 'x' || challenge[1] == 'X')) {

				rc = spdk_hex2bin(conn->auth.chap_mchallenge,

						  ISCSI_CHAP_CHALLENGE_LEN,

						  challenge);
@@ -873,6 +891,20 @@ spdk_iscsi_auth_params(struct spdk_iscsi_conn *conn, 
					goto error_return;

				}

				conn->auth.chap_mchallenge_len = rc;

			} else if (challenge[0] == '0' &&

				   (challenge[1] == 'b' || challenge[1] == 'B')) {

				challenge += 2;

				rc = spdk_base64_decode(conn->auth.chap_mchallenge,

							&decoded_len, challenge);

				if (rc < 0) {

					SPDK_ERRLOG("challenge format error\n");

					goto error_return;

				}

				conn->auth.chap_mchallenge_len = decoded_len;

			} else {

				SPDK_ERRLOG("challenge format error\n");

				goto error_return;

			}

#if 0

			spdk_dump("MChallenge", conn->auth.chap_mchallenge,

				  conn->auth.chap_mchallenge_len);