Skip to content

Fix to make sure ASN.1 is enabled if just building PQ algorithms #8884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SparkiDev merged 2 commits into from
Jun 19, 2025
Merged

Fix to make sure ASN.1 is enabled if just building PQ algorithms #8884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdbc4cb
Fix to make sure certs/asn are enabled for PQ algorithms
dgarske Jun 16, 2025
9528aaf
Support `WOLFSSL_TRACK_MEMORY` with `SINGLE_THREADED`.
dgarske Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,6 +1665,7 @@ then
test "$enable_shake128" = "" && enable_shake128=yes
test "$enable_shake256" = "" && enable_shake256=yes
fi
ENABLED_CERTS=yes
fi

# XMSS
Expand Down Expand Up @@ -4444,6 +4445,7 @@ then
fi

AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SM2 -DWOLFSSL_BASE16"
ENABLED_CERTS=yes
fi


Expand Down Expand Up @@ -6305,6 +6307,7 @@ then

AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE448"
ENABLED_FE448=yes
ENABLED_CERTS=yes
fi

# Ed448
Expand Down Expand Up @@ -9922,10 +9925,6 @@ then
AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_ED25519"
ENABLED_FEMATH=yes
ENABLED_GEMATH=yes
fi

if test "$ENABLED_ED25519" != "no" || test "$ENABLED_ED448" != "no"
then
ENABLED_CERTS=yes
fi

Expand Down
8 changes: 4 additions & 4 deletions wolfssl/wolfcrypt/mem_track.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static WC_INLINE void* TrackMalloc(size_t sz)
(void)line;
#endif
#endif
#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
#if !defined(SINGLE_THREADED) && (defined(DO_MEM_LIST) || defined(DO_MEM_STATS))
if (pthread_mutex_lock(&memLock) == 0)
{
#endif
Expand Down Expand Up @@ -223,7 +223,7 @@ static WC_INLINE void* TrackMalloc(size_t sz)
ourMemList.tail = header; /* add to the end either way */
ourMemList.count++;
#endif
#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
#if !defined(SINGLE_THREADED) && (defined(DO_MEM_LIST) || defined(DO_MEM_STATS))
pthread_mutex_unlock(&memLock);
}
#endif /* DO_MEM_LIST */
Expand All @@ -250,7 +250,7 @@ static WC_INLINE void TrackFree(void* ptr)
header = &mt->u.hint;
sz = header->thisSize;

#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
#if !defined(SINGLE_THREADED) && (defined(DO_MEM_LIST) || defined(DO_MEM_STATS))
if (pthread_mutex_lock(&memLock) == 0)
{
#endif
Expand Down Expand Up @@ -284,7 +284,7 @@ static WC_INLINE void TrackFree(void* ptr)
ourMemList.count--;
#endif

#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
#if !defined(SINGLE_THREADED) && (defined(DO_MEM_LIST) || defined(DO_MEM_STATS))
pthread_mutex_unlock(&memLock);
}
#endif
Expand Down
Loading