feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #8660 from douzzer/20250411-fixes

Browse Source 
20250411-fixes
This commit is contained in:
David Garske
2025-04-11 10:43:27 -07:00
committed by GitHub
parent 8ee7d381ec 7acc3360fc
commit 1f34b71017
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/pq-all.yml vendored
View File

@@ -18,7 +18,8 @@ jobs:
matrix: matrix:
config: [ config: [
# Add new configs here # Add new configs here
'--enable-intelasm --enable-sp-asm --enable-all --enable-testcert --enable-acert --enable-dtls13 --enable-dtls-mtu --enable-dtls-frag-ch --enable-dtlscid --enable-quic --with-sys-crypto-policy --enable-experimental --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-dual-alg-certs --disable-qt CPPFLAGS="-pedantic -Wdeclaration-after-statement -DWOLFCRYPT_TEST_LINT -DNO_WOLFSSL_CIPHER_SUITE_TEST"' '--enable-intelasm --enable-sp-asm --enable-all --enable-testcert --enable-acert --enable-dtls13 --enable-dtls-mtu --enable-dtls-frag-ch --enable-dtlscid --enable-quic --with-sys-crypto-policy --enable-experimental --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-dual-alg-certs --disable-qt CPPFLAGS="-pedantic -Wdeclaration-after-statement -DWOLFCRYPT_TEST_LINT -DNO_WOLFSSL_CIPHER_SUITE_TEST -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
'--enable-intelasm --enable-sp-asm --enable-all --enable-testcert --enable-acert --enable-dtls13 --enable-dtls-mtu --enable-dtls-frag-ch --enable-dtlscid --enable-quic --with-sys-crypto-policy --enable-experimental --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-dual-alg-certs --disable-qt CPPFLAGS="-pedantic -Wdeclaration-after-statement -DWOLFCRYPT_TEST_LINT -DNO_WOLFSSL_CIPHER_SUITE_TEST -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE" CC=c++'
] ]
name: make check name: make check
if: github.repository_owner == 'wolfssl' if: github.repository_owner == 'wolfssl'

4
src/internal.c
View File

@@ -42369,7 +42369,7 @@ WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_value(
WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_pop( WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_pop(
WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH)* sk) WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH)* sk)
{ {
return wolfSSL_sk_pop(sk); return (WOLFSSL_BY_DIR_HASH *)wolfSSL_sk_pop(sk);
} }
/* release all contents in stack, and then release stack itself. */ /* release all contents in stack, and then release stack itself. */
/* Second argument is a function pointer to release resources. */ /* Second argument is a function pointer to release resources. */
@@ -42501,7 +42501,7 @@ WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_value(
WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_pop( WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_pop(
WOLF_STACK_OF(WOLFSSL_BY_DIR_entry)* sk) WOLF_STACK_OF(WOLFSSL_BY_DIR_entry)* sk)
{ {
return wolfSSL_sk_pop(sk); return (WOLFSSL_BY_DIR_entry *)wolfSSL_sk_pop(sk);
} }
/* release all contents in stack, and then release stack itself. */ /* release all contents in stack, and then release stack itself. */
/* Second argument is a function pointer to release resources. */ /* Second argument is a function pointer to release resources. */

8
tests/api.c
View File

@@ -15772,11 +15772,13 @@ static int test_wc_PKCS7_EncodeSignedData(void)
{ {
int signedSz = 0, i; int signedSz = 0, i;
encodeSignedDataStream strm; encodeSignedDataStream strm;
int numberOfChunkSizes = 4; static const int numberOfChunkSizes = 4;
word32 chunkSizes[] = { 4080, 4096, 5000, 9999 }; static const word32 chunkSizes[] = { 4080, 4096, 5000, 9999 };
/* chunkSizes were chosen to test around the default 4096 octet string /* chunkSizes were chosen to test around the default 4096 octet string
* size used in pkcs7.c */ * size used in pkcs7.c */
XMEMSET(&strm, 0, sizeof(strm));
ExpectNotNull(pkcs7 = wc_PKCS7_New(HEAP_HINT, testDevId)); ExpectNotNull(pkcs7 = wc_PKCS7_New(HEAP_HINT, testDevId));
ExpectIntEQ(wc_PKCS7_Init(pkcs7, HEAP_HINT, INVALID_DEVID), 0); ExpectIntEQ(wc_PKCS7_Init(pkcs7, HEAP_HINT, INVALID_DEVID), 0);
@@ -33032,7 +33034,7 @@ static int test_wolfSSL_PKCS8_d2i(void)
bio = NULL; bio = NULL;
/* https://github.com/wolfSSL/wolfssl/issues/8610 */ /* https://github.com/wolfSSL/wolfssl/issues/8610 */
bytes = (int)XSTRLEN((void*)pkcs8_buffer); bytes = (int)XSTRLEN((char *)pkcs8_buffer);
ExpectNotNull(bio = BIO_new_mem_buf((void*)pkcs8_buffer, bytes)); ExpectNotNull(bio = BIO_new_mem_buf((void*)pkcs8_buffer, bytes));
ExpectIntEQ(BIO_get_mem_data(bio, &p), bytes); ExpectIntEQ(BIO_get_mem_data(bio, &p), bytes);
ExpectIntEQ(XMEMCMP(p, pkcs8_buffer, bytes), 0); ExpectIntEQ(XMEMCMP(p, pkcs8_buffer, bytes), 0);