wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-29 18:27:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for ML-DSA and LMS cast warnings and spelling errors.

Browse Source
This commit is contained in:
David Garske
2024-12-05 08:34:58 -08:00
parent 19b486e1f7
commit 1e9607b65e
7 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/client/client.c
View File

@ -2433,7 +2433,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
}
else if (XSTRCMP(myoptarg, "verifyInfo") == 0) {
printf("Verify should not override error\n");
myVerifyAction = VERIFY_USE_PREVERFIY;
myVerifyAction = VERIFY_USE_PREVERIFY;
}
else if (XSTRCMP(myoptarg, "useSupCurve") == 0) {
printf("Attempting to test use supported curve\n");
@ -3506,7 +3506,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif
}
if (useVerifyCb || myVerifyAction == VERIFY_FORCE_FAIL ||
myVerifyAction == VERIFY_USE_PREVERFIY) {
myVerifyAction == VERIFY_USE_PREVERIFY) {
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, myVerify);
}
else if (!usePsk && !useAnon && doPeerCheck == 0) {

2
examples/server/server.c
View File

@ -1882,7 +1882,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
}
else if (XSTRCMP(myoptarg, "verifyInfo") == 0) {
printf("Verify should use preverify (just show info)\n");
myVerifyAction = VERIFY_USE_PREVERFIY;
myVerifyAction = VERIFY_USE_PREVERIFY;
}
else if (XSTRCMP(myoptarg, "loadSSL") == 0) {
printf("Also load cert/key into wolfSSL object\n");

10
tests/api.c
View File

@ -9472,7 +9472,7 @@ static int test_wolfSSL_CTX_verifyDepth_ServerClient_1_ctx_ready(
WOLFSSL_CTX* ctx)
{
wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, myVerify);
myVerifyAction = VERIFY_USE_PREVERFIY;
myVerifyAction = VERIFY_USE_PREVERIFY;
wolfSSL_CTX_set_verify_depth(ctx, 2);
return TEST_SUCCESS;
}
@ -9552,7 +9552,7 @@ static int test_wolfSSL_CTX_verifyDepth_ServerClient_3_ctx_ready(
WOLFSSL_CTX* ctx)
{
wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, myVerify);
myVerifyAction = VERIFY_USE_PREVERFIY;
myVerifyAction = VERIFY_USE_PREVERIFY;
wolfSSL_CTX_set_verify_depth(ctx, 0);
return TEST_SUCCESS;
}
@ -95334,7 +95334,7 @@ static int test_revoked_loaded_int_cert_ctx_ready1(WOLFSSL_CTX* ctx)
{
EXPECT_DECLS;
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, myVerify);
myVerifyAction = VERIFY_USE_PREVERFIY;
myVerifyAction = VERIFY_USE_PREVERIFY;
ExpectIntEQ(wolfSSL_CTX_load_verify_locations_ex(ctx,
"./certs/ca-cert.pem", NULL, 0), WOLFSSL_SUCCESS);
ExpectIntEQ(wolfSSL_CTX_load_verify_locations_ex(ctx,
@ -95354,7 +95354,7 @@ static int test_revoked_loaded_int_cert_ctx_ready2(WOLFSSL_CTX* ctx)
{
EXPECT_DECLS;
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, myVerify);
myVerifyAction = VERIFY_USE_PREVERFIY;
myVerifyAction = VERIFY_USE_PREVERIFY;
ExpectIntEQ(wolfSSL_CTX_load_verify_locations_ex(ctx,
"./certs/ca-cert.pem", NULL, 0), WOLFSSL_SUCCESS);
ExpectIntEQ(wolfSSL_CTX_load_verify_locations_ex(ctx,
@ -95391,7 +95391,7 @@ static int test_revoked_loaded_int_cert_ctx_ready3(WOLFSSL_CTX* ctx)
{
EXPECT_DECLS;
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, myVerify);
myVerifyAction = VERIFY_USE_PREVERFIY;
myVerifyAction = VERIFY_USE_PREVERIFY;
ExpectIntEQ(wolfSSL_CTX_load_verify_locations_ex(ctx,
"./certs/ca-cert.pem", NULL, 0), WOLFSSL_SUCCESS);
ExpectIntEQ(wolfSSL_CTX_load_verify_locations_ex(ctx,

4
wolfcrypt/src/dilithium.c
View File

@ -2761,8 +2761,8 @@ static int dilithium_vec_expand_mask(wc_Shake* shake256, byte* seed,
word16 n = kappa + r;
/* Step 4: Append to seed and squeeze out data. */
seed[DILITHIUM_PRIV_RAND_SEED_SZ + 0] = n;
seed[DILITHIUM_PRIV_RAND_SEED_SZ + 1] = n >> 8;
seed[DILITHIUM_PRIV_RAND_SEED_SZ + 0] = (byte)n;
seed[DILITHIUM_PRIV_RAND_SEED_SZ + 1] = (byte)(n >> 8);
ret = dilithium_squeeze256(shake256, seed, DILITHIUM_Y_SEED_SZ, v,
DILITHIUM_MAX_V_BLOCKS);
if (ret == 0) {

20
wolfcrypt/src/wc_lms_impl.c
View File

@ -104,7 +104,7 @@
#ifdef WC_LMS_DEBUG_PRINT_DATA
/* Print data when dubgging implementation.
/* Print data when debugging implementation.
*
* @param [in] name String to print before data.
* @param [in] data Array of bytes.
@ -859,7 +859,7 @@ static int wc_lmots_msg_hash(LmsState* state, const byte* msg, word32 msgSz,
* }
* y[i] = tmp
* }
* x[i] can be calculated on the fly using psueodo key generation in Appendix A.
* x[i] can be calculated on the fly using pseudo key generation in Appendix A.
* Appendix A, The elements of the LM-OTS private keys are computed as:
* x_q[i] = H(I || u32str(q) || u16str(i) || u8str(0xff) || SEED).
*
@ -875,7 +875,7 @@ static int wc_lmots_compute_y_from_seed(LmsState* state, const byte* seed,
const byte* msg, word32 msgSz, const byte* c, byte* y)
{
const LmsParams* params = state->params;
int ret = 0;
int ret;
word16 i;
byte q[LMS_MAX_NODE_LEN + LMS_CKSM_LEN];
#ifdef WOLFSSL_SMALL_STACK
@ -892,8 +892,8 @@ static int wc_lmots_compute_y_from_seed(LmsState* state, const byte* seed,
ret = wc_lmots_msg_hash(state, msg, msgSz, c, q);
if (ret == 0) {
/* Calculate checksum list all coefficients. */
ret = wc_lmots_q_expand(q, params->hash_len, params->width, params->ls,
a);
ret = wc_lmots_q_expand(q, (word8)params->hash_len, params->width,
params->ls, a);
}
#ifndef WC_LMS_FULL_HASH
if (ret == 0) {
@ -1063,8 +1063,8 @@ static int wc_lmots_compute_kc_from_sig(LmsState* state, const byte* msg,
}
if (ret == 0) {
/* Calculate checksum list all coefficients. */
ret = wc_lmots_q_expand(q, params->hash_len, params->width, params->ls,
a);
ret = wc_lmots_q_expand(q, (word8)params->hash_len, params->width,
params->ls, a);
}
#ifndef WC_LMS_FULL_HASH
if (ret == 0) {
@ -1178,7 +1178,7 @@ static int wc_lmots_compute_kc_from_sig(LmsState* state, const byte* msg,
* }
* K = H(I || u32str(q) || u16str(D_PBLC) || y[0] || ... || y[p-1])
* ...
* x[i] can be calculated on the fly using psueodo key generation in Appendix A.
* x[i] can be calculated on the fly using pseudo key generation in Appendix A.
* Appendix A, The elements of the LM-OTS private keys are computed as:
* x_q[i] = H(I || u32str(q) || u16str(i) || u8str(0xff) || SEED).
*
@ -3679,11 +3679,11 @@ int wc_hss_sigsleft(const LmsParams* params, const byte* priv_raw)
*
* @param [in, out] state LMS state.
* @param [in] pub HSS public key.
* @param [in] msg Message to rifyn.
* @param [in] msg Message to verify.
* @param [in] msgSz Length of message in bytes.
* @param [in] sig Signature of message.
* @return 0 on success.
* @return SIG_VERFIY_E on failure.
* @return SIG_VERIFY_E on failure.
*/
int wc_hss_verify(LmsState* state, const byte* pub, const byte* msg,
word32 msgSz, const byte* sig)

2
wolfssl/test.h
View File

@ -2397,7 +2397,7 @@ static WC_INLINE void OCSPRespFreeCb(void* ioCtx, unsigned char* response)
enum {
VERIFY_OVERRIDE_ERROR,
VERIFY_FORCE_FAIL,
VERIFY_USE_PREVERFIY,
VERIFY_USE_PREVERIFY,
VERIFY_OVERRIDE_DATE_ERR,
};
static THREAD_LS_T int myVerifyAction = VERIFY_OVERRIDE_ERROR;

2
wolfssl/wolfcrypt/wc_port.h
View File

@ -947,9 +947,11 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
/* Windows API defines its own min() macro. */
#if defined(USE_WINDOWS_API)
#if defined(min) || defined(WOLFSSL_MYSQL_COMPATIBLE)
#undef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN
#endif /* min */
#if defined(max) || defined(WOLFSSL_MYSQL_COMPATIBLE)
#undef WOLFSSL_HAVE_MAX
#define WOLFSSL_HAVE_MAX
#endif /* max */
#endif /* USE_WINDOWS_API */