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

Merge pull request #8884 from dgarske/enablecerts

Browse Source 
Fix to make sure ASN.1 is enabled if just building PQ algorithms
This commit is contained in:
Sean Parkinson
2025-06-19 15:50:59 +10:00
committed by GitHub
parent 74de689941 9528aaf238
commit f7fb68dedc
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -1665,6 +1665,7 @@ then
test "$enable_shake128" = "" && enable_shake128=yes test "$enable_shake128" = "" && enable_shake128=yes
test "$enable_shake256" = "" && enable_shake256=yes test "$enable_shake256" = "" && enable_shake256=yes
fi fi
ENABLED_CERTS=yes
fi fi
# XMSS # XMSS
@ -4444,6 +4445,7 @@ then
fi fi
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SM2 -DWOLFSSL_BASE16" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SM2 -DWOLFSSL_BASE16"
ENABLED_CERTS=yes
fi fi
@ -6305,6 +6307,7 @@ then
AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE448" AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE448"
ENABLED_FE448=yes ENABLED_FE448=yes
ENABLED_CERTS=yes
fi fi
# Ed448 # Ed448
@ -9922,10 +9925,6 @@ then
AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_ED25519" AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_ED25519"
ENABLED_FEMATH=yes ENABLED_FEMATH=yes
ENABLED_GEMATH=yes ENABLED_GEMATH=yes
fi
if test "$ENABLED_ED25519" != "no" || test "$ENABLED_ED448" != "no"
then
ENABLED_CERTS=yes ENABLED_CERTS=yes
fi fi

8
wolfssl/wolfcrypt/mem_track.h
View File

@ -177,7 +177,7 @@ static WC_INLINE void* TrackMalloc(size_t sz)
(void)line; (void)line;
#endif #endif
#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) if (pthread_mutex_lock(&memLock) == 0)
{ {
#endif #endif
@ -223,7 +223,7 @@ static WC_INLINE void* TrackMalloc(size_t sz)
ourMemList.tail = header; /* add to the end either way */ ourMemList.tail = header; /* add to the end either way */
ourMemList.count++; ourMemList.count++;
#endif #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); pthread_mutex_unlock(&memLock);
} }
#endif /* DO_MEM_LIST */ #endif /* DO_MEM_LIST */
@ -250,7 +250,7 @@ static WC_INLINE void TrackFree(void* ptr)
header = &mt->u.hint; header = &mt->u.hint;
sz = header->thisSize; 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) if (pthread_mutex_lock(&memLock) == 0)
{ {
#endif #endif
@ -284,7 +284,7 @@ static WC_INLINE void TrackFree(void* ptr)
ourMemList.count--; ourMemList.count--;
#endif #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); pthread_mutex_unlock(&memLock);
} }
#endif #endif