From b02b6511c6f1e2ab334479fa98409fab01ad2c2d Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Fri, 24 Jan 2025 13:49:53 -0700 Subject: [PATCH] fix warnings for clang build with xmss support --- src/genkey/clu_genkey_setup.c | 4 ++-- src/sign-verify/clu_sign.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/genkey/clu_genkey_setup.c b/src/genkey/clu_genkey_setup.c index f12b5c54..bfe7052f 100644 --- a/src/genkey/clu_genkey_setup.c +++ b/src/genkey/clu_genkey_setup.c @@ -349,7 +349,7 @@ int wolfCLU_genKeySetup(int argc, char** argv) int directiveArg = PRIV_AND_PUB_FILES; char xmssmtParam[XMSSMT_NAME_MAX_LEN + 1]; /* XMSS^MT parameter */ char xmssmtParamHead[] = "XMSSMT-SHA2_\0"; - const int xmssmtHeadLen = XSTRLEN(xmssmtParamHead); + const int xmssmtHeadLen = (int)XSTRLEN(xmssmtParamHead); int height = 0; const int XMSSMT_MIN_HEIGHT = 20; const int hdLen = 9; @@ -511,7 +511,7 @@ int wolfCLU_genKeySetup(int argc, char** argv) int directiveArg = PRIV_AND_PUB_FILES; char xmssParam[XMSS_NAME_LEN + 1]; /* XMSS parameter */ char xmssParamHead[] = "XMSS-SHA2_"; - int xmssHeadLen = XSTRLEN(xmssParamHead); + int xmssHeadLen = (int)XSTRLEN(xmssParamHead); const int hLen = 6; WOLFCLU_LOG(WOLFCLU_L0, "Generate XMSS Key"); diff --git a/src/sign-verify/clu_sign.c b/src/sign-verify/clu_sign.c index c80ff3c9..7004e7fa 100644 --- a/src/sign-verify/clu_sign.c +++ b/src/sign-verify/clu_sign.c @@ -902,9 +902,13 @@ int wolfCLU_sign_data_xmssmt(byte* data, char* out, int fSz, char* privKey) word32 outBufSz = 0; /* signature buffer size */ char* paramStr = NULL; /* parameter string */ int paramLen = 0; /* parameter string length */ - int privKeyLen = XSTRLEN(privKey); /* private key file name length */ + int privKeyLen = 0; /* private key file name length */ int fileHeadLen = 7; /* file header(XMSSMT-) length */ + if (privKey == NULL) { + return BAD_FUNC_ARG; + } + privKeyLen = (int)XSTRLEN(privKey); #ifdef WOLFSSL_SMALL_STACK XmssKey *key = (XmssKey*)XMALLOC(sizeof(XmssKey), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -974,7 +978,7 @@ int wolfCLU_sign_data_xmssmt(byte* data, char* out, int fSz, char* privKey) XMEMSET(paramStr, 0, paramLen); XSTRNCPY(paramStr, privKey, paramLen); paramStr[paramLen - 1] = '\0'; - /* + /* * replace from '-' to '/' such as * from "XMSSMT-SHA2_20-2_256" to "XMSSMT-SHA2_20/2_256" */