Commit 71e29ada authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/iscsi: Remove the "spdk_" prefix from internal APIs declared in md5.h 



Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I51cfa25800e8cbb25db02f425b8d257e4e837d68
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1889


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent a587a107

lib/iscsi/iscsi.c

+14 −14
Original line number Diff line number Diff line
@@ -948,17 +948,17 @@ iscsi_auth_params(struct spdk_iscsi_conn *conn, 
			goto error_return;

		}



		spdk_md5init(&md5ctx);

		md5init(&md5ctx);

		/* Identifier */

		spdk_md5update(&md5ctx, conn->auth.chap_id, 1);

		md5update(&md5ctx, conn->auth.chap_id, 1);

		/* followed by secret */

		spdk_md5update(&md5ctx, conn->auth.secret,

		md5update(&md5ctx, conn->auth.secret,

			  strlen(conn->auth.secret));

		/* followed by Challenge Value */

		spdk_md5update(&md5ctx, conn->auth.chap_challenge,

		md5update(&md5ctx, conn->auth.chap_challenge,

			  conn->auth.chap_challenge_len);

		/* tgtmd5 is expecting Response Value */

		spdk_md5final(tgtmd5, &md5ctx);

		md5final(tgtmd5, &md5ctx);



		bin2hex(in_val, ISCSI_TEXT_MAX_VAL_LEN, tgtmd5, SPDK_MD5DIGEST_LEN);
@@ -1022,17 +1022,17 @@ iscsi_auth_params(struct spdk_iscsi_conn *conn, 
				goto error_return;

			}



			spdk_md5init(&md5ctx);

			md5init(&md5ctx);

			/* Identifier */

			spdk_md5update(&md5ctx, conn->auth.chap_mid, 1);

			md5update(&md5ctx, conn->auth.chap_mid, 1);

			/* followed by secret */

			spdk_md5update(&md5ctx, conn->auth.msecret,

			md5update(&md5ctx, conn->auth.msecret,

				  strlen(conn->auth.msecret));

			/* followed by Challenge Value */

			spdk_md5update(&md5ctx, conn->auth.chap_mchallenge,

			md5update(&md5ctx, conn->auth.chap_mchallenge,

				  conn->auth.chap_mchallenge_len);

			/* tgtmd5 is Response Value */

			spdk_md5final(tgtmd5, &md5ctx);

			md5final(tgtmd5, &md5ctx);



			bin2hex(in_val, ISCSI_TEXT_MAX_VAL_LEN, tgtmd5, SPDK_MD5DIGEST_LEN);

lib/iscsi/md5.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#include "iscsi/md5.h"



int spdk_md5init(struct spdk_md5ctx *md5ctx)

int md5init(struct spdk_md5ctx *md5ctx)

{

	int rc;
@@ -49,7 +49,7 @@ int spdk_md5init(struct spdk_md5ctx *md5ctx) 
	return rc;

}



int spdk_md5final(void *md5, struct spdk_md5ctx *md5ctx)

int md5final(void *md5, struct spdk_md5ctx *md5ctx)

{

	int rc;
@@ -60,7 +60,7 @@ int spdk_md5final(void *md5, struct spdk_md5ctx *md5ctx) 
	return rc;

}



int spdk_md5update(struct spdk_md5ctx *md5ctx, const void *data, size_t len)

int md5update(struct spdk_md5ctx *md5ctx, const void *data, size_t len)

{

	int rc;

lib/iscsi/md5.h

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ struct spdk_md5ctx { 
	MD5_CTX md5ctx;

};



int spdk_md5init(struct spdk_md5ctx *md5ctx);

int spdk_md5final(void *md5, struct spdk_md5ctx *md5ctx);

int spdk_md5update(struct spdk_md5ctx *md5ctx, const void *data, size_t len);

int md5init(struct spdk_md5ctx *md5ctx);

int md5final(void *md5, struct spdk_md5ctx *md5ctx);

int md5update(struct spdk_md5ctx *md5ctx, const void *data, size_t len);



#endif /* SPDK_MD5_H */