From c5ad780798fc344e5eeebda98108f0bebed4be10 Mon Sep 17 00:00:00 2001 From: Juliusz Sosinowicz Date: Mon, 27 Jan 2025 12:23:31 +0100 Subject: [PATCH] Force experimental flag to enable ascon --- .github/workflows/os-check.yml | 4 ++-- configure.ac | 1 + wolfssl/wolfcrypt/settings.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml index 6c5cebf81..33b2ae988 100644 --- a/.github/workflows/os-check.yml +++ b/.github/workflows/os-check.yml @@ -40,8 +40,8 @@ jobs: --enable-dtls-mtu', '--enable-dtls --enable-dtlscid --enable-dtls13 --enable-secure-renegotiation --enable-psk --enable-aesccm --enable-nullcipher CPPFLAGS=-DWOLFSSL_STATIC_RSA', - '--enable-ascon', - '--enable-ascon CPPFLAGS=-DWOLFSSL_ASCON_UNROLL', + '--enable-ascon --enable-experimental', + '--enable-ascon CPPFLAGS=-DWOLFSSL_ASCON_UNROLL --enable-experimental', ] name: make check if: github.repository_owner == 'wolfssl' diff --git a/configure.ac b/configure.ac index 89023758d..46a87d95b 100644 --- a/configure.ac +++ b/configure.ac @@ -10485,6 +10485,7 @@ echo " * AES-EAX: $ENABLED_AESEAX" echo " * AES Bitspliced: $ENABLED_AESBS" echo " * AES Key Wrap: $ENABLED_AESKEYWRAP" echo " * ARIA: $ENABLED_ARIA" +echo " * ASCON: $ENABLED_ASCON" echo " * DES3: $ENABLED_DES3" echo " * DES3 TLS Suites: $ENABLED_DES3_TLS_SUITES" echo " * Camellia: $ENABLED_CAMELLIA" diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 1e7220904..e7452de4c 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -4103,7 +4103,8 @@ extern void uITRON4_free(void *p) ; #if (defined(HAVE_LIBOQS) || \ defined(HAVE_LIBXMSS) || \ defined(HAVE_LIBLMS) || \ - defined(WOLFSSL_DUAL_ALG_CERTS)) && \ + defined(WOLFSSL_DUAL_ALG_CERTS) || \ + defined(HAVE_ASCON)) && \ !defined(WOLFSSL_EXPERIMENTAL_SETTINGS) #error Experimental settings without WOLFSSL_EXPERIMENTAL_SETTINGS #endif