From 5e6005a1a3ff2d1a14adbb136a10f39487bdf985 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Tue, 24 Jan 2023 12:08:35 -0600 Subject: [PATCH 1/2] m4/ax_atomic.m4: fix conflicting macro definition for HAVE_C___ATOMIC. --- m4/ax_atomic.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/ax_atomic.m4 b/m4/ax_atomic.m4 index 7d6dae261..b1fa58753 100644 --- a/m4/ax_atomic.m4 +++ b/m4/ax_atomic.m4 @@ -31,6 +31,6 @@ AC_DEFUN([AC_C___ATOMIC], if test $ac_cv_c___atomic = yes; then AC_DEFINE([HAVE_C___ATOMIC], 1, [Define to 1 if __atomic operations work.]) - AM_CFLAGS="$AM_CFLAGS -DHAVE_C___ATOMIC" + AM_CFLAGS="$AM_CFLAGS -DHAVE_C___ATOMIC=1" fi ])# AC_C___ATOMIC From b2c751a9ca656181d4c29d90f875d8878f158d86 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Tue, 24 Jan 2023 14:00:22 -0600 Subject: [PATCH 2/2] wolfcrypt/src/asn.c: fix a maybe-uninitialized found by clang --enable-asn=template. --- wolfcrypt/src/asn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 2f46f8bf1..ed72dfd4a 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -29102,7 +29102,7 @@ static int MakeCertReq(Cert* cert, byte* derBuffer, word32 derSz, int sz = 0; int ret = 0; #if defined(WOLFSSL_CERT_EXT) || defined(OPENSSL_EXTRA) - word32 sbjRawSz; + word32 sbjRawSz = 0; #endif /* Unused without OQS */