ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I51cfa25800e8cbb25db02f425b8d257e4e837d68
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1889
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Seth Howell <seth.howell@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-04-16 07:01:40 +09:00 committed by Tomasz Zawadzki
parent a587a1072a
commit 71e29ada6b
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/iscsi/iscsi.c
View File

@ -948,17 +948,17 @@ iscsi_auth_params(struct spdk_iscsi_conn *conn,
goto error_return; goto error_return;
} }
spdk_md5init(&md5ctx); md5init(&md5ctx);
/* Identifier */ /* Identifier */
spdk_md5update(&md5ctx, conn->auth.chap_id, 1); md5update(&md5ctx, conn->auth.chap_id, 1);
/* followed by secret */ /* followed by secret */
spdk_md5update(&md5ctx, conn->auth.secret, md5update(&md5ctx, conn->auth.secret,
strlen(conn->auth.secret)); strlen(conn->auth.secret));
/* followed by Challenge Value */ /* followed by Challenge Value */
spdk_md5update(&md5ctx, conn->auth.chap_challenge, md5update(&md5ctx, conn->auth.chap_challenge,
conn->auth.chap_challenge_len); conn->auth.chap_challenge_len);
/* tgtmd5 is expecting Response Value */ /* tgtmd5 is expecting Response Value */
spdk_md5final(tgtmd5, &md5ctx); md5final(tgtmd5, &md5ctx);
bin2hex(in_val, ISCSI_TEXT_MAX_VAL_LEN, tgtmd5, SPDK_MD5DIGEST_LEN); 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; goto error_return;
} }
spdk_md5init(&md5ctx); md5init(&md5ctx);
/* Identifier */ /* Identifier */
spdk_md5update(&md5ctx, conn->auth.chap_mid, 1); md5update(&md5ctx, conn->auth.chap_mid, 1);
/* followed by secret */ /* followed by secret */
spdk_md5update(&md5ctx, conn->auth.msecret, md5update(&md5ctx, conn->auth.msecret,
strlen(conn->auth.msecret)); strlen(conn->auth.msecret));
/* followed by Challenge Value */ /* followed by Challenge Value */
spdk_md5update(&md5ctx, conn->auth.chap_mchallenge, md5update(&md5ctx, conn->auth.chap_mchallenge,
conn->auth.chap_mchallenge_len); conn->auth.chap_mchallenge_len);
/* tgtmd5 is Response Value */ /* tgtmd5 is Response Value */
spdk_md5final(tgtmd5, &md5ctx); md5final(tgtmd5, &md5ctx);
bin2hex(in_val, ISCSI_TEXT_MAX_VAL_LEN, tgtmd5, SPDK_MD5DIGEST_LEN); bin2hex(in_val, ISCSI_TEXT_MAX_VAL_LEN, tgtmd5, SPDK_MD5DIGEST_LEN);

6
lib/iscsi/md5.c
View File

@ -38,7 +38,7 @@
#include "iscsi/md5.h" #include "iscsi/md5.h"
int spdk_md5init(struct spdk_md5ctx *md5ctx) int md5init(struct spdk_md5ctx *md5ctx)
{ {
int rc; int rc;
@ -49,7 +49,7 @@ int spdk_md5init(struct spdk_md5ctx *md5ctx)
return rc; return rc;
} }
int spdk_md5final(void *md5, struct spdk_md5ctx *md5ctx) int md5final(void *md5, struct spdk_md5ctx *md5ctx)
{ {
int rc; int rc;
@ -60,7 +60,7 @@ int spdk_md5final(void *md5, struct spdk_md5ctx *md5ctx)
return rc; 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; int rc;

6
lib/iscsi/md5.h
View File

@ -45,8 +45,8 @@ struct spdk_md5ctx {
MD5_CTX md5ctx; MD5_CTX md5ctx;
}; };
int spdk_md5init(struct spdk_md5ctx *md5ctx); int md5init(struct spdk_md5ctx *md5ctx);
int spdk_md5final(void *md5, struct spdk_md5ctx *md5ctx); int md5final(void *md5, struct spdk_md5ctx *md5ctx);
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);
#endif /* SPDK_MD5_H */ #endif /* SPDK_MD5_H */