Remove ARC4 implementation while preserving RC4 API

Co-Authored-By: Anthony H <anthony@wolfssl.com>
2025-03-18 18:49:52 +00:00
1922 changed files with 194654 additions and 568876 deletions
--- a/.codespellexcludelines
+++ b/.codespellexcludelines
@@ -13,9 +13,6 @@ rsource "Kconfig.tls-generic"
    const uint8_t* hashIn, int hashSz)
    XMEMCPY(hash + (curveSz - hashSz), hashIn, hashSz);
        0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x77, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x62, 0x65, 0x20, 0x69, /* creen would be i */
-        0x75, 0x6c, 0x64, 0x20, 0x62, 0x65, 0x20, 0x69, /* creen would be i */
 \pagenumbering{alph}
    DES3_KEY_SIZE       = 24,  /* 3 des ede               */
 /* functions added to support above needed, removed TOOM and KARATSUBA */
-#include <sys/systm.h>
- * extern global version from /usr/src/sys/sys/systm.h */
--- a/.github/renode-test/stm32h753/CMakeLists.txt
+++ b/.github/renode-test/stm32h753/CMakeLists.txt
@@ -1,108 +0,0 @@
-cmake_minimum_required(VERSION 3.18)
-project(wolfcrypt_stm32h753 LANGUAGES C ASM)
-
-set(WOLFSSL_ROOT "/opt/wolfssl" CACHE PATH "wolfSSL source")
-
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-enable_language(ASM)
-
-# Include paths for CMSIS device headers and STM32 HAL
-# Order matters: CMSIS must come before HAL
-include_directories(BEFORE
-    ${CMAKE_SOURCE_DIR}
-    /opt/CMSIS_5/CMSIS/Core/Include  # Core CMSIS (core_cm7.h, etc.) - must be first
-    /opt/cmsis-device-h7/Include     # Device-specific CMSIS (stm32h7xx.h)
-    /opt/STM32CubeH7/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy
-    /opt/STM32CubeH7/Drivers/STM32H7xx_HAL_Driver/Inc
-)
-
-# STM32 HAL source files (minimal set for CRYP and HASH)
-# Note: These files are cloned in the Dockerfile before CMake runs
-set(HAL_SRC_DIR /opt/STM32CubeH7/Drivers/STM32H7xx_HAL_Driver/Src)
-
-# Check if HAL directory exists, then add source files
-if(EXISTS ${HAL_SRC_DIR})
-    set(HAL_SOURCES
-        ${HAL_SRC_DIR}/stm32h7xx_hal.c
-        ${HAL_SRC_DIR}/stm32h7xx_hal_rcc.c
-        ${HAL_SRC_DIR}/stm32h7xx_hal_rcc_ex.c
-        ${HAL_SRC_DIR}/stm32h7xx_hal_cortex.c
-        ${HAL_SRC_DIR}/stm32h7xx_hal_dma.c
-        ${HAL_SRC_DIR}/stm32h7xx_hal_dma_ex.c
-        ${HAL_SRC_DIR}/stm32h7xx_hal_rng.c
-        # CRYP HAL files enabled for AES_GCM only
-        ${HAL_SRC_DIR}/stm32h7xx_hal_cryp.c
-        ${HAL_SRC_DIR}/stm32h7xx_hal_cryp_ex.c
-        # HASH HAL files disabled - Renode doesn't implement HASH peripheral
-        # ${HAL_SRC_DIR}/stm32h7xx_hal_hash.c
-        # ${HAL_SRC_DIR}/stm32h7xx_hal_hash_ex.c
-    )
-else()
-    message(WARNING "HAL source directory not found: ${HAL_SRC_DIR}")
-    set(HAL_SOURCES "")
-endif()
-
-# wolfSSL build options
-set(WOLFSSL_USER_SETTINGS ON CACHE BOOL "Use user_settings.h")
-set(WOLFSSL_CRYPT_TESTS OFF CACHE BOOL "")
-set(WOLFSSL_EXAMPLES OFF CACHE BOOL "")
-set(BUILD_SHARED_LIBS OFF CACHE BOOL "")
-
-add_subdirectory(${WOLFSSL_ROOT} ${CMAKE_BINARY_DIR}/wolfssl-build EXCLUDE_FROM_ALL)
-target_include_directories(wolfssl PRIVATE
-    /opt/CMSIS_5/CMSIS/Core/Include  # Core CMSIS first
-    /opt/cmsis-device-h7/Include     # Device CMSIS
-    /opt/STM32CubeH7/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy
-    /opt/STM32CubeH7/Drivers/STM32H7xx_HAL_Driver/Inc
-    ${CMAKE_SOURCE_DIR}  # For stm32h7xx_hal_conf.h
-)
-# Suppress the GENSEED_FORTEST warning (expected for emulation/test builds)
-target_compile_options(wolfssl PRIVATE -Wno-cpp)
-
-# wolfSSL STM32 port source file (needed for HASH and CRYPTO hardware acceleration)
-set(WOLFSSL_STM32_PORT_SRC ${WOLFSSL_ROOT}/wolfcrypt/src/port/st/stm32.c)
-
-add_executable(wolfcrypt_test.elf
-    startup_stm32h753.c
-    main.c
-    ${WOLFSSL_ROOT}/wolfcrypt/test/test.c
-    ${HAL_SOURCES}
-    ${WOLFSSL_STM32_PORT_SRC}
-)
-
-target_include_directories(wolfcrypt_test.elf PRIVATE
-    ${CMAKE_SOURCE_DIR}
-    ${WOLFSSL_ROOT}
-    /opt/STM32CubeH7/Drivers/STM32H7xx_HAL_Driver/Inc
-    /opt/STM32CubeH7/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy
-)
-
-target_compile_definitions(wolfcrypt_test.elf PRIVATE
-    WOLFSSL_USER_SETTINGS
-    STM32H753xx
-    USE_HAL_DRIVER
-    USE_HAL_CONF  # Enable HAL configuration
-    # NO_AES_CBC is defined in user_settings.h, no need to define it here
-)
-
-# HAL source files need the same compile options and must include stdint.h
-# Disable all warnings for HAL files (third-party code we don't control)
-set_source_files_properties(${HAL_SOURCES} PROPERTIES
-    COMPILE_FLAGS "-mcpu=cortex-m7 -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections -Os -include stdint.h -w"
-)
-
-target_compile_options(wolfcrypt_test.elf PRIVATE
-    -mcpu=cortex-m7 -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard
-    -ffunction-sections -fdata-sections -Os
-)
-
-target_link_options(wolfcrypt_test.elf PRIVATE
-    -T${CMAKE_SOURCE_DIR}/stm32h753.ld
-    -Wl,--gc-sections
-    -nostartfiles
-    -specs=nano.specs
-    -specs=nosys.specs
-)
-
-target_link_libraries(wolfcrypt_test.elf PRIVATE wolfssl m c gcc nosys)
-
--- a/.github/renode-test/stm32h753/entrypoint.sh
+++ b/.github/renode-test/stm32h753/entrypoint.sh
@@ -1,194 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-LOG=/tmp/wolfcrypt-renode.log
-TIMEOUT=300  # Maximum 5 minutes
-
-echo "Running wolfCrypt test in Renode..."
-
-# Try to find Renode binary in common installation locations
-# When installed via .deb package, Renode is typically in /usr/bin/renode
-RENODE_BIN="${RENODE_BIN:-$(command -v renode 2>/dev/null || true)}"
-if [ -z "$RENODE_BIN" ]; then
-    # Check common installation paths (order matters - check standard locations first)
-    for path in /usr/bin/renode /usr/local/bin/renode /opt/renode/renode; do
-        if [ -x "$path" ]; then
-            RENODE_BIN="$path"
-            break
-        fi
-    done
-fi
-
-if [ -z "$RENODE_BIN" ] || [ ! -x "$RENODE_BIN" ]; then
-    echo "Renode binary not found in image."
-    echo "Checked paths: /usr/bin/renode, /usr/local/bin/renode, /opt/renode/renode"
-    echo "PATH: $PATH"
-    which renode || echo "renode not in PATH"
-    exit 2
-fi
-
-echo "Using Renode binary: $RENODE_BIN"
-
-# Determine Renode root directory (where platforms/ directory is located)
-if [ -d "/opt/renode/platforms" ]; then
-    RENODE_ROOT="/opt/renode"
-elif [ -d "/usr/lib/renode/platforms" ]; then
-    RENODE_ROOT="/usr/lib/renode"
-elif [ -d "/usr/share/renode/platforms" ]; then
-    RENODE_ROOT="/usr/share/renode"
-else
-    # Try to find Renode root by checking where the binary is
-    RENODE_DIR=$(dirname "$(readlink -f "${RENODE_BIN}" 2>/dev/null || echo "${RENODE_BIN}")")
-    if [ -d "${RENODE_DIR}/../platforms" ]; then
-        RENODE_ROOT=$(readlink -f "${RENODE_DIR}/.." 2>/dev/null || echo "${RENODE_DIR}/..")
-    else
-        echo "Warning: Could not determine Renode root directory"
-        RENODE_ROOT=""
-    fi
-fi
-
-# Set RENODE_ROOT environment variable (Renode uses this to find platform files)
-if [ -n "$RENODE_ROOT" ]; then
-    export RENODE_ROOT
-    echo "Using Renode root: ${RENODE_ROOT}"
-    # Also create .renode-root file in firmware directory as backup
-    echo "${RENODE_ROOT}" > /opt/firmware/.renode-root
-    chmod 644 /opt/firmware/.renode-root
-else
-    echo "ERROR: Could not determine Renode root directory"
-    exit 1
-fi
-
-# Verify platform file exists
-PLATFORM_FILE="${RENODE_ROOT}/platforms/cpus/stm32h753.repl"
-if [ ! -f "${PLATFORM_FILE}" ]; then
-    echo "ERROR: Platform file not found at ${PLATFORM_FILE}"
-    echo "Searching for platform files..."
-    find "${RENODE_ROOT}" -name "stm32h753.repl" 2>/dev/null | head -5 || true
-    exit 1
-fi
-
-echo "Platform file found at: ${PLATFORM_FILE}"
-
-# Change to firmware directory
-cd /opt/firmware
-
-# Create a modified Renode script with absolute path to platform file
-# This avoids the .renode-root file lookup issue
-cat > /opt/firmware/run-renode-absolute.resc <<EOF
-# Renode test script for STM32H753 (with absolute platform path)
-using sysbus
-
-mach create "stm32h753"
-
-# Use absolute path to platform file to avoid .renode-root lookup issues
-machine LoadPlatformDescription @${PLATFORM_FILE}
-
-sysbus LoadELF @/opt/firmware/wolfcrypt_test.elf
-
-# Connect USART3 to the console for wolfCrypt output
-showAnalyzer usart3
-
-# Start emulation and run for a long time
-# The entrypoint script will kill Renode when test completes
-emulation RunFor "600s"
-EOF
-
-# Start Renode in background, output to log (unbuffered)
-# Use the modified script with absolute path
-echo "Starting Renode with command: ${RENODE_BIN} --disable-xwt --console -e \"i @/opt/firmware/run-renode-absolute.resc\""
-stdbuf -oL -eL "${RENODE_BIN}" --disable-xwt --console -e "i @/opt/firmware/run-renode-absolute.resc" > "${LOG}" 2>&1 &
-RENODE_PID=$!
-echo "Renode PID: $RENODE_PID"
-
-# Monitor the log for completion, errors, and flush output frequently
-START_TIME=$(date +%s)
-RESULT=""
-LAST_LOG_SIZE=0
-
-while true; do
-    # Check if Renode is still running
-    if ! kill -0 "$RENODE_PID" 2>/dev/null; then
-        break
-    fi
-
-    # Flush new log content to stdout (unbuffered)
-    if [ -f "${LOG}" ]; then
-        CURRENT_LOG_SIZE=$(stat -f%z "${LOG}" 2>/dev/null || stat -c%s "${LOG}" 2>/dev/null || echo 0)
-        if [ "$CURRENT_LOG_SIZE" -gt "$LAST_LOG_SIZE" ]; then
-            # Output new lines
-            tail -c +$((LAST_LOG_SIZE + 1)) "${LOG}" 2>/dev/null | head -c $((CURRENT_LOG_SIZE - LAST_LOG_SIZE))
-            LAST_LOG_SIZE=$CURRENT_LOG_SIZE
-        fi
-    fi
-
-    # Check for Renode errors (must check before completion to catch errors early)
-    if grep -q "\[ERROR\]" "${LOG}" 2>/dev/null; then
-        echo ""
-        echo "ERROR: Renode reported an error!"
-        RESULT="renode_error"
-        break
-    fi
-
-    # Check for completion messages
-    if grep -q "=== wolfCrypt test passed! ===" "${LOG}" 2>/dev/null; then
-        RESULT="passed"
-        break
-    fi
-
-    if grep -q "=== wolfCrypt test FAILED ===" "${LOG}" 2>/dev/null; then
-        RESULT="failed"
-        break
-    fi
-
-    # Check timeout
-    CURRENT_TIME=$(date +%s)
-    ELAPSED=$((CURRENT_TIME - START_TIME))
-    if [ "$ELAPSED" -ge "$TIMEOUT" ]; then
-        echo ""
-        echo "Timeout after ${TIMEOUT} seconds"
-        RESULT="timeout"
-        break
-    fi
-
-    sleep 0.5
-done
-
-# Kill Renode if still running
-if kill -0 "$RENODE_PID" 2>/dev/null; then
-    kill "$RENODE_PID" 2>/dev/null || true
-    wait "$RENODE_PID" 2>/dev/null || true
-fi
-
-# Show the log output
-cat "${LOG}"
-
-# Report result
-case "$RESULT" in
-    passed)
-        echo ""
-        echo "wolfCrypt tests completed successfully."
-        exit 0
-        ;;
-    failed)
-        echo ""
-        echo "wolfCrypt tests FAILED."
-        exit 1
-        ;;
-    renode_error)
-        echo ""
-        echo "Renode reported an error - test aborted."
-        exit 1
-        ;;
-    timeout)
-        echo ""
-        echo "wolfCrypt tests timed out after ${TIMEOUT} seconds."
-        exit 1
-        ;;
-    *)
-        echo ""
-        echo "wolfCrypt tests did not report a result."
-        exit 1
-        ;;
-esac
-
--- a/.github/renode-test/stm32h753/main.c
+++ b/.github/renode-test/stm32h753/main.c
@@ -1,137 +0,0 @@
-/* main.c - Entry point for wolfCrypt test on STM32H753 under Renode
- *
- * Runs the wolfCrypt test suite with output via USART3.
- */
-
-#include <stdint.h>
-#include <stddef.h>
-#include <stdio.h>
-
-/* wolfCrypt test entry point */
-extern int wolfcrypt_test(void *args);
-
-/* USART3 registers (STM32H7) */
-#define USART3_BASE     0x40004800UL
-#define USART3_CR1      (*(volatile uint32_t *)(USART3_BASE + 0x00))
-#define USART3_BRR      (*(volatile uint32_t *)(USART3_BASE + 0x0C))
-#define USART3_ISR      (*(volatile uint32_t *)(USART3_BASE + 0x1C))
-#define USART3_TDR      (*(volatile uint32_t *)(USART3_BASE + 0x28))
-
-#define USART_CR1_UE    (1 << 0)
-#define USART_CR1_TE    (1 << 3)
-#define USART_ISR_TXE   (1 << 7)
-
-/* RCC registers for enabling USART3 clock */
-#define RCC_BASE        0x58024400UL
-#define RCC_APB1LENR    (*(volatile uint32_t *)(RCC_BASE + 0xE8))
-#define RCC_APB1LENR_USART3EN (1 << 18)
-
-static void uart_init(void)
-{
-    /* Enable USART3 clock */
-    RCC_APB1LENR |= RCC_APB1LENR_USART3EN;
-
-    /* Configure USART3: 115200 baud at 64MHz HSI */
-    USART3_BRR = 64000000 / 115200;
-    USART3_CR1 = USART_CR1_UE | USART_CR1_TE;
-}
-
-static void uart_putc(char c)
-{
-    while (!(USART3_ISR & USART_ISR_TXE))
-        ;
-    USART3_TDR = c;
-}
-
-static void uart_puts(const char *s)
-{
-    while (*s) {
-        if (*s == '\n')
-            uart_putc('\r');
-        uart_putc(*s++);
-    }
-}
-
-/* newlib _write syscall - redirects printf to UART */
-int _write(int fd, const char *buf, int len)
-{
-    (void)fd;
-    for (int i = 0; i < len; i++) {
-        if (buf[i] == '\n')
-            uart_putc('\r');
-        uart_putc(buf[i]);
-    }
-    return len;
-}
-
-/* Heap management for malloc - required by printf with format strings */
-extern char __heap_start__;
-extern char __heap_end__;
-
-void *_sbrk(ptrdiff_t incr)
-{
-    static char *heap_ptr = NULL;
-    char *prev_heap_ptr;
-
-    if (heap_ptr == NULL) {
-        heap_ptr = &__heap_start__;
-    }
-
-    prev_heap_ptr = heap_ptr;
-
-    if (heap_ptr + incr > &__heap_end__) {
-        /* Out of heap memory */
-        return (void *)-1;
-    }
-
-    heap_ptr += incr;
-    return prev_heap_ptr;
-}
-
-/* Simple counter for time - used by GENSEED_FORTEST */
-static volatile uint32_t tick_counter = 0;
-
-/* time() stub for wolfSSL GENSEED_FORTEST */
-#include <time.h>
-time_t time(time_t *t)
-{
-    tick_counter += 12345;  /* Simple pseudo-random increment */
-    time_t val = (time_t)tick_counter;
-    if (t)
-        *t = val;
-    return val;
-}
-
-/* Result variable - can be monitored by Renode at fixed address */
-volatile int test_result __attribute__((section(".data"))) = -1;
-volatile int test_complete __attribute__((section(".data"))) = 0;
-
-
-int main(int argc, char **argv)
-{
-    (void)argc;
-    (void)argv;
-
-    setvbuf(stdin, NULL, _IONBF, 0);
-    setvbuf(stdout, NULL, _IONBF, 0);
-    setvbuf(stderr, NULL, _IONBF, 0);
-    uart_init();
-    uart_puts("\n\n=== Starting wolfCrypt test ===\n\n");
-
-    test_result = wolfcrypt_test(NULL);
-    test_complete = 1;
-
-    if (test_result == 0) {
-        uart_puts("\n\n=== wolfCrypt test passed! ===\n");
-    } else {
-        uart_puts("\n\n=== wolfCrypt test FAILED ===\n");
-    }
-
-    /* Spin forever after the test completes */
-    while (1) {
-        __asm__ volatile ("wfi");
-    }
-
-    return test_result;
-}
-
--- a/.github/renode-test/stm32h753/run-renode.resc
+++ b/.github/renode-test/stm32h753/run-renode.resc
@@ -1,20 +0,0 @@
-# Renode test script for STM32H753
-# Note: @platforms/cpus/stm32h753.repl is relative to Renode root
-# If RENODE_ROOT is set, Renode will use it; otherwise it looks for .renode-root file
-using sysbus
-
-mach create "stm32h753"
-
-# Try relative path first (works if RENODE_ROOT or .renode-root is set correctly)
-# If this fails, the absolute path will be tried in entrypoint.sh
-machine LoadPlatformDescription @platforms/cpus/stm32h753.repl
-
-sysbus LoadELF @/opt/firmware/wolfcrypt_test.elf
-
-# Connect USART3 to the console for wolfCrypt output
-showAnalyzer usart3
-
-# Start emulation and run for a long time
-# The entrypoint script will kill Renode when test completes
-emulation RunFor "600s"
-
--- a/.github/renode-test/stm32h753/startup_stm32h753.c
+++ b/.github/renode-test/stm32h753/startup_stm32h753.c
@@ -1,101 +0,0 @@
-/* Minimal startup code for STM32H753 running under Renode */
-
-#include <stdint.h>
-#include <stddef.h>
-
-extern int main(int argc, char** argv);
-
-void Default_Handler(void);
-void Reset_Handler(void);
-
-/* Symbols provided by the linker script */
-extern unsigned long _estack;
-extern unsigned long __data_start__;
-extern unsigned long __data_end__;
-extern unsigned long __bss_start__;
-extern unsigned long __bss_end__;
-extern unsigned long _sidata; /* start of .data in flash */
-
-/* Minimal init_array support */
-extern void (*__preinit_array_start[])(void);
-extern void (*__preinit_array_end[])(void);
-extern void (*__init_array_start[])(void);
-extern void (*__init_array_end[])(void);
-
-static void call_init_array(void)
-{
-    size_t count, i;
-
-    count = __preinit_array_end - __preinit_array_start;
-    for (i = 0; i < count; i++)
-        __preinit_array_start[i]();
-
-    count = __init_array_end - __init_array_start;
-    for (i = 0; i < count; i++)
-        __init_array_start[i]();
-}
-
-void Reset_Handler(void)
-{
-    unsigned long *src, *dst;
-
-    /* Copy .data from flash to RAM */
-    src = &_sidata;
-    for (dst = &__data_start__; dst < &__data_end__;)
-        *dst++ = *src++;
-
-    /* Zero .bss */
-    for (dst = &__bss_start__; dst < &__bss_end__;)
-        *dst++ = 0;
-
-    /* Call static constructors */
-    call_init_array();
-
-    /* Call main */
-    (void)main(0, (char**)0);
-
-    /* Infinite loop after main returns */
-    while (1) {
-        __asm__ volatile ("wfi");
-    }
-}
-
-void Default_Handler(void)
-{
-    while (1) {
-        __asm__ volatile ("wfi");
-    }
-}
-
-/* Exception handlers - all weak aliases to Default_Handler */
-void NMI_Handler(void) __attribute__((weak, alias("Default_Handler")));
-void HardFault_Handler(void) __attribute__((weak, alias("Default_Handler")));
-void MemManage_Handler(void) __attribute__((weak, alias("Default_Handler")));
-void BusFault_Handler(void) __attribute__((weak, alias("Default_Handler")));
-void UsageFault_Handler(void) __attribute__((weak, alias("Default_Handler")));
-void SVC_Handler(void) __attribute__((weak, alias("Default_Handler")));
-void DebugMon_Handler(void) __attribute__((weak, alias("Default_Handler")));
-void PendSV_Handler(void) __attribute__((weak, alias("Default_Handler")));
-void SysTick_Handler(void) __attribute__((weak, alias("Default_Handler")));
-
-/* Vector table */
-__attribute__ ((section(".isr_vector"), used))
-void (* const g_pfnVectors[])(void) = {
-    (void (*)(void))(&_estack), /* Initial stack pointer */
-    Reset_Handler,              /* Reset Handler */
-    NMI_Handler,                /* NMI Handler */
-    HardFault_Handler,          /* Hard Fault Handler */
-    MemManage_Handler,          /* MPU Fault Handler */
-    BusFault_Handler,           /* Bus Fault Handler */
-    UsageFault_Handler,         /* Usage Fault Handler */
-    0,                          /* Reserved */
-    0,                          /* Reserved */
-    0,                          /* Reserved */
-    0,                          /* Reserved */
-    SVC_Handler,                /* SVCall Handler */
-    DebugMon_Handler,           /* Debug Monitor Handler */
-    0,                          /* Reserved */
-    PendSV_Handler,             /* PendSV Handler */
-    SysTick_Handler             /* SysTick Handler */
-    /* IRQ vectors would continue here */
-};
--- a/.github/renode-test/stm32h753/stm32h753.ld
+++ b/.github/renode-test/stm32h753/stm32h753.ld
@@ -1,109 +0,0 @@
-/* Minimal STM32H753 memory map for Renode run */
-MEMORY
-{
-  FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 2048K
-  DTCM  (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
-  RAM   (xrw) : ORIGIN = 0x24000000, LENGTH = 512K
-}
-
-_estack = ORIGIN(RAM) + LENGTH(RAM);
-_Min_Heap_Size = 128K;
-_Min_Stack_Size = 128K;
-
-ENTRY(Reset_Handler)
-
-SECTIONS
-{
-  .isr_vector :
-  {
-    . = ALIGN(4);
-    KEEP(*(.isr_vector))
-    . = ALIGN(4);
-  } > FLASH
-
-  .text :
-  {
-    . = ALIGN(4);
-    *(.text*)
-    *(.rodata*)
-    *(.glue_7)
-    *(.glue_7t)
-    *(.eh_frame)
-    . = ALIGN(4);
-    _etext = .;
-  } > FLASH
-
-  .ARM.extab :
-  {
-    *(.ARM.extab* .gnu.linkonce.armextab.*)
-  } > FLASH
-
-  .ARM.exidx :
-  {
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-  } > FLASH
-
-  .preinit_array :
-  {
-    PROVIDE_HIDDEN(__preinit_array_start = .);
-    KEEP(*(.preinit_array*))
-    PROVIDE_HIDDEN(__preinit_array_end = .);
-  } > FLASH
-
-  .init_array :
-  {
-    PROVIDE_HIDDEN(__init_array_start = .);
-    KEEP(*(SORT(.init_array.*)))
-    KEEP(*(.init_array*))
-    PROVIDE_HIDDEN(__init_array_end = .);
-  } > FLASH
-
-  .fini_array :
-  {
-    PROVIDE_HIDDEN(__fini_array_start = .);
-    KEEP(*(SORT(.fini_array.*)))
-    KEEP(*(.fini_array*))
-    PROVIDE_HIDDEN(__fini_array_end = .);
-  } > FLASH
-
-  /* Location in flash where .data will be stored */
-  _sidata = LOADADDR(.data);
-
-  .data :
-  {
-    . = ALIGN(4);
-    __data_start__ = .;
-    *(.data*)
-    . = ALIGN(4);
-    __data_end__ = .;
-  } > RAM AT> FLASH
-
-  .bss :
-  {
-    . = ALIGN(4);
-    __bss_start__ = .;
-    *(.bss*)
-    *(COMMON)
-    . = ALIGN(4);
-    __bss_end__ = .;
-  } > RAM
-
-  .heap_stack (NOLOAD):
-  {
-    . = ALIGN(8);
-    PROVIDE(__heap_start__ = .);
-    . = . + _Min_Heap_Size;
-    PROVIDE(__heap_end__ = .);
-    PROVIDE(end = __heap_end__);
-    . = ALIGN(8);
-    PROVIDE(__stack_start__ = .);
-    . = . + _Min_Stack_Size;
-    PROVIDE(__stack_end__ = .);
-  } > RAM
-}
-
-PROVIDE(_init = 0);
-PROVIDE(_fini = 0);
-
--- a/.github/renode-test/stm32h753/stm32h7xx_hal_conf.h
+++ b/.github/renode-test/stm32h753/stm32h7xx_hal_conf.h
@@ -1,208 +0,0 @@
-/* Minimal HAL configuration for STM32H753 wolfCrypt build under Renode.
- * RNG and CRYP HAL are enabled. CRYP is used for AES_GCM only (other AES modes disabled).
- * HASH is disabled as Renode doesn't implement it.
- */
-
-#ifndef STM32H7xx_HAL_CONF_H
-#define STM32H7xx_HAL_CONF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* -------------------------  Module Selection  ----------------------------- */
-#define HAL_MODULE_ENABLED
-#define HAL_CORTEX_MODULE_ENABLED
-#define HAL_RCC_MODULE_ENABLED
-#define HAL_GPIO_MODULE_ENABLED
-#define HAL_RNG_MODULE_ENABLED
-#define HAL_CRYP_MODULE_ENABLED  /* Enabled for AES_GCM only */
-/* #define HAL_HASH_MODULE_ENABLED */  /* Disabled - Renode doesn't implement HASH */
-#define HAL_DMA_MODULE_ENABLED
-#define HAL_FLASH_MODULE_ENABLED
-#define HAL_PWR_MODULE_ENABLED
-#define HAL_EXTI_MODULE_ENABLED
-
-/* Disabled modules (explicit for clarity) */
-/* #define HAL_SDRAM_MODULE_ENABLED */
-
-/* -------------------------  Oscillator Values  ---------------------------- */
-#if !defined(HSE_VALUE)
-#define HSE_VALUE    25000000UL  /* External oscillator frequency in Hz */
-#endif
-
-#if !defined(HSE_STARTUP_TIMEOUT)
-#define HSE_STARTUP_TIMEOUT  100UL  /* Time out for HSE start up in ms */
-#endif
-
-#if !defined(CSI_VALUE)
-#define CSI_VALUE    4000000UL   /* Internal oscillator CSI in Hz */
-#endif
-
-#if !defined(HSI_VALUE)
-#define HSI_VALUE    64000000UL  /* Internal oscillator HSI in Hz */
-#endif
-
-#if !defined(HSI48_VALUE)
-#define HSI48_VALUE  48000000UL  /* Value of the Internal High Speed oscillator for USB in Hz */
-#endif
-
-#if !defined(LSE_VALUE)
-#define LSE_VALUE    32768UL     /* External low speed oscillator in Hz */
-#endif
-
-#if !defined(LSE_STARTUP_TIMEOUT)
-#define LSE_STARTUP_TIMEOUT  5000UL  /* Time out for LSE start up in ms */
-#endif
-
-#if !defined(LSI_VALUE)
-#define LSI_VALUE    32000UL     /* Internal low speed oscillator in Hz */
-#endif
-
-#if !defined(EXTERNAL_CLOCK_VALUE)
-#define EXTERNAL_CLOCK_VALUE  12288000UL  /* External audio clock in Hz */
-#endif
-
-/* -------------------------  System Configuration  -------------------------- */
-#define VDD_VALUE                  3300UL  /* Value of VDD in mV */
-#define TICK_INT_PRIORITY          0x0FUL  /* Tick interrupt priority */
-#define USE_RTOS                   0U
-#define PREFETCH_ENABLE            0U
-#define USE_HAL_ADC_REGISTER_CALLBACKS         0U
-#define USE_HAL_CEC_REGISTER_CALLBACKS         0U
-#define USE_HAL_COMP_REGISTER_CALLBACKS        0U
-#define USE_HAL_CORDIC_REGISTER_CALLBACKS      0U
-#define USE_HAL_CRYP_REGISTER_CALLBACKS        0U
-#define USE_HAL_DAC_REGISTER_CALLBACKS         0U
-#define USE_HAL_DCMI_REGISTER_CALLBACKS         0U
-#define USE_HAL_DFSDM_REGISTER_CALLBACKS       0U
-#define USE_HAL_DMA_REGISTER_CALLBACKS         0U
-#define USE_HAL_DMA2D_REGISTER_CALLBACKS       0U
-#define USE_HAL_DSI_REGISTER_CALLBACKS         0U
-#define USE_HAL_DTS_REGISTER_CALLBACKS         0U
-#define USE_HAL_ETH_REGISTER_CALLBACKS         0U
-#define USE_HAL_FDCAN_REGISTER_CALLBACKS       0U
-#define USE_HAL_FMAC_REGISTER_CALLBACKS        0U
-#define USE_HAL_GFXMMU_REGISTER_CALLBACKS      0U
-#define USE_HAL_HASH_REGISTER_CALLBACKS        0U
-#define USE_HAL_HCD_REGISTER_CALLBACKS         0U
-#define USE_HAL_HRTIM_REGISTER_CALLBACKS       0U
-#define USE_HAL_I2C_REGISTER_CALLBACKS         0U
-#define USE_HAL_I2S_REGISTER_CALLBACKS         0U
-#define USE_HAL_IRDA_REGISTER_CALLBACKS        0U
-#define USE_HAL_JPEG_REGISTER_CALLBACKS        0U
-#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0U
-#define USE_HAL_LTDC_REGISTER_CALLBACKS        0U
-#define USE_HAL_MDIOS_REGISTER_CALLBACKS       0U
-#define USE_HAL_MMC_REGISTER_CALLBACKS         0U
-#define USE_HAL_NAND_REGISTER_CALLBACKS        0U
-#define USE_HAL_NOR_REGISTER_CALLBACKS         0U
-#define USE_HAL_OPAMP_REGISTER_CALLBACKS       0U
-#define USE_HAL_OSPI_REGISTER_CALLBACKS        0U
-#define USE_HAL_OTFDEC_REGISTER_CALLBACKS      0U
-#define USE_HAL_PCD_REGISTER_CALLBACKS         0U
-#define USE_HAL_PSSI_REGISTER_CALLBACKS        0U
-#define USE_HAL_QSPI_REGISTER_CALLBACKS        0U
-#define USE_HAL_RNG_REGISTER_CALLBACKS         0U
-#define USE_HAL_RTC_REGISTER_CALLBACKS         0U
-#define USE_HAL_SAI_REGISTER_CALLBACKS         0U
-#define USE_HAL_SD_REGISTER_CALLBACKS          0U
-#define USE_HAL_SDRAM_REGISTER_CALLBACKS       0U
-#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U
-#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0U
-#define USE_HAL_SPDIFRX_REGISTER_CALLBACKS     0U
-#define USE_HAL_SPI_REGISTER_CALLBACKS         0U
-#define USE_HAL_SRAM_REGISTER_CALLBACKS         0U
-#define USE_HAL_SWPMI_REGISTER_CALLBACKS       0U
-#define USE_HAL_TIM_REGISTER_CALLBACKS         0U
-#define USE_HAL_UART_REGISTER_CALLBACKS        0U
-#define USE_HAL_USART_REGISTER_CALLBACKS       0U
-#define USE_HAL_WWDG_REGISTER_CALLBACKS        0U
-#define USE_HAL_XSPI_REGISTER_CALLBACKS        0U
-
-/* -------------------------  SPI peripheral configuration  ------------------ */
-#define USE_SPI_CRC  0U
-
-/* -------------------------  Assertion  ------------------------------------- */
-/* #define USE_FULL_ASSERT  1U */
-#define assert_param(expr)  ((void)0U)
-
-/* -------------------------  Ethernet Configuration  ------------------------ */
-#define ETH_TX_DESC_CNT  4U
-#define ETH_RX_DESC_CNT  4U
-#define ETH_MAC_ADDR0    0x02U
-#define ETH_MAC_ADDR1    0x00U
-#define ETH_MAC_ADDR2    0x00U
-#define ETH_MAC_ADDR3    0x00U
-#define ETH_MAC_ADDR4    0x00U
-#define ETH_MAC_ADDR5    0x00U
-
-/* -------------------------  Include HAL headers  --------------------------- */
-/**
-  * @brief Include module's header file
-  */
-
-#ifdef HAL_RCC_MODULE_ENABLED
-  #include "stm32h7xx_hal_rcc.h"
-#endif /* HAL_RCC_MODULE_ENABLED */
-
-#ifdef HAL_GPIO_MODULE_ENABLED
-  #include "stm32h7xx_hal_gpio.h"
-#endif /* HAL_GPIO_MODULE_ENABLED */
-
-#ifdef HAL_DMA_MODULE_ENABLED
-  #include "stm32h7xx_hal_dma.h"
-#endif /* HAL_DMA_MODULE_ENABLED */
-
-#ifdef HAL_CORTEX_MODULE_ENABLED
-  #include "stm32h7xx_hal_cortex.h"
-#endif /* HAL_CORTEX_MODULE_ENABLED */
-
-#ifdef HAL_EXTI_MODULE_ENABLED
-  #include "stm32h7xx_hal_exti.h"
-#endif /* HAL_EXTI_MODULE_ENABLED */
-
-#ifdef HAL_FLASH_MODULE_ENABLED
-  #include "stm32h7xx_hal_flash.h"
-#endif /* HAL_FLASH_MODULE_ENABLED */
-
-#ifdef HAL_PWR_MODULE_ENABLED
-  #include "stm32h7xx_hal_pwr.h"
-#endif /* HAL_PWR_MODULE_ENABLED */
-
-#ifdef HAL_RNG_MODULE_ENABLED
-  #include "stm32h7xx_hal_rng.h"
-#endif /* HAL_RNG_MODULE_ENABLED */
-
-/* CRYP enabled for AES_GCM only */
-#ifdef HAL_CRYP_MODULE_ENABLED
-  #include "stm32h7xx_hal_cryp.h"
-#endif
-
-/* #ifdef HAL_HASH_MODULE_ENABLED
-  #include "stm32h7xx_hal_hash.h"
-#endif */
-
-/* Exported macro ------------------------------------------------------------*/
-#ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
-/* Exported functions ------------------------------------------------------- */
-  void assert_failed(uint8_t *file, uint32_t line);
-#else
-  #define assert_param(expr) ((void)0U)
-#endif /* USE_FULL_ASSERT */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32H7xx_HAL_CONF_H */
-
--- a/.github/renode-test/stm32h753/toolchain-arm-none-eabi.cmake
+++ b/.github/renode-test/stm32h753/toolchain-arm-none-eabi.cmake
@@ -1,24 +0,0 @@
-set(CMAKE_SYSTEM_NAME Generic)
-set(CMAKE_SYSTEM_PROCESSOR arm)
-
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-
-set(CMAKE_C_COMPILER arm-none-eabi-gcc)
-set(CMAKE_CXX_COMPILER arm-none-eabi-g++)
-set(CMAKE_ASM_COMPILER arm-none-eabi-gcc)
-
-set(CMAKE_AR arm-none-eabi-ar)
-set(CMAKE_RANLIB arm-none-eabi-ranlib)
-
-set(CMAKE_C_STANDARD 11)
-
-set(CPU_FLAGS "-mcpu=cortex-m7 -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard")
-set(OPT_FLAGS "-Os -ffunction-sections -fdata-sections")
-set(CMSIS_INCLUDES "-I/opt/cmsis-device-h7/Include -I/opt/CMSIS_5/CMSIS/Core/Include -I/opt/firmware")
-
-set(CMAKE_C_FLAGS_INIT "${CPU_FLAGS} ${OPT_FLAGS} ${CMSIS_INCLUDES} -DSTM32H753xx")
-set(CMAKE_CXX_FLAGS_INIT "${CPU_FLAGS} ${OPT_FLAGS} ${CMSIS_INCLUDES} -DSTM32H753xx")
-set(CMAKE_ASM_FLAGS_INIT "${CPU_FLAGS}")
-
-set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--gc-sections -static")
-
--- a/.github/renode-test/stm32h753/user_settings.h
+++ b/.github/renode-test/stm32h753/user_settings.h
@@ -1,95 +0,0 @@
-/* user_settings_renode.h - wolfSSL/wolfCrypt configuration for STM32H753 under Renode
- *
- * Minimal, semihosting-friendly build for Cortex-M7 / STM32H753.
- * Hardware RNG and CRYPTO (AES-GCM only) are enabled via Renode's STM32H753 emulation.
- * HASH is disabled as Renode doesn't implement the HASH peripheral.
- */
-
-#ifndef USER_SETTINGS_RENODE_H
-#define USER_SETTINGS_RENODE_H
-
-/* -------------------------  Platform  ------------------------------------- */
-#define WOLFSSL_ARM_CORTEX_M
-#define WOLFSSL_STM32H7  /* STM32H7 series (includes H753) */
-#define WOLFSSL_STM32_CUBEMX  /* Use STM32 HAL for CRYPTO */
-/* NO_STM32_CRYPTO is NOT defined, so CRYPTO will be enabled */
-/* Disable HASH - Renode doesn't implement HASH peripheral */
-#define NO_STM32_HASH
-
-/* Required for consistent math library settings (CTC_SETTINGS) */
-#define SIZEOF_LONG 4
-#define SIZEOF_LONG_LONG 8
-
-/* -------------------------  Threading / OS  ------------------------------- */
-#define SINGLE_THREADED
-
-/* -------------------------  Filesystem / I/O  ----------------------------- */
-#define WOLFSSL_NO_CURRDIR
-#define NO_FILESYSTEM
-#define NO_WRITEV
-
-/* -------------------------  wolfCrypt Only  ------------------------------- */
-#define WOLFCRYPT_ONLY
-#define NO_DH
-#define NO_DSA
-/* Disable DES/3DES - Renode CRYPTO only supports AES_GCM */
-#define NO_DES
-#define NO_DES3
-
-/* -------------------------  AES Mode Configuration  ----------------------- */
-/* Disable all AES modes except GCM - Renode CRYPTO only supports AES_GCM */
-/* NO_AES_CBC prevents HAVE_AES_CBC from being defined in settings.h */
-#define NO_AES_CBC
-
-/* -------------------------  RNG Configuration  ---------------------------- */
-/* Enable STM32 hardware RNG (emulated by Renode) using direct register access */
-#define WOLFSSL_STM32_RNG_NOLIB
-/* NO_STM32_RNG is NOT defined, so STM32_RNG will be auto-enabled */
-#define NO_DEV_RANDOM
-#define HAVE_HASHDRBG
-
-/* -------------------------  Math Library  --------------------------------- */
-/* Use SP Math (Single Precision) - modern, efficient, and secure */
-#define WOLFSSL_SP_MATH_ALL
-#define WOLFSSL_HAVE_SP_RSA
-#define WOLFSSL_HAVE_SP_DH
-#define WOLFSSL_HAVE_SP_ECC
-#define WOLFSSL_SP_ARM_CORTEX_M_ASM
-#define SP_WORD_SIZE 32
-
-/* -------------------------  Crypto Hardening  ----------------------------- */
-#define WC_RSA_BLINDING
-#define ECC_TIMING_RESISTANT
-
-/* -------------------------  Size Optimization  ---------------------------- */
-#define WOLFSSL_SMALL_STACK
-
-/* -------------------------  Test Configuration  --------------------------- */
-/* Use smaller key sizes for faster test runs in emulation */
-#define BENCH_EMBEDDED
-
-/* Use our own main() instead of the one in test.c */
-#define NO_MAIN_DRIVER
-
-/* -------------------------  Post-options.h cleanup  ----------------------- */
-/* Ensure unsupported AES modes stay disabled even after options.h processing */
-/* These undefs will be processed after options.h includes, preventing
- * Renode-unsupported modes from being used */
-#ifdef HAVE_AES_CBC
-#undef HAVE_AES_CBC
-#endif
-#ifdef HAVE_AES_ECB
-#undef HAVE_AES_ECB
-#endif
-#ifdef HAVE_AES_CTR
-#undef HAVE_AES_CTR
-#endif
-#ifdef HAVE_AES_CFB
-#undef HAVE_AES_CFB
-#endif
-#ifdef HAVE_AES_OFB
-#undef HAVE_AES_OFB
-#endif
-
-#endif /* USER_SETTINGS_RENODE_H */
-
--- a/.github/workflows/ada.yml
+++ b/.github/workflows/ada.yml
@@ -1,34 +0,0 @@
-name: WolfSSL Ada Build Tests
-
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-jobs:
-  build:
-
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Install gnat
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gnat gprbuild
-
-    - name: Checkout wolfssl
-      uses: actions/checkout@master
-      with:
-        repository: wolfssl/wolfssl
-        path: wolfssl
-
-    - name: Build wolfssl Ada
-      working-directory: ./wolfssl/wrapper/Ada
-      run: |
-        mkdir obj
-        gprbuild default.gpr
-        gprbuild examples.gpr
--- a/.github/workflows/arduino.yml
+++ b/.github/workflows/arduino.yml
@@ -1,465 +0,0 @@
-name: Arduino CI Build (1 of 4) wolfssl
-
-#
-# Test fetches wolfssl-examples/Arduino and uses local, latest github master branch wolfssl
-#
-# These 4 workflows across 3 repos are interdependent for the current $REPO_OWNER:
-#
-# THIS Arduino CI Build 1: https://github.com/$REPO_OWNER/wolfssl          #  /.github/workflows/arduino.yml
-#   - Builds Arduino library from local clone of wolfssl master branch
-#   - Fetches examples from https://github.com/$REPO_OWNER/wolfssl-examples
-#
-# Arduino CI Build 2: https://github.com/$REPO_OWNER/wolfssl-examples      #  /.github/workflows/arduino-release.yml
-#    - Tests examples based on latest published release of Arduino library, NOT latest on wolfssl github.
-#    - Should be identical to Arduino CI Build 3 in every way but wolfssl install.
-#    - Copies only compile script from wolfssl-examples
-#    - Builds local examples
-#    - No other repos used
-#
-# Arduino CI Build 3: https://github.com/$REPO_OWNER/wolfssl-examples      #  /.github/workflows/arduino.yml
-#   - Fetches current wolfSSL from https://github.com/$REPO_OWNER/wolfssl
-#   - Creates an updated Arduino library
-#   - Compiles local examples
-#   - Contains the source of `compile-all-examples.sh` and respective board-list.txt
-#
-# Arduino CI Build 4: https://github.com/$REPO_OWNER/Arduino-wolfssl       #  /.github/workflows/arduino.yml
-#    - Assembles and installs an updated Arduino wolfssl library from LOCAL wolfssl master source
-#    - Copies only compile script copied from wolfssl-examples
-#    - Builds local examples
-#    - No other repos used
-#
-#
-#                                   ** NOTE TO MAINTAINERS **
-#
-#           Consider using winmerge or similar tool to keep the 4 arduino[-release].yml files in relative sync.
-#           Although there are some specific differences, most of the contents are otherwise identical.
-#
-# See https://github.com/wolfSSL/Arduino-wolfSSL
-#
-# To test locally:
-# cd [your WOLFSSL_ROOT], e.g. cd /mnt/c/workspace/wolfssl-$USER
-# [optional checkout]     e.g. git checkout tags/v5.8.4-stable
-# pushd ./IDE/ARDUINO
-# export ARDUINO_ROOT="$HOME/Arduino/libraries"
-# ./wolfssl-arduino.sh INSTALL
-# cd [your WOLFSSL_EXAMPLES_ROOT] e.g. /mnt/c/workspace/wolfssl-examples-$USER
-#
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ '**', 'master', 'main', 'release/**' ]
-    paths:
-      # Specific to this Arduino CI Build (1 of 4)
-      - '.github/workflows/arduino.yml'
-      - 'IDE/ARDUINO/**'
-      - 'src/**'
-      - 'wolfcrypt/**'
-      - 'wolfssl/**'
-  pull_request:
-    branches: [ '**' ]
-    paths:
-      - '.github/workflows/arduino.yml'
-      - 'IDE/ARDUINO/**'
-      - 'src/**'
-      - 'wolfcrypt/**'
-      - 'wolfssl/**'
-  workflow_dispatch:
-
-concurrency:
-  # Same branch push cancels other jobs. Other PR branches untouched
-
-  group: ${{ github.workflow }}-${{ github.ref_name }}
-  cancel-in-progress: true
-
-# END OF COMMON SECTION
-
-jobs:
-  build:
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        fqbn:
-          # When editing this list, be sure to also edit file: board_list.txt
-          #   The compile-all-examples.sh optionally takes a FQBN parameter to
-          #   optionally compile all examples ONLY for the respective fully qualified board name.
-          # See https://github.com/wolfSSL/wolfssl-examples/blob/master/Arduino/sketches/board_list.txt
-
-          - arduino:avr:ethernet
-          - arduino:avr:leonardoeth
-          - arduino:avr:mega
-          - arduino:avr:nano
-          - arduino:avr:uno
-          - arduino:avr:yun
-          - arduino:samd:mkrwifi1010
-          - arduino:samd:mkr1000
-          - arduino:samd:mkrfox1200
-          - arduino:mbed_edge:edge_control
-          - arduino:mbed_nano:nanorp2040connect
-          - arduino:mbed_portenta:envie_m7
-          - arduino:mbed_portenta:portenta_x8
-          - arduino:renesas_uno:unor4wifi
-          - arduino:sam:arduino_due_x
-          - arduino:samd:arduino_zero_native
-          - arduino:samd:tian
-          - esp32:esp32:esp32
-          - esp32:esp32:esp32s2
-          - esp32:esp32:esp32s3
-          - esp32:esp32:esp32c3
-          - esp32:esp32:esp32c6
-          - esp32:esp32:esp32h2
-          - esp8266:esp8266:generic
-          - teensy:avr:teensy40
-
-          # Not yet supported, not in standard library
-          # - esp32:esp32:nano_nora
-
-          # End strategy matrix
-    env:
-      REPO_OWNER: ${{ github.repository_owner }}
-
-    steps:
-      - name: Free disk space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf /opt/ghc
-          sudo rm -rf /opt/hostedtoolcache/CodeQL
-          sudo apt-get clean
-          df -h
-
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Install Arduino CLI
-        run: |
-          # Script to fetch and run install.sh from arduino/arduino-cli
-
-          # The install script will test to see if the recently installed apps in the path
-          # So set it up in advance:
-          mkdir -p "${PWD}/bin"
-          echo "${PWD}/bin" >> $GITHUB_PATH
-
-          # Sets the install directory to a consistent path at the repo root.
-          ROOT_BIN="$GITHUB_WORKSPACE/bin"
-
-          # Ensures that BINDIR exists before the installer runs
-          mkdir -p "$ROOT_BIN"
-
-          # Save as a global environment variable
-          echo "$ROOT_BIN" >> "$GITHUB_PATH"
-
-          # Download and run install script from Arduino:
-          # -S show errors; -L follow redirects; -v Verbose
-          set +e                 # don't abort on error
-          set -o pipefail
-
-          curl -vSL --retry 5 --retry-delay 10 \
-             https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh  \
-             | sh -x
-          rc=$?
-          c_rc=${PIPESTATUS[0]}  # curl's exit code
-          s_rc=${PIPESTATUS[1]}  # sh's  exit code
-
-          set -e                 # restore default abort-on-error
-
-          # If there was a curl error, we have our own local copy that is more reliable and can add our own debugging
-          if [ "$rc" -ne 0 ]; then
-            echo "Primary install failed: curl=$c_rc, sh=$s_rc. Falling back..." >&2
-            echo "Using local copy of arduino_install.sh"
-            pushd ./Arduino/sketches
-              chmod +x ./arduino_install.sh
-
-              # Mimic curl install, does not use current directory:
-              BINDIR="$ROOT_BIN" sh -x ./arduino_install.sh
-            popd
-          else
-            echo "Alternative install script not needed."
-          fi
-
-      - name: Confirm Arduino CLI Install
-        run: arduino-cli version
-
-      - name: Derive CORE_ID (vendor:arch from FQBN)
-        run: |
-          CORE_ID="$(echo '${{ matrix.fqbn }}' | cut -d: -f1-2)"
-          echo "CORE_ID=$CORE_ID" >> "$GITHUB_ENV"
-
-      - name: Setup Arduino CLI
-        run: |
-          arduino-cli config init
-
-          # wait 10 minutes for big downloads (or use 0 for no limit)
-          arduino-cli config set network.connection_timeout 600s
-
-          arduino-cli config add board_manager.additional_urls https://www.pjrc.com/teensy/package_teensy_index.json
-          arduino-cli config add board_manager.additional_urls https://arduino.esp8266.com/stable/package_esp8266com_index.json
-          arduino-cli core update-index
-
-          echo "CORE_ID: $CORE_ID"
-          arduino-cli core install "$CORE_ID"
-
-          # The above is instead of:
-          # arduino-cli core install esp32:esp32            # ESP32
-          # arduino-cli core install arduino:avr            # Arduino Uno, Mega, Nano
-          # arduino-cli core install arduino:sam            # Arduino Due
-          # arduino-cli core install arduino:samd           # Arduino Zero
-          # arduino-cli core install teensy:avr             # PJRC Teensy
-          # arduino-cli core install esp8266:esp8266        # ESP8266
-          # arduino-cli core install arduino:mbed_nano      # nanorp2040connect
-          # arduino-cli core install arduino:mbed_portenta  # portenta_h7_m7
-          # arduino-cli core install arduino:mbed_edge
-          # arduino-cli core install arduino:renesas_uno
-
-          # For reference:
-
-          # mbed nano not yet tested
-          # sudo "/home/$USER/.arduino15/packages/arduino/hardware/mbed_nano/4.2.4/post_install.sh"
-
-          # Always install networking (not part of FQBN matrix)
-          # The first one also creates directory: /home/runner/Arduino/libraries
-          arduino-cli lib install "ArduinoJson"           # Example dependency
-          arduino-cli lib install "WiFiNINA"              # ARDUINO_SAMD_NANO_33_IOT
-          arduino-cli lib install "Ethernet"              # Install Ethernet library
-          arduino-cli lib install "Bridge"                # Pseudo-network for things like arduino:samd:tian
-
-      - name: Set Job Environment Variables
-        run: |
-          # Script to assign some common environment variables after everything is installed
-
-          ICON_OK=$(printf "\xE2\x9C\x85")
-          ICON_FAIL=$(printf "\xE2\x9D\x8C")
-
-          echo "GITHUB_WORK=$(realpath           "$GITHUB_WORKSPACE/../..")"  >> "$GITHUB_ENV"
-          echo "ARDUINO_ROOT=$(realpath          "$HOME/Arduino/libraries")"  >> "$GITHUB_ENV"
-
-          # Show predefined summary:
-          echo "GITHUB_WORKSPACE      = $GITHUB_WORKSPACE"
-
-          # Show assigned build:env values (e.g. "wolfssl", "gojimmpi" or other owners):
-          echo "REPO_OWNER            = $REPO_OWNER"
-
-          echo "GITHUB_ENV=$GITHUB_ENV"
-
-          # Show our custom values:
-          echo "GITHUB_WORK           = $GITHUB_WORK"
-          echo "ARDUINO_ROOT          = $ARDUINO_ROOT"
-
-          # WOLFSSL_EXAMPLES_ROOT is the repo root, not example location
-          echo "WOLFSSL_EXAMPLES_ROOT = $WOLFSSL_EXAMPLES_ROOT"
-
-      - name: Cache Arduino Packages
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.arduino15
-            ~/.cache/arduino
-            # Exclude staging directory from cache to save space
-            !~/.arduino15/staging
-
-            # Arduino libraries
-            # Specific to Arduino CI Build (2 of 4) Arduinbo Release wolfSSL for Local Examples
-            # Include all libraries, as the latest Arduino-wolfSSL will only change upon release.
-            ~/Arduino/libraries
-            # Ensure wolfssl is not cached, we're always using the latest. See separate cache.
-            !~/Arduino/libraries/wolfssl
-          key: arduino-${{ runner.os }}-${{ env.CORE_ID }}-${{ hashFiles('Arduino/sketches/board_list.txt') }}
-
-          restore-keys: |
-               arduino-${{ runner.os }}-${{ env.CORE_ID }}-
-               arduino-${{ runner.os }}-
-
-      - name: Get wolfssl-examples
-        run: |
-          # Fetch Arduino examples from the wolfssl-examples repo
-          echo "Start pwd:"
-          pwd
-          # we're typically in $GITHUB_WORKSPACE=/home/runner/work/wolfssl/wolfssl
-          # goto /home/runner/work to fetch wolfssl-examples
-
-          echo "Current pwd for wolfssl-examples clone fetch: $(pwd)"
-          GITHUB_WORK=$(realpath "$GITHUB_WORKSPACE/../..")
-          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE"
-
-          # Typically /home/runner/work
-          echo "GITHUB_WORK=$GITHUB_WORK"
-
-          pushd "$GITHUB_WORK"
-            echo "Updated pwd for wolfssl-examples clone fetch: $(pwd)"
-
-            git clone --depth 1 https://github.com/$REPO_OWNER/wolfssl-examples.git wolfssl-examples-publish
-
-            cd ./wolfssl-examples-publish
-            echo "WOLFSSL_EXAMPLES_ROOT=$(pwd)"
-
-            echo "Path for wolfssl-examples-publish: $(pwd)"
-          popd # GITHUB_WORK
-
-
-          # ** END ** Get wolfssl-examples
-
-      - name: Install wolfSSL Arduino library
-        run: |
-          # Run the local wolfssl-arduino.sh install script to install wolfssl Arduino library.
-
-          echo "Installing wolfSSL Arduino library (no cache hit)."
-          rm -rf "$ARDUINO_ROOT/wolfssl"
-
-          # Methods of installing Arduino library:
-          #   1) arduino-cli lib install "wolfSSL"
-          #   2) manual copy of files (typical of the Arduino-wolfssl repo)
-          #   3) run ./wolfssl-arduino.sh INSTALL (typical of the wolfssl repo)
-
-          echo "Current pwd for wolfssl-examples clone fetch: $(pwd)"
-          GITHUB_WORK=$(realpath "$GITHUB_WORKSPACE/../..")
-          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE"
-
-          # Typically /home/runner/work
-          echo "GITHUB_WORK=$GITHUB_WORK"
-          pwd
-          pushd ./IDE/ARDUINO
-
-            # Set default ARDUINO_ROOT to Arduino library.
-            export ARDUINO_ROOT="$HOME/Arduino/libraries"
-            export WOLFSSL_EXAMPLES_ROOT="$GITHUB_WORK/wolfssl-examples-publish"
-
-            echo "ARDUINO_ROOT:          $WOLFSSL_EXAMPLES_ROOT"
-            echo "WOLFSSL_EXAMPLES_ROOT: $WOLFSSL_EXAMPLES_ROOT"
-
-            bash ./wolfssl-arduino.sh INSTALL  # Install wolfSSL library
-          popd
-
-          # ** END ** Install wolfSSL Arduino library
-
-      - name: List installed Arduino libraries
-        run: arduino-cli lib list
-
-      - name: Get compile-all-examples.sh
-        run: |
-          # Fetch compile script FROM THE CURRENT OWNER.
-          # This repo is Arduino-wolfssl; we'll fetch the script from the wolfssl-examples for the same repository owner.
-          echo "Repository owner: $REPO_OWNER"
-          echo "Current directory: $PWD"
-          echo "Current pwd for wolfssl-examples clone fetch: $PWD"
-          WOLFSSL_EXAMPLES_DIRECTORY="$ARDUINO_ROOT/wolfssl/examples"
-          THIS_BOARD_LIST="board_list.txt"
-          echo "WOLFSSL_EXAMPLES_DIRECTORY=$WOLFSSL_EXAMPLES_DIRECTORY"
-
-          # Fetch script and board list into WOLFSSL_EXAMPLES_DIRECTORY
-          echo "Fetching board_list.txt from REPO_OWNER=$REPO_OWNER"
-          curl -L "https://raw.githubusercontent.com/$REPO_OWNER/wolfssl-examples/master/Arduino/sketches/board_list.txt"  \
-               -o "$WOLFSSL_EXAMPLES_DIRECTORY/$THIS_BOARD_LIST"
-
-          # Check if the first line is "404: Not Found" - which would indicate the curl path above is bad.
-          FILE="$WOLFSSL_EXAMPLES_DIRECTORY/board_list.txt"
-
-          # Ensure the file exists
-          if [[ ! -f "$FILE" ]]; then
-              echo "File not found: $FILE"
-              exit 1
-          fi
-
-          # Check if the first line is "404: Not Found"
-          if [[ $(head -n 1 "$FILE") == "404: Not Found" ]]; then
-              echo "The first line is '404: Not Found'"
-              exit 1
-          fi
-
-          # Fetch the compile script from repo: https://github.com/[$USER]/wolfssl-examples/
-          echo "Fetching compile-all-examples.sh from REPO_OWNER=$REPO_OWNER"
-          curl -L "https://raw.githubusercontent.com/$REPO_OWNER/wolfssl-examples/master/Arduino/sketches/compile-all-examples.sh"  \
-               -o "$WOLFSSL_EXAMPLES_DIRECTORY/compile-all-examples.sh"
-
-          # Check if the first line is "404: Not Found" - which would indicate the curl path above is bad.
-          FILE="$WOLFSSL_EXAMPLES_DIRECTORY/compile-all-examples.sh"
-
-          # Ensure the file exists
-          if [[ ! -f "$FILE" ]]; then
-              echo "File not found: $FILE"
-              exit 1
-          fi
-
-          # Check if the first line is "404: Not Found"
-          if [[ $(head -n 1 "$FILE") == "404: Not Found" ]]; then
-              echo "The first line is '404: Not Found'"
-              exit 1
-          fi
-
-          pushd "$WOLFSSL_EXAMPLES_DIRECTORY"
-            echo "Current directory:           $PWD"
-
-            echo "Current directory $PWD"
-            echo "Contents:"
-            ls -al
-            find ./ -type f | sort
-
-            # ensure we can execute the script here (permissions lost during curl fetch)
-            chmod +x ./compile-all-examples.sh
-            echo "Found compile script: $(ls -al ./compile-all-examples.sh ./$THIS_BOARD_LIST)"
-          popd
-
-          # ** END ** Get compile-all-examples.sh
-
-      # This will fail with Arduino published wolfSSL v5.7.6 and older
-      # as the examples moved. See https://github.com/wolfSSL/wolfssl/pull/8514
-      #
-      - name: Compile Arduino Sketches for Various Boards
-        run: |
-          # Call the compile-all-examples.sh script to compile all the examples for each of the fqbn names in the local copy of board_list.txt
-
-          echo "Current directory:           $PWD"
-          echo "ARDUINO_ROOT:                $ARDUINO_ROOT"
-          WOLFSSL_EXAMPLES_DIRECTORY="$ARDUINO_ROOT/wolfssl/examples"
-          echo "WOLFSSL_EXAMPLES_DIRECTORY:  $WOLFSSL_EXAMPLES_DIRECTORY"
-
-          # Limit the number of jobs to 1 to avoid running out of memory
-          export ARDUINO_CLI_MAX_JOBS=1
-
-          echo "Change directory to Arduino examples..."
-          pushd "$WOLFSSL_EXAMPLES_DIRECTORY"
-            chmod +x ./compile-all-examples.sh
-
-            # The script expects all the examples to be in the current directory.
-            # Along with ./board_list.txt from examples repo
-            echo "Current directory:           $PWD"
-            echo "Calling ./compile-all-examples.sh"
-            bash ./compile-all-examples.sh  ./board_list.txt "${{ matrix.fqbn }}"
-          popd
-          # End Compile Arduino Sketches for Various Boards
-
-      - name: Cleanup to Save Disk Space
-        if: always()
-        run: |
-          echo "Disk usage before cleanup:"
-          df -h
-          echo ""
-          echo "Cleaning up build artifacts and temporary files..."
-
-          # Clean up Arduino build artifacts
-          find ~/Arduino -name "*.hex" -delete 2>/dev/null || true
-          find ~/Arduino -name "*.elf" -delete 2>/dev/null || true
-          find ~/Arduino -name "*.bin" -delete 2>/dev/null || true
-          find ~/Arduino -name "build" -type d -exec rm -rf {} + 2>/dev/null || true
-
-          rm -rf ~/.arduino15/packages/esp32/tools || true
-          rm -rf ~/.arduino15/packages/esp32/hardware || true
-          rm -rf ~/.espressif || true
-
-          # Clean up staging directories
-          rm -rf ~/.arduino15/staging/* || true
-          rm -rf ~/.cache/arduino/* || true
-
-          # Clean up git clone of wolfssl-examples
-          GITHUB_WORK=$(realpath "$GITHUB_WORKSPACE/../..")
-          rm -rf "$GITHUB_WORK/wolfssl-examples-publish" || true
-
-          # Clean up any temporary files in workspace
-          find "$GITHUB_WORKSPACE" -name "*.o" -delete 2>/dev/null || true
-          find "$GITHUB_WORKSPACE" -name "*.a" -delete 2>/dev/null || true
-
-          echo ""
-          echo "Disk usage after cleanup:"
-          df -h
--- a/.github/workflows/async.yml
+++ b/.github/workflows/async.yml
@@ -18,13 +18,13 @@ jobs:
      matrix:
        config: [
          # Add new configs here
-          '--enable-asynccrypt --enable-all --enable-dtls13 CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFCRYPT_TEST_LINT"',
-          '--enable-asynccrypt-sw --enable-ocspstapling --enable-ocspstapling2 CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
-          '--enable-ocsp CFLAGS="-DTEST_NONBLOCK_CERTS -pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
+          '--enable-asynccrypt --enable-all --enable-dtls13',
+          '--enable-asynccrypt-sw --enable-ocspstapling --enable-ocspstapling2',
+          '--enable-ocsp CFLAGS="-DTEST_NONBLOCK_CERTS"',
        ]
    name: make check
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 6
    steps:
@@ -33,7 +33,7 @@ jobs:

      - name: Test wolfSSL async
        run: |
-          ./autogen.sh
+          ./async-check.sh install
          ./configure ${{ matrix.config }}
          make check

--- a/.github/workflows/bind.yml
+++ b/.github/workflows/bind.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -44,10 +44,10 @@ jobs:
      fail-fast: false
      matrix:
        # List of releases to test
-        ref: [ 9.18.0, 9.18.28, 9.18.33 ]
+        ref: [ 9.18.0, 9.18.28 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 10
    needs: build_wolfssl
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -8,7 +8,7 @@ on:

 jobs:
  build:
-    if: github.repository_owner == 'wolfssl'
+
    runs-on: ubuntu-latest

    steps:
@@ -39,7 +39,7 @@ jobs:
            -DWOLFSSL_AESCBC:BOOL=yes -DWOLFSSL_AESCCM:BOOL=yes -DWOLFSSL_AESCFB:BOOL=yes \
            -DWOLFSSL_AESCTR:BOOL=yes -DWOLFSSL_AESGCM:STRING=yes -DWOLFSSL_AESKEYWRAP:BOOL=yes \
            -DWOLFSSL_AESOFB:BOOL=yes -DWOLFSSL_AESSIV:BOOL=yes -DWOLFSSL_ALIGN_DATA:BOOL=yes \
-            -DWOLFSSL_ALPN:BOOL=ON -DWOLFSSL_ALT_CERT_CHAINS:BOOL=ON -DWOLFSSL_ARC4:BOOL=yes \
+            -DWOLFSSL_ALPN:BOOL=ON -DWOLFSSL_ALT_CERT_CHAINS:BOOL=ON -DWOLFSSL_ARC4:BOOL=no \
            -DWOLFSSL_ARIA:BOOL=no -DWOLFSSL_ASIO:BOOL=no -DWOLFSSL_ASM:BOOL=yes -DWOLFSSL_ASN:BOOL=yes \
            -DWOLFSSL_ASYNC_THREADS:BOOL=no -DWOLFSSL_BASE64_ENCODE:BOOL=yes -DWOLFSSL_CAAM:BOOL=no \
            -DWOLFSSL_CERTEXT:BOOL=yes -DWOLFSSL_CERTGEN:BOOL=yes -DWOLFSSL_CERTGENCACHE:BOOL=no \
@@ -75,11 +75,9 @@ jobs:
            -DWOLFSSL_SNI:BOOL=yes -DWOLFSSL_SP_MATH_ALL:BOOL=yes -DWOLFSSL_SRTP:BOOL=yes \
            -DWOLFSSL_STUNNEL:BOOL=yes -DWOLFSSL_SUPPORTED_CURVES:BOOL=yes -DWOLFSSL_SYS_CA_CERTS:BOOL=yes \
            -DWOLFSSL_TICKET_NONCE_MALLOC:BOOL=yes -DWOLFSSL_TLS13:BOOL=yes -DWOLFSSL_TLSV12:BOOL=yes \
-            -DWOLFSSL_TLSX:BOOL=yes -DWOLFSSL_TPM:BOOL=yes -DWOLFSSL_CLU:BOOL=yes -DWOLFSSL_USER_SETTINGS:BOOL=no \
+            -DWOLFSSL_TLSX:BOOL=yes -DWOLFSSL_TPM:BOOL=yes -DWOLFSSL_USER_SETTINGS:BOOL=no \
            -DWOLFSSL_USER_SETTINGS_ASM:BOOL=no -DWOLFSSL_WOLFSSH:BOOL=ON -DWOLFSSL_X86_64_BUILD_ASM:BOOL=yes \
-            -DWOLFSSL_MLKEM=1 -DWOLFSSL_LMS=1 -DWOLFSSL_LMSSHA256192=1 -DWOLFSSL_EXPERIMENTAL=1 \
-            -DWOLFSSL_X963KDF:BOOL=yes -DWOLFSSL_DILITHIUM:BOOL=yes -DWOLFSSL_PKCS11:BOOL=yes \
-            -DWOLFSSL_ECCSI:BOOL=yes -DWOLFSSL_SAKKE:BOOL=yes -DWOLFSSL_SIPHASH:BOOL=yes \
+            -DWOLFSSL_X963KDF:BOOL=yes \
            -DCMAKE_C_FLAGS="-DWOLFSSL_DTLS_CH_FRAG" \
            ..
        cmake --build .
@@ -90,6 +88,9 @@ jobs:
        cd ..
        rm -rf build

+        # Kyber Cmake broken
+        # -DWOLFSSL_KYBER:BOOL=yes
+
 # build "lean-tls" wolfssl
    - name: Build wolfssl with lean-tls
      working-directory: ./wolfssl
@@ -105,22 +106,3 @@ jobs:
        # clean up
        cd ..
        rm -rf build
-
-# CMake build with user_settings.h
-    - name: Build wolfssl with user_settings.h
-      working-directory: ./wolfssl
-      run: |
-        mkdir build
-        cp examples/configs/user_settings_all.h ./build/user_settings.h
-        cd build
-        cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DWOLFSSL_INSTALL=yes -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install" \
-            -DWOLFSSL_USER_SETTINGS=ON -DWOLFSSL_USER_SETTINGS_ASM=ON -DWOLFSSL_EXAMPLES=ON -DWOLFSSL_CRYPT_TESTS=ON \
-            -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -I ." \
-            ..
-        cmake --build .
-        ctest -j $(nproc)
-        cmake --install .
-
-        # clean up
-        cd ..
-        rm -rf build
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -14,7 +14,7 @@ concurrency:
 jobs:
  codespell:
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v4

@@ -23,8 +23,8 @@ jobs:
        check_filenames: true
        check_hidden: true
          # Add comma separated list of words that occur multiple times that should be ignored (sorted alphabetically, case sensitive)
-        ignore_words_list: adin,aNULL,brunch,carryIn,chainG,ciph,cLen,cliKs,dout,haveA,inCreated,inOut,inout,larg,LEAPYEAR,Merget,optionA,parm,parms,repid,rIn,userA,ser,siz,te,Te,HSI,failT,
+        ignore_words_list: adin,aNULL,brunch,carryIn,chainG,ciph,cLen,cliKs,dout,haveA,inCreated,inOut,inout,larg,LEAPYEAR,Merget,optionA,parm,parms,repid,rIn,userA,ser,siz,te,Te
          # The exclude_file contains lines of code that should be ignored. This is useful for individual lines which have non-words that can safely be ignored.
        exclude_file: '.codespellexcludelines'
          # To skip files entirely from being processed, add it to the following list:
-        skip: '*.cproject,*.der,*.mtpj,*.pem,*.vcxproj,.git,*.launch,*.scfg,*.revoked,./examples/asn1/dumpasn1.cfg,./examples/asn1/oid_names.h'
+        skip: '*.cproject,*.der,*.mtpj,*.pem,*.vcxproj,.git,*.launch,*.scfg,*.revoked'
--- a/.github/workflows/coverity-scan-fixes.yml
+++ b/.github/workflows/coverity-scan-fixes.yml
@@ -10,7 +10,7 @@ on:
 jobs:
  coverity:
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v4
      with:
--- a/.github/workflows/curl.yml
+++ b/.github/workflows/curl.yml
@@ -16,7 +16,7 @@ jobs:
  build_wolfssl:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -40,7 +40,7 @@ jobs:
  test_curl:
    name: ${{ matrix.curl_ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 15
    needs: build_wolfssl
@@ -52,7 +52,7 @@ jobs:
    - name: Install test dependencies
      run: |
        sudo apt-get update
-        sudo apt-get install nghttp2 libpsl5 libpsl-dev python3-impacket apache2 apache2-dev
+        sudo apt-get install nghttp2 libpsl5 libpsl-dev python3-impacket

    - name: Download lib
      uses: actions/download-artifact@v4
@@ -68,9 +68,9 @@ jobs:
        repository: curl/curl
        path: curl
        ref: ${{ matrix.curl_ref }}
-        configure: --with-wolfssl=$GITHUB_WORKSPACE/build-dir --with-test-httpd=yes
+        configure: --with-wolfssl=$GITHUB_WORKSPACE/build-dir
        check: false

    - name: Test curl
      working-directory: curl
-      run: make -j $(nproc) test-nonflaky
+      run: make -j $(nproc) test-ci
--- a/.github/workflows/cyrus-sasl.yml
+++ b/.github/workflows/cyrus-sasl.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -48,7 +48,7 @@ jobs:
        ref: [ 2.1.28 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    needs: build_wolfssl
--- a/.github/workflows/disable-pk-algs.yml
+++ b/.github/workflows/disable-pk-algs.yml
@@ -1,63 +0,0 @@
-name: disable-pk-algs Tests
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  make_check:
-    strategy:
-      matrix:
-        config: [
-          # Add new configs here
-          '--disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-rsa --enable-dh',
-          '--disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-ecc',
-          '--disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-rsa --enable-curve25519',
-          '--disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-ecc --enable-curve25519',
-          '--disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-rsa --enable-curve448',
-          '--disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-ecc --enable-curve448',
-          '--disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-curve25519 --enable-ed25519',
-          '--disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-curve448 --enable-ed448',
-          '-enable-cryptonly  --disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-rsa',
-          '--enable-cryptonly  --disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-dh',
-          '--enable-cryptonly  --disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-ecc',
-          '--enable-cryptonly  --disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-curve25519',
-          '--enable-cryptonly  --disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-ed25519',
-          '--enable-cryptonly  --disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-curve448',
-          '--enable-cryptonly  --disable-rsa --disable-dh --disable-ecc --disable-curve25519 --disable-ed25519 --disable-curve448 --disable-ed448 --enable-ed448',
-        ]
-    name: make check
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 6
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout wolfSSL
-
-      - name: Test wolfSSL
-        run: |
-          ./autogen.sh
-          ./configure ${{ matrix.config }}
-          make -j 4
-          make check
-
-      - name: Print errors
-        if: ${{ failure() }}
-        run: |
-          for file in scripts/*.log
-          do
-              if [ -f "$file" ]; then
-                  echo "${file}:"
-                  cat "$file"
-                  echo "========================================================================"
-              fi
-          done
--- a/.github/workflows/disabled/msys2.yml
+++ b/.github/workflows/disabled/msys2.yml
@@ -14,23 +14,27 @@ concurrency:

 jobs:
  msys2:
-    if: github.repository_owner == 'wolfssl'
    runs-on: windows-latest
    defaults:
      run:
        shell: msys2 {0}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { sys: ucrt64,  compiler: mingw-w64-ucrt-x86_64-gcc }
+          - { sys: mingw64, compiler: mingw-w64-x86_64-gcc }
+          - { sys: msys, compiler: gcc }
    steps:
      - uses: actions/checkout@v3
      - uses: msys2/setup-msys2@v2
        with:
-          msystem: msys
+          msystem: ${{ matrix.sys }}
          update: true
-          install: git gcc autotools base-devel autoconf netcat
+          install: git ${{matrix.compiler}} autotools base-devel autoconf netcat
      - name: configure wolfSSL
-        run: ./autogen.sh && ./configure --disable-sys-ca-certs CFLAGS="-DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 -DNO_WRITE_TEMP_FILES"
+        run: ./autogen.sh && ./configure CFLAGS="-DUSE_CERT_BUFFERS_2048 -DUSE_CERT_BUFFERS_256 -DNO_WRITE_TEMP_FILES"
      - name: build wolfSSL
-        run: make
-      - name: run tests
        run: make check
      - name: Display log
        if: always()
--- a/.github/workflows/docker-Espressif.yml
+++ b/.github/workflows/docker-Espressif.yml
@@ -15,13 +15,11 @@ jobs:
  espressif_latest:
    name: latest Docker container
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 12
    container:
-      # The latest stable release is v5.5
-      image: espressif/idf:release-v5.5
-      # image: espressif/idf:latest # The "latest" has breaking changes for ESP-IDF V6
+      image: espressif/idf:latest
    steps:
      - uses: actions/checkout@v4
      - name: Initialize Espressif IDE and build examples
@@ -29,7 +27,7 @@ jobs:
  espressif_v4_4:
    name: v4.4 Docker container
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    container:
      image: espressif/idf:release-v4.4
    steps:
@@ -39,7 +37,7 @@ jobs:
  espressif_v5_0:
    name: v5.0 Docker container
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    container:
      image: espressif/idf:release-v5.0
    steps:
--- a/.github/workflows/docker-OpenWrt.yml
+++ b/.github/workflows/docker-OpenWrt.yml
@@ -18,7 +18,7 @@ jobs:
    build_library:
        name: Compile libwolfssl.so
        if: github.repository_owner == 'wolfssl'
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-22.04
        # This should be a safe limit for the tests to run.
        timeout-minutes: 4
        container:
@@ -42,7 +42,7 @@ jobs:
    compile_container:
        name: Compile container
        if: github.repository_owner == 'wolfssl'
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-22.04
        # This should be a safe limit for the tests to run.
        timeout-minutes: 2
        needs: build_library
--- a/.github/workflows/fil-c.yml
+++ b/.github/workflows/fil-c.yml
@@ -1,47 +0,0 @@
-name: Fil-C Tests
-
-env:
-  FIL_C_VERSION: v0.674
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  run_fil_c:
-    strategy:
-      fail-fast: false
-      matrix:
-        config: [
-          # Add new configs here. Don't use CPPFLAGS.
-          '',
-          '--enable-all',
-        ]
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 30
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
-    name: ${{ matrix.config }}
-    steps:
-    - name: Download fil-c release
-      run: gh release download ${{ env.FIL_C_VERSION }} --repo pizlonator/fil-c --pattern 'filc-*'
-      env:
-        GH_TOKEN: ${{ github.token }}
-
-    - name: Extract fil-c tarball
-      run: mkdir -p filc && tar -xf filc-*.tar* --strip-components=1 -C filc
-
-    - name: Build and test wolfSSL
-      uses: wolfSSL/actions-build-autotools-project@v1
-      with:
-        path: wolfssl
-        configure: ${{ matrix.config }} CC=$GITHUB_WORKSPACE/filc/build/bin/filcc --disable-asm CPPFLAGS=-DWC_NO_CACHE_RESISTANT
-        check: true
--- a/.github/workflows/grpc.yml
+++ b/.github/workflows/grpc.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 10
    steps:
@@ -52,7 +52,7 @@ jobs:
              h2_ssl_cert_test h2_ssl_session_reuse_test
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 30
    needs: build_wolfssl
@@ -71,11 +71,6 @@ jobs:
        with:
          name: wolf-install-grpc

-      - name: Setup cmake version
-        uses: jwlawson/actions-setup-cmake@v2
-        with:
-          cmake-version: '3.25.x'
-
      - name: untar build-dir
        run: tar -xf build-dir.tgz

@@ -99,7 +94,7 @@ jobs:
          git submodule update --init
          mkdir cmake/build
          cd cmake/build
-          cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.1 -DgRPC_BUILD_TESTS=ON -DgRPC_SSL_PROVIDER=wolfssl \
+          cmake -DgRPC_BUILD_TESTS=ON -DgRPC_SSL_PROVIDER=wolfssl \
            -DWOLFSSL_INSTALL_DIR=$GITHUB_WORKSPACE/build-dir ../..
          make -j $(nproc) ${{ matrix.tests }}

--- a/.github/workflows/haproxy.yml
+++ b/.github/workflows/haproxy.yml
@@ -16,7 +16,7 @@ jobs:
  build_wolfssl:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -40,14 +40,14 @@ jobs:
  test_haproxy:
    name: ${{ matrix.haproxy_ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 15
    needs: build_wolfssl
    strategy:
      fail-fast: false
      matrix:
-        haproxy_ref: [ 'v3.1.0', 'v3.2.0']
+        haproxy_ref: [ 'v3.1.0' ]
    steps:
    - name: Install test dependencies
      run: |
@@ -82,13 +82,6 @@ jobs:
      working-directory: build-dir/haproxy-${{matrix.haproxy_ref}}
      run: make clean && make TARGET=linux-glibc USE_OPENSSL_WOLFSSL=1 SSL_LIB=$GITHUB_WORKSPACE/build-dir/lib SSL_INC=$GITHUB_WORKSPACE/build-dir/include ADDLIB=-Wl,-rpath,$GITHUB_WORKSPACE/build-dir/lib CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address"

-      # wlallemand/VTest used in v3.1.0 is no longer available
-    - name: Patch build-vtest.sh for v3.1.0
-      if: matrix.haproxy_ref == 'v3.1.0'
-      working-directory: build-dir/haproxy-${{ matrix.haproxy_ref }}/scripts
-      run: |
-        sed -i 's|https://github.com/wlallemand/VTest/archive/refs/heads/haproxy-sd_notify.tar.gz|https://github.com/vtest/VTest2/archive/main.tar.gz|' build-vtest.sh
-
    - name: Build haproxy vtest
      working-directory: build-dir/haproxy-${{matrix.haproxy_ref}}
      run: ./scripts/build-vtest.sh
--- a/.github/workflows/hostap-vm.yml
+++ b/.github/workflows/hostap-vm.yml
@@ -2,14 +2,10 @@ name: hostap and wpa-supplicant Tests

 # START OF COMMON SECTION
 on:
-    workflow_dispatch: # Allows people to run it manually if they want but
-                       # disables it from running automatically when broken
-# To restore this to an auto test delete the above workflow_dispatch line and
-# comments and uncomment the below lines for push and pull_request
-#  push:
-#    branches: [ 'master', 'main', 'release/**' ]
-#  pull_request:
-#    branches: [ '*' ]
+  push:
+    branches: [ 'master', 'main', 'release/**' ]
+  pull_request:
+    branches: [ '*' ]

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -83,8 +79,7 @@ jobs:
          lookup-only: true

      - name: Checkout hostap
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: git clone https://w1.fi/hostap.git hostap
+        run: git clone git://w1.fi/hostap.git hostap

  build_uml_linux:
    name: Build UML (UserMode Linux)
@@ -181,6 +176,9 @@ jobs:
          key: hostap-linux-${{ env.LINUX_REF }}
          fail-on-cache-miss: true

+      - name: show file structure
+        run: tree
+
        # No way to view the full strategy in the browser (really weird)
      - name: Print strategy
        run: |
@@ -219,7 +217,6 @@ jobs:
          sudo apt-get install -y libpcap0.8 libpcap-dev curl libcurl4-openssl-dev \
            libnl-3-dev binutils-dev libssl-dev libiberty-dev libnl-genl-3-dev \
            libnl-route-3-dev libdbus-1-dev bridge-utils tshark python3-pycryptodome
-          sudo pip install pycryptodome

      - name: Checking if we have hostap in cache
        uses: actions/cache/restore@v4
@@ -234,13 +231,7 @@ jobs:

      - name: Update certs
        working-directory: hostap/tests/hwsim/auth_serv
-        run: |
-          ./update.sh
-          ./sha512-generate.sh
-          # Force regeneration of rsa3072-ca.key to get rsa3072-generate.sh to
-          # correctly update all the certs
-          rm rsa3072-ca.key
-          ./rsa3072-generate.sh
+        run: ./update.sh

      - if: ${{ matrix.config.osp_ref }}
        name: Checkout OSP
@@ -321,7 +312,6 @@ jobs:
            KERNELDIR=$GITHUB_WORKSPACE/linux
            KVMARGS="-cpu host"
          EOF
-          git config --global --add safe.directory $GITHUB_WORKSPACE/hostap
          # Run tests in increments of 200 to not stall out the parallel-vm script
          while mapfile -t -n 200 ary && ((${#ary[@]})); do
            TESTS=$(printf '%s\n' "${ary[@]}" | tr '\n' ' ')
@@ -336,10 +326,6 @@ jobs:
            rm -r /tmp/hwsim-test-logs
          done < $GITHUB_WORKSPACE/wolfssl/.github/workflows/hostap-files/configs/${{ matrix.config.hostap_ref }}/tests

-      - name: show errors
-        if: ${{ failure() && steps.testing.outcome == 'failure' }}
-        run: grep -riP 'fail|error' /tmp/hwsim-test-logs/latest
-
      # The logs are quite big. It hasn't been useful so far so let's not waste
      # precious gh space.
      #- name: zip logs
--- a/.github/workflows/intelasm-c-fallback.yml
+++ b/.github/workflows/intelasm-c-fallback.yml
@@ -18,11 +18,11 @@ jobs:
      matrix:
        config: [
          # 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 CPPFLAGS="-DNO_WOLFSSL_CIPHER_SUITE_TEST -DWC_C_DYNAMIC_FALLBACK -DDEBUG_VECTOR_REGISTER_ACCESS -DDEBUG_VECTOR_REGISTER_ACCESS_FUZZING -DWC_DEBUG_CIPHER_LIFECYCLE"'
+          '--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 CPPFLAGS="-DNO_WOLFSSL_CIPHER_SUITE_TEST -DWC_AES_C_DYNAMIC_FALLBACK -DWC_C_DYNAMIC_FALLBACK -DDEBUG_VECTOR_REGISTER_ACCESS -DDEBUG_VECTOR_REGISTER_ACCESS_FUZZING -DWC_DEBUG_CIPHER_LIFECYCLE"'
        ]
    name: make check
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 6
    steps:
--- a/.github/workflows/ipmitool.yml
+++ b/.github/workflows/ipmitool.yml
@@ -16,9 +16,9 @@ concurrency:
 jobs:
  build_wolfssl:
    name: Build wolfSSL
-    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
+    if: github.repository_owner == 'wolfssl'
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -48,11 +48,11 @@ jobs:
        git_ref: [ c3939dac2c060651361fc71516806f9ab8c38901 ]
    name: ${{ matrix.git_ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    needs: build_wolfssl
    steps:
      - name: Install dependencies
-        run: export DEBIAN_FRONTEND=noninteractive && sudo apt-get update && sudo apt-get install -y libreadline-dev
+        run: export DEBIAN_FRONTEND=noninteractive && sudo apt-get update && sudo apt-get install -y libreadline8
      - name: Download lib
        uses: actions/download-artifact@v4
        with:
--- a/.github/workflows/jwt-cpp.yml
+++ b/.github/workflows/jwt-cpp.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    # Just to keep it the same as the testing target
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -47,9 +47,9 @@ jobs:
      matrix:
        config:
          - ref: 0.7.0
-            runner: ubuntu-24.04
+            runner: ubuntu-22.04
          - ref: 0.6.0
-            runner: ubuntu-24.04
+            runner: ubuntu-22.04
    name: ${{ matrix.config.ref }}
    runs-on: ${{ matrix.config.runner }}
    needs: build_wolfssl
@@ -66,11 +66,6 @@ jobs:
        with:
          name: wolf-install-jwt-cpp

-      - name: Setup cmake version
-        uses: jwlawson/actions-setup-cmake@v2
-        with:
-          cmake-version: '3.25.x'
-
      - name: untar build-dir
        run: tar -xf build-dir.tgz

@@ -92,7 +87,7 @@ jobs:
        run: |
          patch -p1 < ../osp/jwt-cpp/${{ matrix.config.ref }}.patch
          PKG_CONFIG_PATH=$GITHUB_WORKSPACE/build-dir/lib/pkgconfig \
-            cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -B build -DJWT_SSL_LIBRARY:STRING=wolfSSL -DJWT_BUILD_TESTS=ON .
+            cmake -B build -DJWT_SSL_LIBRARY:STRING=wolfSSL -DJWT_BUILD_TESTS=ON .
          make -j -C build
          ldd ./build/tests/jwt-cpp-test | grep wolfssl

--- a/.github/workflows/libspdm.yml
+++ b/.github/workflows/libspdm.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -43,10 +43,10 @@ jobs:
      fail-fast: false
      matrix:
        # List of releases to test
-        ref: [ 3.7.0 ]
+        ref: [ 3.3.0 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    needs: build_wolfssl
--- a/.github/workflows/libssh2.yml
+++ b/.github/workflows/libssh2.yml
@@ -60,27 +60,14 @@ jobs:
      - name: untar build-dir
        run: tar -xf build-dir.tgz

-      - name: Clone libssh2
-        uses: actions/checkout@v4
+      - name: Build and test libssh2
+        uses: wolfSSL/actions-build-autotools-project@v1
        with:
          repository: libssh2/libssh2
          ref: libssh2-${{ matrix.ref }}
          path: libssh2
-
-      - name: Build libssh2
-        working-directory: libssh2
-        run: |
-          autoreconf -fi
-          ./configure --with-crypto=wolfssl --with-libwolfssl-prefix=$GITHUB_WORKSPACE/build-dir
-
-      - name: Update libssh2 test to use a stable version of debian
-        working-directory: libssh2
-        run: |
-            sed -i 's/testing-slim/oldstable-slim/' tests/openssh_server/Dockerfile
-
-      - name: Run libssh2 tests
-        working-directory: libssh2
-        run: make -j check
+          configure: --with-crypto=wolfssl --with-libwolfssl-prefix=$GITHUB_WORKSPACE/build-dir
+          check: true

      - name: Confirm libssh2 built with wolfSSL
        run: ldd libssh2/src/.libs/libssh2.so | grep wolfssl
--- a/.github/workflows/libvncserver.yml
+++ b/.github/workflows/libvncserver.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    # Just to keep it the same as the testing target
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -47,7 +47,7 @@ jobs:
        ref: [ 0.9.13, 0.9.14 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    needs: build_wolfssl
    steps:
      - name: Download lib
@@ -55,11 +55,6 @@ jobs:
        with:
          name: wolf-install-libvncserver

-      - name: Setup cmake version
-        uses: jwlawson/actions-setup-cmake@v2
-        with:
-          cmake-version: '3.25.x'
-
      - name: untar build-dir
        run: tar -xf build-dir.tgz

@@ -81,7 +76,7 @@ jobs:
        run: |
          patch -p1 < ../osp/libvncserver/${{ matrix.ref }}.patch
          PKG_CONFIG_PATH=$GITHUB_WORKSPACE/build-dir/lib/pkgconfig \
-            cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -B build -DWITH_GNUTLS=OFF -DWITH_OPENSSL=OFF -DWITH_GCRYPT=OFF -DWITH_WOLFSSL=ON .
+            cmake -B build -DWITH_GNUTLS=OFF -DWITH_OPENSSL=OFF -DWITH_GCRYPT=OFF -DWITH_WOLFSSL=ON .
          make -j -C build VERBOSE=1
          ldd build/libvncclient.so | grep wolfssl
          ldd build/libvncserver.so | grep wolfssl
--- a/.github/workflows/linuxkm.yml
+++ b/.github/workflows/linuxkm.yml
@@ -1,54 +0,0 @@
-name: Kernel Module Build
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  build_library:
-    strategy:
-      matrix:
-        config: [
-          'EXTRA_CPPFLAGS=-Werror --enable-option-checking=fatal --enable-linuxkm --enable-linuxkm-lkcapi-register=all --enable-all --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-experimental --enable-dual-alg-certs --disable-qt --disable-quic --with-sys-crypto-policy=no --disable-opensslextra --disable-testcert --enable-intelasm --disable-sp-asm --enable-crypttests --enable-linuxkm-benchmarks CFLAGS="-DWOLFSSL_LINUXKM_VERBOSE_DEBUG -Wframe-larger-than=2048 -Wstack-usage=4096 -DBENCH_EMBEDDED -DBENCH_MIN_RUNTIME_SEC=0.01 -DBENCH_NTIMES=1 -DBENCH_AGREETIMES=1" --with-max-rsa-bits=16384',
-          'EXTRA_CPPFLAGS=-Werror --enable-option-checking=fatal --enable-linuxkm --enable-linuxkm-pie --enable-reproducible-build --enable-linuxkm-lkcapi-register=all --enable-all-crypto --enable-cryptonly --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-experimental --disable-qt --disable-quic --with-sys-crypto-policy=no --disable-opensslextra --disable-testcert --enable-intelasm --disable-sp-asm --enable-crypttests --enable-linuxkm-benchmarks CFLAGS="-DWOLFSSL_LINUXKM_VERBOSE_DEBUG -Wframe-larger-than=2048 -Wstack-usage=4096 -DBENCH_EMBEDDED -DBENCH_MIN_RUNTIME_SEC=0.01 -DBENCH_NTIMES=1 -DBENCH_AGREETIMES=1" --with-max-rsa-bits=16384'
-        ]
-    name: build module
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout wolfSSL
-
-      - name: Prepare target kernel for module builds
-        run: |
-          echo "updating linux-headers"
-          sudo apt-get update || $(exit 2)
-          sudo apt-get install linux-headers-$(uname -r) -y || $(exit 3)
-          echo "preparing target kernel $(uname -r)"
-          pushd "/lib/modules/$(uname -r)/build" || $(exit 4)
-          if [ -f /proc/config.gz ]; then gzip -dc /proc/config.gz > /tmp/.config && sudo mv /tmp/.config . || $(exit 5); elif [ -f "/boot/config-$(uname -r)" ]; then sudo cp -p "/boot/config-$(uname -r)" .config || $(exit 6); fi
-          sudo make -j 4 olddefconfig || $(exit 7)
-          sudo make M="$(pwd)" modules_prepare || $(exit 8)
-          popd >/dev/null
-
-      - name: autogen.sh
-        run: |
-          ./autogen.sh || $(exit 9)
-
-      - name: Build libwolfssl.ko, targeting GitHub ubuntu-latest, with --enable-all, PQC, and smallstack and stack depth warnings
-        run: |
-          echo "running ./configure --with-linux-source=/lib/modules/$(uname -r)/build ${{ matrix.config }}"
-          ./configure --with-linux-source=/lib/modules/$(uname -r)/build ${{ matrix.config }} || $(exit 10)
-          # try to remove profiling (-pg) because it leads to "_mcleanup: gmon.out: Permission denied"
-          make -j 4 KERNEL_EXTRA_CFLAGS_REMOVE=-pg FORCE_NO_MODULE_SIG=1 || $(exit 11)
-          ls -l linuxkm/libwolfssl.ko || $(exit 12)
-          echo "Successful linuxkm build."
--- a/.github/workflows/macos-apple-native-cert-validation.yml
+++ b/.github/workflows/macos-apple-native-cert-validation.yml
@@ -1,26 +0,0 @@
-name: MacOS apple native cert validation tests
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  make_check:
-    if: github.repository_owner == 'wolfssl'
-    runs-on: macos-latest
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 5
-    steps:
-      - name: Build and configure wolfSSL
-        uses: wolfSSL/actions-build-autotools-project@v1
-        with:
-          configure: CFLAGS='-DWOLFSSL_APPLE_NATIVE_CERT_VALIDATION -DWOLFSSL_TEST_APPLE_NATIVE_CERT_VALIDATION -DRSA_MIN_SIZE=2048 -DNO_WOLFSSL_CIPHER_SUITE_TEST'
-
--- a/.github/workflows/mbedtls.yml
+++ b/.github/workflows/mbedtls.yml
@@ -54,10 +54,10 @@ jobs:

  mbedtls_test:
    name: Test interop with mbedtls
-    if: github.repository_owner == 'wolfssl'
    runs-on: ubuntu-latest
    needs: build_mbedtls
    timeout-minutes: 10
+    if: github.repository_owner == 'wolfssl'
    steps:
      - name: Disable IPv6 (IMPORTANT, OTHERWISE DTLS MBEDTLS CLIENT WON'T CONNECT)
        run: echo 1 | sudo tee /proc/sys/net/ipv6/conf/lo/disable_ipv6
--- a/.github/workflows/memcached.yml
+++ b/.github/workflows/memcached.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    # Just to keep it the same as the testing target
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Build wolfSSL
        uses: wolfSSL/actions-build-autotools-project@v1
@@ -48,7 +48,7 @@ jobs:
          - ref: 1.6.22
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    needs: build_wolfssl
    steps:
      - name: Download lib
--- a/.github/workflows/mono.yml
+++ b/.github/workflows/mono.yml
@@ -1,142 +0,0 @@
-name: Linux Mono C# Build Test
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  build_wolfssl:
-    name: Build wolfSSL C# Wrapper
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
-    timeout-minutes: 10
-    steps:
-
-    # Build wolfSSL using the user_settings.h from the C# wrapper directory
-    - name: Build wolfSSL
-      uses: wolfSSL/actions-build-autotools-project@v1
-      with:
-        path: wolfssl
-        configure: --enable-usersettings CPPFLAGS=-I$GITHUB_WORKSPACE/wolfssl/wrapper/CSharp
-        install: true
-        check: false
-
-    - name: Install mono-complete
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y mono-complete
-
-    - name: Copy wolfSSL.dll to C# wrapper directory
-      run: |
-        echo "Copying wolfSSL.dll to C# wrapper directory. $GITHUB_WORKSPACE/build-dir/lib contains:"
-        ls -la $GITHUB_WORKSPACE/build-dir/lib/*
-        cp $GITHUB_WORKSPACE/build-dir/lib/libwolfssl.so $GITHUB_WORKSPACE/wolfssl/wrapper/CSharp/wolfssl.dll
-        cp $GITHUB_WORKSPACE/build-dir/lib/libwolfssl.so $GITHUB_WORKSPACE/wolfssl/wrapper/CSharp/libwolfssl.so
-
-    - name: Build and run wolfCrypt test wrapper
-      working-directory: wolfssl/wrapper/CSharp
-      run: |
-        mcs wolfCrypt-Test/wolfCrypt-Test.cs wolfSSL_CSharp/wolfCrypt.cs wolfSSL_CSharp/wolfSSL.cs wolfSSL_CSharp/X509.cs -OUT:wolfcrypttest.exe
-        mono wolfcrypttest.exe
-
-    - name: Build wolfSSL client/server test
-      working-directory: wolfssl/wrapper/CSharp
-      env:
-        LD_LIBRARY_PATH: $GITHUB_WORKSPACE/build-dir/lib
-      run: |
-        mcs wolfSSL_CSharp/wolfSSL.cs wolfSSL_CSharp/X509.cs wolfSSL-TLS-Server/wolfSSL-TLS-Server.cs -OUT:server.exe
-        mcs wolfSSL_CSharp/wolfCrypt.cs wolfSSL-TLS-Client/wolfSSL-TLS-Client.cs wolfSSL_CSharp/wolfSSL.cs wolfSSL_CSharp/X509.cs -OUT:client.exe
-
-    - name: Test wolfSSL client/server communication
-      working-directory: wolfssl/wrapper/CSharp
-      env:
-        LD_LIBRARY_PATH: $GITHUB_WORKSPACE/build-dir/lib
-      run: |
-        # Start server in background and capture its PID
-        timeout 10s mono server.exe > server.log 2>&1 &
-        SERVER_PID=$!
-
-        # Wait for server to start
-        sleep 2
-
-        # Run client and capture output
-        timeout 5s mono client.exe > client.log 2>&1
-        CLIENT_EXIT_CODE=$?
-
-        # Wait a moment for server to process
-        sleep 1
-
-        # Kill server
-        kill $SERVER_PID 2>/dev/null || true
-
-        # Check if client completed successfully (exit code 0)
-        if [ $CLIENT_EXIT_CODE -eq 0 ]; then
-          echo "Client completed successfully"
-        else
-          echo "Client failed with exit code $CLIENT_EXIT_CODE"
-          cat client.log
-          exit 1
-        fi
-
-        # Check for success indicators in logs
-        if grep -q "SSL version is" client.log && grep -q "SSL cipher suite is" client.log; then
-          echo "TLS handshake successful - SSL version and cipher suite detected"
-        else
-          echo "TLS handshake failed - no SSL version/cipher detected"
-          echo "Client log:"
-          cat client.log
-          echo "Server log:"
-          cat server.log
-          exit 1
-        fi
-
-    - name: Test SNI functionality
-      working-directory: wolfssl/wrapper/CSharp
-      env:
-        LD_LIBRARY_PATH: $GITHUB_WORKSPACE/build-dir/lib
-      run: |
-        # Start server with SNI support in background
-        timeout 10s mono server.exe -S > server_sni.log 2>&1 &
-        SERVER_PID=$!
-
-        # Wait for server to start
-        sleep 2
-
-        # Run client with SNI and capture output
-        timeout 5s mono client.exe -S localhost > client_sni.log 2>&1
-        CLIENT_EXIT_CODE=$?
-
-        # Wait a moment for server to process
-        sleep 1
-
-        # Kill server
-        kill $SERVER_PID 2>/dev/null || true
-
-        # Check if client completed successfully
-        if [ $CLIENT_EXIT_CODE -eq 0 ]; then
-          echo "SNI client completed successfully"
-        else
-          echo "SNI client failed with exit code $CLIENT_EXIT_CODE"
-          cat client_sni.log
-          exit 1
-        fi
-
-        # Check for SNI success indicators
-        if grep -q "SSL version is" client_sni.log && grep -q "SSL cipher suite is" client_sni.log; then
-          echo "SNI TLS handshake successful"
-        else
-          echo "SNI TLS handshake failed"
-          echo "Client log:"
-          cat client_sni.log
-          echo "Server log:"
-          cat server_sni.log
-          exit 1
-        fi
--- a/.github/workflows/mosquitto.yml
+++ b/.github/workflows/mosquitto.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    # Just to keep it the same as the testing target
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -45,7 +45,7 @@ jobs:
        ref: [ 2.0.18 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    needs: build_wolfssl
--- a/.github/workflows/multi-arch.yml
+++ b/.github/workflows/multi-arch.yml
@@ -30,14 +30,12 @@ jobs:
          - HOST: riscv64-linux-gnu
            CC: riscv64-linux-gnu-gcc
            ARCH: riscv64
-            EXTRA_OPTS: --enable-riscv-asm
          # Config to ensure CPUs without Thumb instructions compiles
          - HOST: arm-linux-gnueabi
            CC: arm-linux-gnueabi-gcc
            CFLAGS: -marm -DWOLFSSL_SP_ARM_ARCH=6
            ARCH: armel
            EXTRA_OPTS: --enable-sp-asm
-        opts: [ '-O2', '-O3', '-O1 -UFP_ECC', '-O0', '-Os', '-Ofast' ]
    if: github.repository_owner == 'wolfssl'
    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
@@ -48,12 +46,12 @@ jobs:
          sudo apt update
          sudo apt install -y crossbuild-essential-${{ matrix.ARCH }} qemu-user
      - uses: actions/checkout@v4
-      - name: Build for ${{ matrix.ARCH }} with Opt Level ${{ matrix.opts }}
+      - name: Build
        env:
            CC: ${{ matrix.CC }}
-            CFLAGS: ${{ matrix.CFLAGS }} ${{ matrix.opts }}
+            CFLAGS: ${{ matrix.CFLAGS }}
            QEMU_LD_PREFIX: /usr/${{ matrix.HOST }}
-        run: ./autogen.sh && ./configure --host=${{ matrix.HOST }} --enable-all --disable-examples CPPFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFCRYPT_TEST_LINT" ${{ matrix.EXTRA_OPTS }} && make
+        run: ./autogen.sh && ./configure --host=${{ matrix.HOST }} --enable-all --disable-examples ${{ matrix.EXTRA_OPTS }} && make
      - name: Print errors
        if: ${{ failure() }}
        run: |
--- a/.github/workflows/multi-compiler.yml
+++ b/.github/workflows/multi-compiler.yml
@@ -21,22 +21,31 @@ jobs:
        include:
          - CC: gcc-9
            CXX: g++-9
-            OS: ubuntu-24.04
+            OS: ubuntu-22.04
          - CC: gcc-10
            CXX: g++-10
-            OS: ubuntu-24.04
+            OS: ubuntu-22.04
          - CC: gcc-11
            CXX: g++-11
-            OS: ubuntu-24.04
+            OS: ubuntu-22.04
          - CC: gcc-12
            CXX: g++-12
-            OS: ubuntu-24.04
+            OS: ubuntu-22.04
+          - CC: clang-10
+            CXX: clang++-10
+            OS: ubuntu-20.04
+          - CC: clang-11
+            CXX: clang++-11
+            OS: ubuntu-20.04
+          - CC: clang-12
+            CXX: clang++-12
+            OS: ubuntu-20.04
+          - CC: clang-13
+            CXX: clang++-13
+            OS: ubuntu-22.04
          - CC: clang-14
            CXX: clang++-14
-            OS: ubuntu-24.04
-          - CC: clang-19
-            CXX: clang++-19
-            OS: ubuntu-24.04
+            OS: ubuntu-22.04
    if: github.repository_owner == 'wolfssl'
    runs-on: ${{ matrix.OS }}
    # This should be a safe limit for the tests to run.
@@ -49,7 +58,7 @@ jobs:
        env:
            CC: ${{ matrix.CC }}
            CXX: ${{ matrix.CXX }}
-        run: ./autogen.sh && ./configure CFLAGS="-pedantic -Wdeclaration-after-statement" && make && make dist
+        run: ./autogen.sh && ./configure && make && make dist
      - name: Show log on errors
        if: ${{ failure() }}
        run: |
--- a/.github/workflows/net-snmp.yml
+++ b/.github/workflows/net-snmp.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -48,7 +48,7 @@ jobs:
            test_opts: -e 'agentxperl'
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    needs: build_wolfssl
--- a/.github/workflows/nginx.yml
+++ b/.github/workflows/nginx.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -107,7 +107,7 @@ jobs:
              stream_proxy_ssl_verify.t
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 6
    needs: build_wolfssl
@@ -122,28 +122,7 @@ jobs:

      - name: Install dependencies
        run: |
-          sudo cpan -iT Proc::Find
-
-      # Locking in the version of SSLeay used with testing
-      - name: Download and install Net::SSLeay 1.94 manually
-        run: |
-          curl -LO https://www.cpan.org/modules/by-module/Net/CHRISN/Net-SSLeay-1.94.tar.gz
-          tar -xzf Net-SSLeay-1.94.tar.gz
-          cd Net-SSLeay-1.94
-          perl Makefile.PL
-          make
-          sudo make install
-
-      # SSL version 2.091 changes '' return to undef causing test case to fail.
-      # Locking in the test version to use as 2.090
-      - name: Download and install IO::Socket::SSL 2.090 manually
-        run: |
-          curl -LO https://www.cpan.org/modules/by-module/IO/IO-Socket-SSL-2.090.tar.gz
-          tar -xzf IO-Socket-SSL-2.090.tar.gz
-          cd IO-Socket-SSL-2.090
-          perl Makefile.PL
-          make
-          sudo make install
+          sudo cpan -iT Proc::Find Net::SSLeay IO::Socket::SSL

      - name: Checkout wolfssl-nginx
        uses: actions/checkout@v4
--- a/.github/workflows/no-malloc.yml
+++ b/.github/workflows/no-malloc.yml
@@ -18,11 +18,11 @@ jobs:
      matrix:
        config: [
          # Add new configs here
-          '--enable-rsa --enable-keygen --disable-dh CFLAGS="-DWOLFSSL_NO_MALLOC -DRSA_MIN_SIZE=1024 -pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
+          '--enable-rsa --enable-keygen --disable-dh CFLAGS="-DWOLFSSL_NO_MALLOC -DRSA_MIN_SIZE=1024"',
        ]
    name: make check
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 6
    steps:
--- a/.github/workflows/no-tls.yml
+++ b/.github/workflows/no-tls.yml
@@ -1,49 +0,0 @@
-name: --disable-tls Tests
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  make_check:
-    strategy:
-      matrix:
-        config: [
-          # Add new configs here
-          '--disable-tls --enable-all CFLAGS="-pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
-        ]
-    name: make check
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 6
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout wolfSSL
-
-      - name: Test wolfSSL
-        run: |
-          ./autogen.sh
-          ./configure ${{ matrix.config }}
-          make -j 4
-          make check
-
-      - name: Print errors
-        if: ${{ failure() }}
-        run: |
-          for file in scripts/*.log
-          do
-              if [ -f "$file" ]; then
-                  echo "${file}:"
-                  cat "$file"
-                  echo "========================================================================"
-              fi
-          done
--- a/.github/workflows/nss.yml
+++ b/.github/workflows/nss.yml
@@ -21,7 +21,7 @@ jobs:
  build_nss:
    name: Build nss
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 30
    steps:
@@ -59,10 +59,10 @@ jobs:

  nss_test:
    name: Test interop with nss
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    needs: build_nss
    timeout-minutes: 10
+    if: github.repository_owner == 'wolfssl'
    steps:
      - name: Checking if we have nss in cache
        uses: actions/cache/restore@v4
--- a/.github/workflows/ntp.yml
+++ b/.github/workflows/ntp.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -47,7 +47,7 @@ jobs:
        ref: [ 4.2.8p15, 4.2.8p17 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 10
    needs: build_wolfssl
--- a/.github/workflows/ocsp.yml
+++ b/.github/workflows/ocsp.yml
@@ -16,7 +16,7 @@ jobs:
  ocsp_stapling:
    name: ocsp stapling
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    timeout-minutes: 10
    steps:
      - name: Checkout wolfSSL
--- a/.github/workflows/openldap.yml
+++ b/.github/workflows/openldap.yml
@@ -15,9 +15,8 @@ concurrency:
 jobs:
  build_wolfssl:
    name: Build wolfSSL
-    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -50,8 +49,7 @@ jobs:
          - osp_ref: 2.6.7
            git_ref: OPENLDAP_REL_ENG_2_6_7
    name: ${{ matrix.osp_ref }}
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 20
    needs: build_wolfssl
--- a/.github/workflows/openssh.yml
+++ b/.github/workflows/openssh.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -45,33 +45,11 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          # A good way to measure how much each test takes is to create a bash script
-          # in the openssh root like this (make it executable):
-          # time-measure.sh
-          #   #!/bin/bash
-          #   /usr/bin/time -a -o /tmp/LTESTS-times.txt -f '%e %C' /usr/bin/bash "$@"
-          # And invoke the openssh tests like this:
-          #   rm -f /tmp/LTESTS-times.txt && \
-          #     make tests TEST_SHELL=$(pwd)/time-measure.sh SKIP_UNIT=yes && \
-          #     grep test-exec.sh /tmp/LTESTS-times.txt
          - git_ref: 'V_9_6_P1'
            osp_ver: '9.6'
-            SKIP_LTESTS: >-
-              exit-status rekey multiplex cert-userkey forward-control integrity
-              channel-timeout connection-timeout
-          - git_ref: 'V_9_9_P2'
-            osp_ver: '9.9p2'
-            SKIP_LTESTS: >-
-              exit-status rekey multiplex cert-userkey forward-control integrity
-              channel-timeout connection-timeout
-          - git_ref: 'V_10_0_P2'
-            osp_ver: '10.0p2'
-            SKIP_LTESTS: >-
-              exit-status rekey multiplex forward-control channel-timeout
-              connection-timeout
-    name: ${{ matrix.osp_ver }}
+    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    needs: build_wolfssl
    steps:
      - name: Download lib
@@ -102,4 +80,5 @@ jobs:
      - name: Run tests
        working-directory: ./openssh
        run: |
-          make tests SKIP_LTESTS='${{ matrix.SKIP_LTESTS }}'
+          # Run all the tests except (t-exec) as it takes too long
+          make file-tests interop-tests extra-tests unit
--- a/.github/workflows/opensslcoexist.yml
+++ b/.github/workflows/opensslcoexist.yml
@@ -18,12 +18,12 @@ jobs:
      matrix:
        config: [
          # Add new configs here
-          '--verbose --enable-all --disable-all-osp --disable-opensslall --enable-opensslcoexist CPPFLAGS="-DNO_WOLFSSL_CIPHER_SUITE_TEST -pedantic -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"',
-          '--verbose --enable-all --disable-all-osp --disable-opensslall --enable-opensslcoexist CPPFLAGS="-DNO_WOLFSSL_CIPHER_SUITE_TEST -pedantic -DTEST_OPENSSL_COEXIST -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE"'
+          '--verbose --enable-all --disable-all-osp --disable-opensslall --enable-opensslcoexist CPPFLAGS="-DNO_WOLFSSL_CIPHER_SUITE_TEST -pedantic"',
+          '--verbose --enable-all --disable-all-osp --disable-opensslall --enable-opensslcoexist CPPFLAGS="-DNO_WOLFSSL_CIPHER_SUITE_TEST -pedantic -DTEST_OPENSSL_COEXIST"'
        ]
    name: make check
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 6
    steps:
--- a/.github/workflows/openvpn.yml
+++ b/.github/workflows/openvpn.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -46,7 +46,7 @@ jobs:
        ref: [ release/2.6, master ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 10
    needs: build_wolfssl
--- a/.github/workflows/os-check.yml
+++ b/.github/workflows/os-check.yml
@@ -17,14 +17,12 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ ubuntu-24.04, macos-latest ]
+        os: [ ubuntu-22.04, macos-latest ]
        config: [
          # Add new configs here
          '',
          '--enable-all --enable-asn=template',
          '--enable-all --enable-asn=original',
-          '--enable-all --enable-asn=template CPPFLAGS=-DWOLFSSL_OLD_OID_SUM',
-          '--enable-all --enable-asn=original CPPFLAGS=-DWOLFSSL_OLD_OID_SUM',
          '--enable-harden-tls',
          '--enable-tls13 --enable-session-ticket --enable-dtls --enable-dtls13
             --enable-opensslextra --enable-sessioncerts
@@ -41,46 +39,9 @@ jobs:
          '--enable-dtls --enable-dtls13 --enable-dtls-frag-ch
           --enable-dtls-mtu',
          '--enable-dtls --enable-dtlscid --enable-dtls13 --enable-secure-renegotiation
-            --enable-psk --enable-aesccm --enable-nullcipher
-            CPPFLAGS=-DWOLFSSL_STATIC_RSA',
+            --enable-psk --enable-aesccm --enable-nullcipher CPPFLAGS=-DWOLFSSL_STATIC_RSA',
          '--enable-ascon --enable-experimental',
          '--enable-ascon CPPFLAGS=-DWOLFSSL_ASCON_UNROLL --enable-experimental',
-          '--enable-all CPPFLAGS=''-DNO_AES_192 -DNO_AES_256'' ',
-          '--enable-sniffer --enable-curve25519 --enable-curve448 --enable-enckeys
-            CPPFLAGS=-DWOLFSSL_DH_EXTRA',
-          '--enable-dtls --enable-dtls13 --enable-dtls-frag-ch
-            --enable-dtls-mtu CPPFLAGS=-DWOLFSSL_DTLS_RECORDS_CAN_SPAN_DATAGRAMS',
-          '--enable-opensslall --enable-opensslextra CPPFLAGS=-DWC_RNG_SEED_CB',
-          '--enable-opensslall --enable-opensslextra
-            CPPFLAGS=''-DWC_RNG_SEED_CB -DWOLFSSL_NO_GETPID'' ',
-          '--enable-opensslextra CPPFLAGS=''-DWOLFSSL_NO_CA_NAMES'' ',
-          '--enable-opensslextra=x509small',
-          'CPPFLAGS=''-DWOLFSSL_EXTRA'' ',
-          '--enable-lms=small,verify-only --enable-xmss=small,verify-only',
-          '--disable-sys-ca-certs',
-          '--enable-all CPPFLAGS=-DWOLFSSL_DEBUG_CERTS ',
-          '--enable-all CPPFLAGS="-DWOLFSSL_CHECK_MEM_ZERO"',
-          '--enable-coding=no',
-          '--enable-dtls --enable-dtls13 --enable-ocspstapling --enable-ocspstapling2
-           --enable-cert-setup-cb --enable-sessioncerts',
-          '--enable-dtls --enable-dtls13 --enable-tls13
-           CPPFLAGS=-DWOLFSSL_TLS13_IGNORE_PT_ALERT_ON_ENC',
-          '--disable-sni --disable-ecc --disable-tls13 --disable-secure-renegotiation-info',
-          'CPPFLAGS=-DWOLFSSL_BLIND_PRIVATE_KEY',
-          '--enable-all --enable-certgencache',
-          '--enable-sessionexport --enable-dtls --enable-dtls13',
-          '--enable-sessionexport',
-          '--disable-examples CPPFLAGS=-DWOLFSSL_NO_MALLOC',
-          'CPPFLAGS=-DNO_WOLFSSL_CLIENT',
-          'CPPFLAGS=-DNO_WOLFSSL_SERVER',
-          'CPPFLAGS=-DWOLFSSL_NO_CLIENT_AUTH',
-          'CPPFLAGS=''-DNO_WOLFSSL_CLIENT -DWOLFSSL_NO_CLIENT_AUTH''',
-          'CPPFLAGS=''-DNO_WOLFSSL_SERVER -DWOLFSSL_NO_CLIENT_AUTH''',
-          '--enable-all CPPFLAGS=-DNO_WOLFSSL_CLIENT',
-          '--enable-all CPPFLAGS=-DNO_WOLFSSL_SERVER',
-          '--enable-all CPPFLAGS=-DWOLFSSL_NO_CLIENT_AUTH',
-          '--enable-all CPPFLAGS=''-DNO_WOLFSSL_CLIENT -DWOLFSSL_NO_CLIENT_AUTH''',
-          '--enable-all CPPFLAGS=''-DNO_WOLFSSL_SERVER -DWOLFSSL_NO_CLIENT_AUTH''',
        ]
    name: make check
    if: github.repository_owner == 'wolfssl'
@@ -91,14 +52,14 @@ jobs:
      - name: Build and test wolfSSL
        uses: wolfSSL/actions-build-autotools-project@v1
        with:
-          configure: CFLAGS="-pedantic -Wno-overlength-strings -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE" ${{ matrix.config }}
+          configure: ${{ matrix.config }}
          check: true

  make_user_settings:
    strategy:
      fail-fast: false
      matrix:
-        os: [ ubuntu-24.04, macos-latest ]
+        os: [ ubuntu-22.04, macos-latest ]
        user-settings: [
          # Add new user_settings.h here
          'examples/configs/user_settings_all.h',
@@ -120,26 +81,15 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ ubuntu-24.04, macos-latest ]
+        os: [ ubuntu-22.04, macos-latest ]
        user-settings: [
-          # Add new user_settings.h here (alphabetical order)
-          'examples/configs/user_settings_ca.h',
-          'examples/configs/user_settings_dtls13.h',
-          'examples/configs/user_settings_EBSnet.h',
+          # Add new user_settings.h here
          'examples/configs/user_settings_eccnonblock.h',
          'examples/configs/user_settings_min_ecc.h',
-          'examples/configs/user_settings_openssl_compat.h',
-          'examples/configs/user_settings_pkcs7.h',
-          'examples/configs/user_settings_rsa_only.h',
-          'examples/configs/user_settings_template.h',
-          'examples/configs/user_settings_tls12.h',
-          'examples/configs/user_settings_tls13.h',
          'examples/configs/user_settings_wolfboot_keytools.h',
-          'examples/configs/user_settings_wolfssh.h',
          'examples/configs/user_settings_wolftpm.h',
-          # Not included (require special setup):
-          # - user_settings_pq.h: Requires --enable-experimental
-          # - user_settings_baremetal.h: Requires static memory, custom platform
+          'examples/configs/user_settings_wolfssh.h',
+          'examples/configs/user_settings_tls12.h',
        ]
    name: make user_setting.h (testwolfcrypt only)
    if: github.repository_owner == 'wolfssl'
@@ -162,7 +112,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ ubuntu-24.04, macos-latest ]
+        os: [ ubuntu-22.04, macos-latest ]
    name: make user_setting.h (with sed)
    if: github.repository_owner == 'wolfssl'
    runs-on: ${{ matrix.os }}
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -16,7 +16,7 @@ jobs:
  build_wolfssl:
    name: Package wolfSSL
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 10
    steps:
@@ -45,8 +45,8 @@ jobs:
      - name: Confirm packages built
        run: |
          DEB_COUNT=$(find -name 'libwolfssl*.deb' | wc -l)
-          if [ "$DEB_COUNT" != "3" ]; then
-            echo Did not find exactly three deb packages!!!
+          if [ "$DEB_COUNT" != "2" ]; then
+            echo Did not find exactly two deb packages!!!
            exit 1
          fi
 # disabled 20240919 -- broken target.
--- a/.github/workflows/pam-ipmi.yml
+++ b/.github/workflows/pam-ipmi.yml
@@ -18,7 +18,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -48,7 +48,7 @@ jobs:
        git_ref: [ e4b13e6725abb178f62ee897fe1c0e81b06a9431 ]
    name: ${{ matrix.git_ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    needs: build_wolfssl
    steps:
      - name: Install dependencies
--- a/.github/workflows/pq-all.yml
+++ b/.github/workflows/pq-all.yml
@@ -18,19 +18,11 @@ jobs:
      matrix:
        config: [
          # Add new configs here
-          '--enable-intelasm --enable-sp-asm --enable-mlkem=yes,kyber,ml-kem CPPFLAGS="-DWOLFSSL_ML_KEM_USE_OLD_IDS"',
-          '--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-mlkem=yes,kyber,ml-kem --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-smallstack --enable-smallstackcache --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-mlkem=yes,kyber,ml-kem --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-mlkem=yes,kyber,ml-kem --enable-lms --enable-xmss --enable-dilithium --enable-dual-alg-certs --disable-qt CPPFLAGS="-Wdeclaration-after-statement -DWOLFCRYPT_TEST_LINT -DNO_WOLFSSL_CIPHER_SUITE_TEST -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE" CC=c++',
-          '--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-mlkem=yes,kyber,ml-kem --enable-lms --enable-xmss --enable-dilithium --disable-qt CPPFLAGS="-pedantic -Wdeclaration-after-statement -DWOLFCRYPT_TEST_LINT -DNO_WOLFSSL_CIPHER_SUITE_TEST -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFSSL_BLIND_PRIVATE_KEY"',
-          '--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-mlkem=yes,kyber,ml-kem --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 -DWOLFSSL_BLIND_PRIVATE_KEY"',
-          '--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-mlkem=yes,kyber,ml-kem --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 -DWOLFSSL_TLSX_PQC_MLKEM_STORE_OBJ"',
-          '--disable-intelasm --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-mlkem=yes,kyber,ml-kem,small --enable-lms=yes,small --enable-xmss=yes,small --enable-dilithium=yes,small --enable-dual-alg-certs --disable-qt CPPFLAGS="-pedantic -Wdeclaration-after-statement -DWOLFCRYPT_TEST_LINT -DNO_WOLFSSL_CIPHER_SUITE_TEST -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFSSL_MLKEM_MAKEKEY_SMALL_MEM -DWOLFSSL_MLKEM_ENCAPSULATE_SMALL_MEM -DWOLFSSL_MLKEM_NO_LARGE_CODE -DWOLFSSL_DILITHIUM_SIGN_SMALL_MEM -DWOLFSSL_DILITHIUM_VERIFY_SMALL_MEM -DWOLFSSL_DILITHIUM_MAKE_KEY_SMALL_MEM -DWOLFSSL_DILITHIUM_NO_LARGE_CODE"',
-          '--disable-intelasm --enable-smallstack --enable-smallstackcache --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-mlkem=yes,kyber,ml-kem,small --enable-lms=yes,small --enable-xmss=yes,small --enable-dilithium=yes,small --enable-dual-alg-certs --disable-qt CPPFLAGS="-pedantic -Wdeclaration-after-statement -DWOLFCRYPT_TEST_LINT -DNO_WOLFSSL_CIPHER_SUITE_TEST -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE -DWOLFSSL_MLKEM_MAKEKEY_SMALL_MEM -DWOLFSSL_MLKEM_ENCAPSULATE_SMALL_MEM -DWOLFSSL_MLKEM_NO_LARGE_CODE -DWOLFSSL_DILITHIUM_SIGN_SMALL_MEM -DWOLFSSL_DILITHIUM_VERIFY_SMALL_MEM -DWOLFSSL_DILITHIUM_MAKE_KEY_SMALL_MEM -DWOLFSSL_DILITHIUM_NO_LARGE_CODE"',
+          '--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 -DWOLFCRYPT_TEST_LINT -DNO_WOLFSSL_CIPHER_SUITE_TEST"'
        ]
    name: make check
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 6
    steps:
--- a/.github/workflows/psk.yml
+++ b/.github/workflows/psk.yml
@@ -1,51 +0,0 @@
-name: PSK Tests
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  make_check:
-    strategy:
-      matrix:
-        config: [
-          # Add new configs here
-          '--enable-psk C_EXTRA_FLAGS=-DWOLFSSL_STATIC_PSK --disable-rsa --disable-ecc --disable-dh',
-          '--disable-oldtls --disable-tls13 --enable-psk -disable-rsa --disable-dh -disable-ecc --disable-asn C_EXTRA_FLAGS=-DWOLFSSL_STATIC_PSK --enable-lowresource --enable-singlethreaded --disable-asm --disable-errorstrings --disable-pkcs12 --disable-sha3 --disable-sha224 --disable-sha384 --disable-sha512 --disable-sha --disable-md5 -disable-aescbc --disable-chacha --disable-poly1305 --disable-coding --disable-sp-math-all',
-          '--disable-oldtls --disable-tlsv12 --enable-tls13 --enable-psk -disable-rsa --disable-dh -disable-ecc --disable-asn C_EXTRA_FLAGS=-DWOLFSSL_STATIC_PSK --enable-lowresource --enable-singlethreaded --disable-asm --disable-errorstrings --disable-pkcs12 --disable-sha3 --disable-sha224 --disable-sha384 --disable-sha512 --disable-sha --disable-md5 -disable-aescbc --disable-chacha --disable-poly1305 --disable-coding --disable-sp-math-all'
-        ]
-    name: make check
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 6
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout wolfSSL
-
-      - name: Test wolfSSL
-        run: |
-          ./autogen.sh
-          ./configure ${{ matrix.config }}
-          make -j 4
-          make check
-
-      - name: Print errors
-        if: ${{ failure() }}
-        run: |
-          for file in scripts/*.log
-          do
-              if [ -f "$file" ]; then
-                  echo "${file}:"
-                  cat "$file"
-                  echo "========================================================================"
-              fi
-          done
--- a/.github/workflows/renode-stm32h753.yml
+++ b/.github/workflows/renode-stm32h753.yml
@@ -1,271 +0,0 @@
-name: Renode STM32H753 Test
-
-# Platform-specific configuration
-# To add a new platform, create a new workflow file based on this template
-# and update these variables for the target MCU
-env:
-  PLATFORM_NAME: stm32h753
-  PLATFORM_DISPLAY_NAME: STM32H753
-  CMSIS_DEVICE_REPO: cmsis-device-h7
-  CMSIS_DEVICE_PATH: /opt/cmsis-device-h7
-  CMSIS_DEVICE_CACHE_KEY: cmsis-device-h7-v1
-  STM32CUBE_REPO: STM32CubeH7
-  STM32CUBE_BRANCH: v1.11.2
-  STM32CUBE_PATH: /opt/STM32CubeH7
-  STM32CUBE_CACHE_KEY: stm32cubeh7-v1.11.2-v1
-  HAL_CONFIG_FILE: stm32h7xx_hal_conf.h
-  HAL_DRIVER_INC_PATH: STM32H7xx_HAL_Driver/Inc
-  HAL_DRIVER_SRC_PATH: STM32H7xx_HAL_Driver/Src
-  RENODE_PLATFORM_NAME: stm32h753
-  RENODE_REPL_PATH: platforms/cpus/stm32h753.repl
-  RENODE_TEST_DIR: .github/renode-test/stm32h753
-
-on:
-  push:
-    branches: [ main, master, develop ]
-  pull_request:
-    branches: [ main, master, develop ]
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-
-    steps:
-    - name: Checkout wolfSSL
-      uses: actions/checkout@v4
-
-    - name: Set up build environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends \
-          build-essential \
-          ca-certificates \
-          cmake \
-          ninja-build \
-          python3 \
-          git \
-          gcc-arm-none-eabi \
-          libnewlib-arm-none-eabi \
-          libstdc++-arm-none-eabi-newlib \
-          wget \
-          unzip
-
-    - name: Cache CMSIS Device
-      id: cache-cmsis-device
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.CMSIS_DEVICE_PATH }}
-        key: ${{ env.CMSIS_DEVICE_CACHE_KEY }}
-        restore-keys: |
-          ${{ env.CMSIS_DEVICE_CACHE_KEY }}-
-
-    - name: Cache CMSIS 5
-      id: cache-cmsis-5
-      uses: actions/cache@v4
-      with:
-        path: /opt/CMSIS_5
-        key: cmsis-5-v1
-        restore-keys: |
-          cmsis-5-
-
-    - name: Cache STM32Cube
-      id: cache-stm32cube
-      uses: actions/cache@v4
-      with:
-        path: ${{ env.STM32CUBE_PATH }}
-        key: ${{ env.STM32CUBE_CACHE_KEY }}
-        restore-keys: |
-          ${{ env.STM32CUBE_CACHE_KEY }}-
-
-    - name: Cache Renode
-      id: cache-renode
-      uses: actions/cache@v4
-      with:
-        path: /opt/renode
-        key: renode-1.15.3-v1
-        restore-keys: |
-          renode-1.15.3-
-
-    - name: Install Renode dependencies
-      run: |
-        # Install Mono and other dependencies needed for Renode (always needed, even when cached)
-        sudo apt-get install -y --no-install-recommends \
-          mono-runtime \
-          libmono-cil-dev \
-          screen \
-          policykit-1 || true
-
-    - name: Install Renode (if not cached)
-      if: steps.cache-renode.outputs.cache-hit != 'true'
-      run: |
-        # Install Renode by extracting .deb (avoids GUI dependency issues for headless use)
-        cd /tmp
-        wget -q https://github.com/renode/renode/releases/download/v1.15.3/renode_1.15.3_amd64.deb
-        # Extract the .deb file
-        dpkg-deb -x renode_1.15.3_amd64.deb /tmp/renode-extract
-        # Copy Renode files to system locations
-        sudo mkdir -p /opt/renode
-        sudo cp -r /tmp/renode-extract/opt/renode/* /opt/renode/ || true
-        sudo cp -r /tmp/renode-extract/usr/* /usr/ || true
-        # Create symlink for easy access
-        if [ -f /opt/renode/renode ]; then
-          sudo ln -sf /opt/renode/renode /usr/local/bin/renode
-        elif [ -f /usr/bin/renode ]; then
-          echo "Renode already in PATH at /usr/bin/renode"
-        fi
-        # Cleanup
-        rm -rf /tmp/renode-extract renode_1.15.3_amd64.deb
-
-    - name: Setup Renode symlinks and permissions
-      run: |
-        # When Renode is cached, we need to recreate /usr/bin/renode wrapper script
-        # The /usr/bin/renode is a wrapper that checks Mono and calls /opt/renode/bin/Renode.exe
-        if [ -d /opt/renode ] && [ ! -x /usr/bin/renode ]; then
-          echo "Renode cached but /usr/bin/renode wrapper missing, recreating..."
-          # Create the wrapper script
-          sudo bash -c 'cat > /usr/bin/renode << '\''SCRIPT_EOF'\''
-        #!/bin/sh
-        MONOVERSION=5.20
-        REQUIRED_MAJOR=5
-        REQUIRED_MINOR=20
-
-        LAUNCHER=mono
-
-        if ! [ -x "$(command -v $LAUNCHER)" ]
-        then
-            echo "$LAUNCHER not found. Renode requires Mono $MONOVERSION or newer. Please refer to documentation for installation instructions. Exiting!"
-            exit 1
-        fi
-
-        # Check installed mono version
-        INSTALLED_MONO=`$LAUNCHER --version | head -n1 | cut -d'\'' '\'' -f5`
-        INSTALLED_MONO_MAJOR=`echo $INSTALLED_MONO | cut -d'\''.'\'' -f1`
-        INSTALLED_MONO_MINOR=`echo $INSTALLED_MONO | cut -d'\''.'\'' -f2`
-
-        if [ $INSTALLED_MONO_MAJOR -lt $REQUIRED_MAJOR ] || [ $INSTALLED_MONO_MAJOR -eq $REQUIRED_MAJOR -a $INSTALLED_MONO_MINOR -lt $REQUIRED_MINOR ]
-        then
-            echo "Wrong Mono version detected: $INSTALLED_MONO. Renode requires Mono $MONOVERSION or newer. Please refer to documentation for installation instructions. Exiting!"
-            exit 1
-        fi
-
-        exec $LAUNCHER $MONO_OPTIONS /opt/renode/bin/Renode.exe "$@"
-        SCRIPT_EOF'
-          sudo chmod +x /usr/bin/renode
-          echo "Created /usr/bin/renode wrapper script"
-        fi
-
-        # Also ensure /usr/local/bin/renode symlink exists
-        if [ -x /usr/bin/renode ] && [ ! -x /usr/local/bin/renode ]; then
-          sudo ln -sf /usr/bin/renode /usr/local/bin/renode
-          echo "Created symlink: /usr/local/bin/renode -> /usr/bin/renode"
-        fi
-
-    - name: Verify Renode installation
-      run: |
-        # Verify Renode is installed and accessible
-        RENODE_FOUND=false
-        RENODE_BIN=""
-
-        # Check various possible locations
-        for path in /opt/renode/renode /opt/renode/bin/renode /usr/local/bin/renode /usr/bin/renode; do
-          if [ -x "$path" ]; then
-            echo "Renode found at $path"
-            "$path" --version || true
-            RENODE_BIN="$path"
-            RENODE_FOUND=true
-            break
-          fi
-        done
-
-        if [ "$RENODE_FOUND" != "true" ]; then
-          echo "ERROR: Renode binary not found or not executable!"
-          echo "Searching for renode..."
-          find /opt /usr -name renode -type f 2>/dev/null | head -10 || true
-          echo "Checking /opt/renode contents:"
-          ls -la /opt/renode/ 2>/dev/null | head -10 || true
-          if [ -d /opt/renode ]; then
-            echo "Checking /opt/renode subdirectories:"
-            find /opt/renode -type f -name "*renode*" 2>/dev/null | head -10 || true
-          fi
-          exit 1
-        fi
-
-
-    - name: Clone CMSIS Device (if not cached)
-      if: steps.cache-cmsis-device.outputs.cache-hit != 'true'
-      run: |
-        sudo mkdir -p /opt
-        sudo git clone --depth 1 https://github.com/STMicroelectronics/${{ env.CMSIS_DEVICE_REPO }}.git ${{ env.CMSIS_DEVICE_PATH }}
-
-    - name: Clone CMSIS 5 (if not cached)
-      if: steps.cache-cmsis-5.outputs.cache-hit != 'true'
-      run: |
-        sudo mkdir -p /opt
-        sudo git clone --depth 1 https://github.com/ARM-software/CMSIS_5.git /opt/CMSIS_5
-
-    - name: Clone STM32Cube (if not cached)
-      if: steps.cache-stm32cube.outputs.cache-hit != 'true'
-      run: |
-        sudo mkdir -p /opt
-        sudo git clone --depth 1 --branch ${{ env.STM32CUBE_BRANCH }} --recurse-submodules https://github.com/STMicroelectronics/${{ env.STM32CUBE_REPO }}.git ${{ env.STM32CUBE_PATH }} || \
-          (sudo git clone --depth 1 --branch ${{ env.STM32CUBE_BRANCH }} https://github.com/STMicroelectronics/${{ env.STM32CUBE_REPO }}.git ${{ env.STM32CUBE_PATH }} && \
-           cd ${{ env.STM32CUBE_PATH }} && sudo git submodule update --init --recursive --depth 1)
-
-    - name: Setup firmware build directory and helper files
-      run: |
-        sudo mkdir -p /opt/firmware
-        # Copy helper files from repository
-        sudo cp -r ${{ github.workspace }}/${{ env.RENODE_TEST_DIR }}/* /opt/firmware/
-        # Copy HAL config to STM32Cube directory
-        sudo cp /opt/firmware/${{ env.HAL_CONFIG_FILE }} ${{ env.STM32CUBE_PATH }}/Drivers/${{ env.HAL_DRIVER_INC_PATH }}/ 2>/dev/null || true
-        sudo chmod +x /opt/firmware/entrypoint.sh
-        # Create .renode-root file so Renode can find platform files
-        # Try to find Renode installation directory and create .renode-root with proper permissions
-        if [ -d "/opt/renode/platforms" ]; then
-          echo "/opt/renode" | sudo tee /opt/firmware/.renode-root > /dev/null
-          sudo chmod 644 /opt/firmware/.renode-root
-        elif [ -d "/usr/lib/renode/platforms" ]; then
-          echo "/usr/lib/renode" | sudo tee /opt/firmware/.renode-root > /dev/null
-          sudo chmod 644 /opt/firmware/.renode-root
-        elif [ -d "/usr/share/renode/platforms" ]; then
-          echo "/usr/share/renode" | sudo tee /opt/firmware/.renode-root > /dev/null
-          sudo chmod 644 /opt/firmware/.renode-root
-        fi
-
-    - name: Build wolfSSL firmware (NOT CACHED - rebuilds on every run)
-      env:
-        WOLFSSL_ROOT: /opt/wolfssl
-      run: |
-        # Copy wolfSSL source (this is NOT cached - fresh checkout each time)
-        sudo cp -r ${{ github.workspace }} /opt/wolfssl
-        # Build with CMake
-        cd /opt/firmware
-        sudo cmake -G Ninja \
-          -DWOLFSSL_USER_SETTINGS=ON \
-          -DUSER_SETTINGS_FILE=/opt/firmware/user_settings.h \
-          -DCMAKE_TOOLCHAIN_FILE=/opt/firmware/toolchain-arm-none-eabi.cmake \
-          -DCMAKE_BUILD_TYPE=Release \
-          -DWOLFSSL_CRYPT_TESTS=OFF \
-          -DWOLFSSL_EXAMPLES=OFF \
-          -B /opt/firmware/build \
-          -S /opt/firmware
-        sudo cmake --build /opt/firmware/build
-        # Verify ELF file was created and copy it to expected location
-        if [ -f "/opt/firmware/build/wolfcrypt_test.elf" ]; then
-          sudo cp /opt/firmware/build/wolfcrypt_test.elf /opt/firmware/wolfcrypt_test.elf
-          echo "ELF file copied to /opt/firmware/wolfcrypt_test.elf"
-          ls -lh /opt/firmware/wolfcrypt_test.elf
-        else
-          echo "ERROR: ELF file not found at /opt/firmware/build/wolfcrypt_test.elf"
-          echo "Searching for ELF files..."
-          find /opt/firmware/build -name "*.elf" 2>/dev/null || true
-          exit 1
-        fi
-
-    - name: Run Renode test
-      run: |
-        # Ensure PATH includes standard binary locations for sudo
-        sudo env PATH="$PATH" /opt/firmware/entrypoint.sh
-
--- a/.github/workflows/rng-tools.yml
+++ b/.github/workflows/rng-tools.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -47,7 +47,7 @@ jobs:
        ref: [ 6.16 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    needs: build_wolfssl
@@ -101,7 +101,7 @@ jobs:
          # Retry up to five times
          for i in {1..5}; do
            TEST_RES=0
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/build-dir/lib RNGD_JITTER_TIMEOUT=100 make check || TEST_RES=$?
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/build-dir/lib make check || TEST_RES=$?
            if [ "$TEST_RES" -eq "0" ]; then
               break
            fi
--- a/.github/workflows/rust-wrapper.yml
+++ b/.github/workflows/rust-wrapper.yml
@@ -1,74 +0,0 @@
-name: Build Rust Wrapper
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  build_wolfssl:
-    name: Build wolfSSL Rust Wrapper
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ${{ matrix.os }}
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 10
-    steps:
-    - name: Build wolfSSL
-      uses: wolfSSL/actions-build-autotools-project@v1
-      with:
-        path: wolfssl
-        configure: ${{ matrix.config }}
-    - name: Build Rust Wrapper
-      working-directory: wolfssl
-      run: make -C wrapper/rust
-    - name: Run Rust Wrapper Tests
-      working-directory: wolfssl
-      run: make -C wrapper/rust test
-    strategy:
-      matrix:
-        os: [ ubuntu-24.04, ubuntu-24.04-arm ]
-        config: [
-          # Add new configs here
-          '',
-          '--enable-all',
-          '--enable-cryptonly --disable-examples',
-          '--enable-cryptonly --disable-examples --disable-aes --disable-aesgcm',
-          '--enable-cryptonly --disable-examples --disable-aescbc',
-          '--enable-cryptonly --disable-examples --disable-aeseax',
-          '--enable-cryptonly --disable-examples --disable-aesecb',
-          '--enable-cryptonly --disable-examples --disable-aesccm',
-          '--enable-cryptonly --disable-examples --disable-aescfb',
-          '--enable-cryptonly --disable-examples --disable-aesctr',
-          '--enable-cryptonly --disable-examples --disable-aescts',
-          '--enable-cryptonly --disable-examples --disable-aesgcm',
-          '--enable-cryptonly --disable-examples --disable-aesgcm-stream',
-          '--enable-cryptonly --disable-examples --disable-aesofb',
-          '--enable-cryptonly --disable-examples --disable-aesxts',
-          '--enable-cryptonly --disable-examples --disable-cmac',
-          '--enable-cryptonly --disable-examples --disable-dh',
-          '--enable-cryptonly --disable-examples --disable-ecc',
-          '--enable-cryptonly --disable-examples --disable-ed25519',
-          '--enable-cryptonly --disable-examples --disable-ed25519-stream',
-          '--enable-cryptonly --disable-examples --disable-ed448',
-          '--enable-cryptonly --disable-examples --disable-ed448-stream',
-          '--enable-cryptonly --disable-examples --disable-hkdf',
-          '--enable-cryptonly --disable-examples --disable-hmac',
-          '--enable-cryptonly --disable-examples --disable-rng',
-          '--enable-cryptonly --disable-examples --disable-rsa',
-          '--enable-cryptonly --disable-examples --disable-rsapss',
-          '--enable-cryptonly --disable-examples --disable-sha224',
-          '--enable-cryptonly --disable-examples --disable-sha3',
-          '--enable-cryptonly --disable-examples --disable-sha384',
-          '--enable-cryptonly --disable-examples --disable-sha512',
-          '--enable-cryptonly --disable-examples --disable-shake128',
-          '--enable-cryptonly --disable-examples --disable-shake256',
-          '--enable-cryptonly --disable-examples --disable-srtp-kdf',
-          '--enable-cryptonly --disable-examples --disable-x963kdf',
-        ]
--- a/.github/workflows/smallStackSize.yml
+++ b/.github/workflows/smallStackSize.yml
@@ -1,53 +0,0 @@
-name: Stack Size warnings
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  build_library:
-    strategy:
-      matrix:
-        config: [
-          # defaults, noasm
-          '--disable-asm',
-
-          # defaults + native PQ, no asm
-          '--disable-asm --enable-experimental --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium',
-
-          # all-crypto + native PQ, no asm
-          '--disable-asm --enable-all-crypto --enable-experimental --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium',
-
-          # defaults, intelasm + sp-asm
-          '--enable-intelasm --enable-sp-asm',
-
-          # defaults + native PQ, intelasm + sp-asm
-          '--enable-intelasm --enable-sp-asm --enable-experimental --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium',
-
-          # all-crypto + native PQ, intelasm + sp-asm
-          '--enable-intelasm --enable-sp-asm --enable-all-crypto --enable-experimental --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium'
-        ]
-    name: build library
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 6
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout wolfSSL
-
-      - name: Build wolfCrypt with smallstack and stack depth warnings, and run testwolfcrypt
-        run: |
-          ./autogen.sh || $(exit 2)
-          echo "running ./configure ... ${{ matrix.config }}"
-          ./configure --enable-cryptonly --disable-cryptocb --disable-testcert --enable-smallstack --enable-smallstackcache --enable-crypttests --disable-benchmark --disable-examples --with-max-rsa-bits=16384 --enable-stacksize=verbose CFLAGS="-Wframe-larger-than=2048 -Wstack-usage=4096 -DWOLFSSL_TEST_MAX_RELATIVE_STACK_BYTES=8192 -DTEST_ALWAYS_RUN_TO_END" ${{ matrix.config }} || $(exit 3)
-          make -j 4 || $(exit 4)
-          ./wolfcrypt/test/testwolfcrypt
--- a/.github/workflows/socat.yml
+++ b/.github/workflows/socat.yml
@@ -16,7 +16,7 @@ jobs:
  build_wolfssl:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    timeout-minutes: 4
    steps:
      - name: Build wolfSSL
@@ -39,7 +39,7 @@ jobs:

  socat_check:
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 30
    needs: build_wolfssl
--- a/.github/workflows/softhsm.yml
+++ b/.github/workflows/softhsm.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 10
    steps:
@@ -47,7 +47,7 @@ jobs:
        ref: [ 2.6.1 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 20
    needs: build_wolfssl
--- a/.github/workflows/sssd.yml
+++ b/.github/workflows/sssd.yml
@@ -17,7 +17,7 @@ jobs:
    if: github.repository_owner == 'wolfssl'
    name: Build wolfSSL
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -40,14 +40,14 @@ jobs:
          retention-days: 5

  sssd_check:
+    if: github.repository_owner == 'wolfssl'
    strategy:
      fail-fast: false
      matrix:
        # List of releases to test
        ref: [ 2.9.1 ]
    name: ${{ matrix.ref }}
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    container:
      image: quay.io/sssd/ci-client-devel:ubuntu-latest
      env:
--- a/.github/workflows/stunnel.yml
+++ b/.github/workflows/stunnel.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build wolfSSL
    if: github.repository_owner == 'wolfssl'
    # Just to keep it the same as the testing target
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    steps:
@@ -46,7 +46,7 @@ jobs:
        ref: [ 5.67 ]
    name: ${{ matrix.ref }}
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 4
    needs: build_wolfssl
--- a/.github/workflows/symbol-prefixes.yml
+++ b/.github/workflows/symbol-prefixes.yml
@@ -1,70 +0,0 @@
-name: WOLFSSL_API_PREFIX_MAP
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  make_and_analyze:
-    strategy:
-      matrix:
-        config: [
-          '--enable-all --enable-mlkem --enable-mldsa --enable-xmss --enable-lms --enable-acert --with-sys-crypto-policy CFLAGS=-DWOLFSSL_API_PREFIX_MAP'
-        ]
-    name: make and analyze
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 6
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout wolfSSL
-
-      - name: Test --enable-opensslcoexist and TEST_OPENSSL_COEXIST
-        run: |
-          ./autogen.sh || $(exit 2)
-          ./configure ${{ matrix.config }} || $(exit 3)
-          make -j 4 || $(exit 4)
-          # ignore properly prefixed symbols, and symbols associated with asm implementations (all internal) regardless of prefix:
-          readelf --symbols --wide src/.libs/libwolfssl.so | \
-          awk '
-          BEGIN {
-              total_public_symbols = 0;
-              unprefixed_public_symbols = 0;
-          }
-          {
-              if (($5 == "GLOBAL") && ($6 != "HIDDEN") && ($7 ~ /^[0-9]+$/)) {
-                  ++total_public_symbols;
-              }
-          }
-          {
-              if (($7 !~ /^[0-9]+$/) ||
-                  ($8 ~ /^(wc_|wolf|WOLF|__pfx|fe_|sp_[a-zA-Z090-0_]*[0-9])/) ||
-                  ($8 ~ /(_avx[12]|_AVX[12]|_sse[12]|_SSE[12]|_aesni|_AESNI|_bmi2|_x64$)/))
-              {
-                  next;
-              }
-          }
-          {
-              if (($4 == "FUNC") && ($5 == "GLOBAL") && ($6 == "DEFAULT")) {
-                  ++unprefixed_public_symbols;
-                  print;
-              }
-          }
-          END {
-              if (unprefixed_public_symbols) {
-                  print unprefixed_public_symbols " unprefixed public symbols found, of " total_public_symbols " total." >"/dev/stderr";
-                  exit(1);
-              } else {
-                  print total_public_symbols " public symbols found in libwolfssl, all OK.";
-                  exit(0);
-              }
-          }' || $(exit 5)
--- a/.github/workflows/threadx.yml
+++ b/.github/workflows/threadx.yml
@@ -1,57 +0,0 @@
-name: ThreadXBuild Test
-
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-24.04
-    timeout-minutes: 10
-
-    steps:
-    - name: Cache NetXDuo bundle
-      id: cache-netxduo
-      uses: actions/cache@v3
-      with:
-        path: ./v6.4.3_rel.tar.gz
-        key: netxduo-bundle-v6.4.3_rel
-
-    - name: Download NetXDuo bundle if not cached
-      if: steps.cache-netxduo.outputs.cache-hit != 'true'
-      run: |
-        wget https://github.com/eclipse-threadx/netxduo/archive/refs/tags/v6.4.3_rel.tar.gz
-
-    - name: Extract NetXDuo bundle
-      run: |
-        mkdir -p netxduo_src
-        tar -xzf v6.4.3_rel.tar.gz -C netxduo_src --strip-components=1
-
-    - name: Install NetXDuo Dependencies
-      working-directory: ./netxduo_src
-      run: |
-        ./scripts/install.sh
-
-    - name: Configure NetX with DNS Client Support
-      working-directory: ./netxduo_src
-      run: |
-        cp addons/dns/nxd_dns.h ./common/inc/
-        cp addons/dns/nxd_dns.c ./common/src/
-
-    - name: Build NetXDuo with DNS Support
-      working-directory: ./netxduo_src
-      run: |
-        rm -rf test/cmake/threadx
-        rm -rf test/cmake/filex
-        ./scripts/build_nxd64.sh
-
-    - name: Build wolfSSL
-      uses: wolfSSL/actions-build-autotools-project@v1
-      with:
-        path: wolfssl
-        configure: --enable-enckeys --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-DTHREADX -DHAVE_NETX -DWOLFSSL_USER_IO -I${{ github.workspace }}/netxduo_src/common/inc -I${{ github.workspace }}/netxduo_src/ports/linux/gnu/inc -I${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/inc" LDFLAGS="-L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/default_build_coverage/netxduo -L${{ github.workspace }}/netxduo_src/test/cmake/netxduo64/build/libs/threadx"  LIBS="-lnetxduo -lthreadx"
-        install: false
-
--- a/.github/workflows/trackmemory.yml
+++ b/.github/workflows/trackmemory.yml
@@ -1,60 +0,0 @@
-name: WOLFSSL_TRACK_MEMORY Tests
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  make_check:
-    strategy:
-      matrix:
-        config: [
-          # Add new configs here
-          '--enable-all CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"',
-          '--enable-smallstack --enable-all CFLAGS="-DWC_RNG_SEED_CB  -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"',
-          '--enable-smallstackcache --enable-smallstack --enable-all CFLAGS="-DWC_RNG_SEED_CB  -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"',
-# Note the below smallstackcache tests are crucial coverage for the Linux kernel
-# module, when targeting a kernel with the randomness patch (linuxkm/patches/)
-# applied.
-#
-# Note, don't combine wolfEntropy with the full TLS cipher suite test -- the implicit wc_InitRng()s in each suite have an enormous CPU footprint.
-          '--enable-wolfEntropy --enable-smallstackcache --enable-smallstack --enable-all CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY -DNO_WOLFSSL_CIPHER_SUITE_TEST"',
-          '--enable-intelrdseed --enable-smallstackcache --enable-smallstack --enable-all CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY -DNO_WOLFSSL_CIPHER_SUITE_TEST"',
-          '--enable-amdrand --enable-smallstackcache --enable-smallstack --enable-all CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY -DNO_WOLFSSL_CIPHER_SUITE_TEST"',
-          '--disable-asm --enable-wolfEntropy --enable-smallstackcache --enable-smallstack --enable-all CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY -DNO_WOLFSSL_CIPHER_SUITE_TEST"'
-        ]
-    name: make check
-    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-latest
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 6
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout wolfSSL
-
-      - name: Test wolfSSL
-        run: |
-          ./autogen.sh
-          ./configure ${{ matrix.config }}
-          make -j 4
-          make check
-
-      - name: Print errors
-        if: ${{ failure() }}
-        run: |
-          for file in scripts/*.log
-          do
-              if [ -f "$file" ]; then
-                  echo "${file}:"
-                  cat "$file"
-                  echo "========================================================================"
-              fi
-          done
--- a/.github/workflows/watcomc.yml
+++ b/.github/workflows/watcomc.yml
@@ -62,10 +62,6 @@ jobs:
        uses: open-watcom/setup-watcom@v0
        with:
          version: ${{ matrix.platform.owimage }}
-          # Currently fixed to a monthly build because of historical instability with daily releases.
-          # See https://github.com/wolfSSL/wolfssl/pull/9167
-          # Pin to monthly release as needed:
-          tag: 2025-11-03-Build

      - name: Checkout wolfSSL
        uses: actions/checkout@v4
--- a/.github/workflows/wolfCrypt-Wconversion.yml
+++ b/.github/workflows/wolfCrypt-Wconversion.yml
@@ -22,24 +22,17 @@ jobs:
          '--enable-intelasm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"',
          '--enable-smallstack --disable-asm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"',
          '--enable-smallstack --enable-intelasm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"',
-          '--enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion -DNO_INT128"',
-          '--enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wdeclaration-after-statement -Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion" --enable-32bit CFLAGS=-m32'
+          '--enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion -DNO_INT128"'
        ]
    name: build library
    if: github.repository_owner == 'wolfssl'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    # This should be a safe limit for the tests to run.
    timeout-minutes: 6
    steps:
      - uses: actions/checkout@v4
        name: Checkout wolfSSL

-      - name: install_multilib
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update
-          sudo apt-get install -y gcc-multilib
-
      - name: Build wolfCrypt with extra type conversion warnings
        run: |
          ./autogen.sh || $(exit 2)
--- a/.github/workflows/xcode.yml
+++ b/.github/workflows/xcode.yml
@@ -1,89 +0,0 @@
-name: Xcode Build Tests
-
-# START OF COMMON SECTION
-on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-# END OF COMMON SECTION
-
-jobs:
-  build:
-    if: github.repository_owner == 'wolfssl'
-    runs-on: macos-latest
-    # This should be a safe limit for the tests to run.
-    timeout-minutes: 10
-    strategy:
-      matrix:
-        include:
-          # macOS builds
-          - target: wolfssl_osx
-            arch: arm64
-            config: Release
-            sdk: macosx
-            name: macOS (ARM64, Release)
-          - target: wolfssl_osx
-            arch: x86_64
-            config: Release
-            sdk: macosx
-            name: macOS (x86_64, Release)
-          - target: wolfssl_osx
-            arch: arm64
-            config: Debug
-            sdk: macosx
-            name: macOS (ARM64, Debug)
-          - target: wolfssl_osx
-            arch: x86_64
-            config: Debug
-            sdk: macosx
-            name: macOS (x86_64, Debug)
-          # Universal build (both architectures)
-          - target: wolfssl_osx
-            arch: arm64
-            arch2: x86_64
-            config: Release
-            sdk: macosx
-            name: macOS (Universal, Release)
-            universal: true
-          # tvOS builds
-          - target: wolfssl_tvos
-            arch: arm64
-            config: Release
-            sdk: appletvos
-            name: tvOS (ARM64, Release)
-          - target: wolfssl_tvos
-            arch: arm64
-            config: Release
-            sdk: appletvsimulator
-            name: tvOS Simulator (ARM64, Release)
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build wolfSSL with Xcode (${{ matrix.name }})
-        working-directory: ./IDE/XCODE
-        run: |
-          if [ "${{ matrix.universal }}" == "true" ]; then
-            xcodebuild -project wolfssl.xcodeproj \
-                       -target ${{ matrix.target }} \
-                       -configuration ${{ matrix.config }} \
-                       -arch ${{ matrix.arch }} \
-                       -arch ${{ matrix.arch2 }} \
-                       -sdk ${{ matrix.sdk }} \
-                       SYMROOT=build \
-                       OBJROOT=build \
-                       build
-          else
-            xcodebuild -project wolfssl.xcodeproj \
-                       -target ${{ matrix.target }} \
-                       -configuration ${{ matrix.config }} \
-                       -arch ${{ matrix.arch }} \
-                       -sdk ${{ matrix.sdk }} \
-                       SYMROOT=build \
-                       OBJROOT=build \
-                       build
-          fi
--- a/.github/workflows/zephyr.yml
+++ b/.github/workflows/zephyr.yml
@@ -42,18 +42,13 @@ jobs:
            make gcc gcc-multilib g++-multilib libsdl2-dev libmagic1 \
            autoconf automake bison build-essential ca-certificates cargo ccache chrpath cmake \
            cpio device-tree-compiler dfu-util diffstat dos2unix doxygen file flex g++ gawk gcc \
-            gcovr git git-core gnupg gperf gtk-sharp3 help2man iproute2 lcov libcairo2-dev \
+            gcovr git git-core gnupg gperf gtk-sharp2 help2man iproute2 lcov libcairo2-dev \
            libglib2.0-dev libgtk2.0-0 liblocale-gettext-perl libncurses5-dev libpcap-dev \
            libpopt0 libsdl1.2-dev libsdl2-dev libssl-dev libtool libtool-bin locales make \
            net-tools ninja-build openssh-client parallel pkg-config python3-dev python3-pip \
            python3-ply python3-setuptools python-is-python3 qemu-kvm rsync socat srecord sudo \
            texinfo unzip wget ovmf xz-utils

-      - name: Setup cmake version
-        uses: jwlawson/actions-setup-cmake@v2
-        with:
-          cmake-version: '3.25.x'
-
      - name: Install west
        run: sudo pip install west

--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ ctaocrypt/src/src/
 *.lo
 *.la
 *.o
+*.patch
 *.deps
 *.d
 *.libs
@@ -33,7 +34,7 @@ aclocal.m4
 aminclude.am
 lt*.m4
 Makefile.in
-/Makefile
+Makefile
 depcomp
 missing
 libtool
@@ -50,6 +51,16 @@ wolfcrypt_first.c
 wolfcrypt_last.c
 selftest.c
 fipsv2.c
+src/async.c
+wolfssl/async.h
+wolfcrypt/src/async.c
+wolfssl/wolfcrypt/async.h
+wolfcrypt/src/port/intel/quickassist.c
+wolfcrypt/src/port/intel/quickassist_mem.c
+wolfcrypt/src/port/cavium/cavium_nitrox.c
+wolfssl/wolfcrypt/port/intel/quickassist.h
+wolfssl/wolfcrypt/port/intel/quickassist_mem.h
+wolfssl/wolfcrypt/port/cavium/cavium_nitrox.h
 ctaocrypt/benchmark/benchmark
 ctaocrypt/test/testctaocrypt
 wolfcrypt/benchmark/benchmark
@@ -235,16 +246,7 @@ linuxkm/libwolfssl.mod.c
 linuxkm/libwolfssl.lds
 linuxkm/module_exports.c
 linuxkm/linuxkm/get_thread_size
-linuxkm/linuxkm
-linuxkm/src
-linuxkm/patches/src
 *.nds
-bsdkm/export_syms
-bsdkm/i386
-bsdkm/libwolfssl.ko
-bsdkm/machine
-bsdkm/opt_global.h
-bsdkm/x86

 # autotools generated
 scripts/unit.test
@@ -445,7 +447,6 @@ MagicCrypto
 # debian packaging
 debian/changelog
 debian/control
-debian/rules
 *.deb

 # Ada/Alire files
@@ -454,9 +455,6 @@ wrapper/Ada/config/
 wrapper/Ada/lib/
 wrapper/Ada/obj/

-# Rust wrapper files
-/wrapper/rust/*/target/
-
 # PlatformIO
 /**/.pio
 /**/.vscode/.browse.c_cpp.db*
@@ -468,5 +466,3 @@ wrapper/Ada/obj/
 # Autogenerated debug trace headers
 wolfssl/debug-trace-error-codes.h
 wolfssl/debug-untrace-error-codes.h
-
-AGENTS.md
--- a/.wolfssl_known_macro_extras
+++ b/.wolfssl_known_macro_extras
@@ -2,7 +2,6 @@ AES_GCM_GMULT_NCT
 AFX_RESOURCE_DLL
 AFX_TARG_ENU
 ALLOW_BINARY_MISMATCH_INTROSPECTION
-ALLOW_SELFSIGNED_INVALID_CERTSIGN
 ALLOW_V1_EXTENSIONS
 ANDROID
 APP_ESP_HTTP_CLIENT
@@ -10,22 +9,9 @@ APP_ESP_HTTP_CLIENT_EXAMPLE
 APSTUDIO_INVOKED
 ARCH_sim
 ARDUINO
-ARDUINO_ARCH_ESP32
-ARDUINO_ARCH_ESP8266
-ARDUINO_ARCH_MBED
-ARDUINO_ARCH_NRF52
 ARDUINO_ARCH_RP2040
-ARDUINO_ARCH_SAMD
-ARDUINO_ARCH_STM32
-ARDUINO_AVR_ETHERNET
-ARDUINO_AVR_LEONARDO_ETH
-ARDUINO_SAMD_MKR1000
 ARDUINO_SAMD_NANO_33_IOT
-ARDUINO_SAMD_ZERO
 ARDUINO_SAM_DUE
-ARDUINO_SEEED_XIAO
-ARDUINO_TEENSY40
-ARDUINO_TEENSY41
 ASN_DUMP_OID
 ASN_TEMPLATE_SKIP_ISCA_CHECK
 ATCAPRINTF
@@ -35,7 +21,6 @@ BASE64_NO_TABLE
 BLAKE2B_SELFTEST
 BLAKE2S_SELFTEST
 BLOCKING
-BSDKM_EXPORT_SYMS
 BSP_DEFAULT_IO_CHANNEL_DEFINED
 BSP_LED_0
 BSP_LED_1
@@ -52,7 +37,6 @@ CONFIG_ARCH_CHIP_STM32F746ZG
 CONFIG_ARCH_CHIP_STM32H743ZI
 CONFIG_ARCH_CHIP_STM32L552ZE
 CONFIG_ARCH_POSIX
-CONFIG_ARCH_TEGRA
 CONFIG_ARM
 CONFIG_ARM64
 CONFIG_BOARD_NATIVE_POSIX
@@ -60,26 +44,8 @@ CONFIG_COMPILER_OPTIMIZATION_DEFAULT
 CONFIG_COMPILER_OPTIMIZATION_NONE
 CONFIG_COMPILER_OPTIMIZATION_PERF
 CONFIG_COMPILER_OPTIMIZATION_SIZE
-CONFIG_CRYPTO_AES
-CONFIG_CRYPTO_CBC
-CONFIG_CRYPTO_CTR
-CONFIG_CRYPTO_DH
-CONFIG_CRYPTO_DH_RFC7919_GROUPS
-CONFIG_CRYPTO_DRBG
-CONFIG_CRYPTO_ECB
-CONFIG_CRYPTO_ECDH
-CONFIG_CRYPTO_ECDSA
 CONFIG_CRYPTO_FIPS
-CONFIG_CRYPTO_GCM
-CONFIG_CRYPTO_HMAC
 CONFIG_CRYPTO_MANAGER
-CONFIG_CRYPTO_RSA
-CONFIG_CRYPTO_SELFTESTS_FULL
-CONFIG_CRYPTO_SHA1
-CONFIG_CRYPTO_SHA256
-CONFIG_CRYPTO_SHA3
-CONFIG_CRYPTO_SHA512
-CONFIG_CRYPTO_XTS
 CONFIG_CSPRNG_ENABLED
 CONFIG_ESP32C2_DEFAULT_CPU_FREQ_MHZ
 CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ
@@ -105,10 +71,8 @@ CONFIG_ESP_WOLFSSL_NO_HW_RSA_PRI
 CONFIG_ESP_WOLFSSL_NO_HW_RSA_PRI_EXPTMOD
 CONFIG_ESP_WOLFSSL_NO_HW_RSA_PRI_MP_MUL
 CONFIG_ESP_WOLFSSL_NO_HW_RSA_PRI_MULMOD
-CONFIG_ESP_WOLFSSL_NO_STACK_SIZE_BUILD_WARNING
 CONFIG_FREERTOS_HZ
 CONFIG_FREERTOS_UNICORE
-CONFIG_HAVE_KPROBES
 CONFIG_IDF_TARGET
 CONFIG_IDF_TARGET_ARCH_RISCV
 CONFIG_IDF_TARGET_ARCH_XTENSA
@@ -117,13 +81,10 @@ CONFIG_IDF_TARGET_ESP32C2
 CONFIG_IDF_TARGET_ESP32C3
 CONFIG_IDF_TARGET_ESP32C6
 CONFIG_IDF_TARGET_ESP32H2
-CONFIG_IDF_TARGET_ESP32P4
 CONFIG_IDF_TARGET_ESP32S2
 CONFIG_IDF_TARGET_ESP32S3
 CONFIG_IDF_TARGET_ESP8266
 CONFIG_IDF_TARGET_ESP8684
-CONFIG_KASAN
-CONFIG_KPROBES
 CONFIG_MAIN_TASK_STACK_SIZE
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
 CONFIG_MBEDTLS_PSA_CRYPTO_C
@@ -136,9 +97,7 @@ CONFIG_PICOLIBC
 CONFIG_POSIX_API
 CONFIG_POSIX_THREADS
 CONFIG_PREEMPT_COUNT
-CONFIG_PREEMPT_RT
 CONFIG_PTHREAD_IPC
-CONFIG_SCHED_INFO
 CONFIG_SMP
 CONFIG_SNTP_TIME_SYNC_METHOD_SMOOTH
 CONFIG_TIMER_TASK_STACK_DEPTH
@@ -184,7 +143,6 @@ CONFIG_WOLFTPM_EXAMPLE_NAME_ESPRESSIF
 CONFIG_X86
 CONV_WITH_DIV
 CPA_CY_API_VERSION_NUM_MAJOR
-CPA_CY_API_VERSION_NUM_MINOR
 CPU_MIMXRT1176DVMAA_cm7
 CPU_MK82FN256VLL15
 CRLDP_VALIDATE_DATA
@@ -197,7 +155,6 @@ CRYP_KEYSIZE_192B
 CSM_UNSUPPORTED_ALGS
 CTYPE_USER
 CURVED448_SMALL
-CUSTOM_ENTROPY_TIMEHIRES
 CY_USING_HAL
 DCP_USE_DCACHE
 DILITHIUM_MUL_11_SLOW
@@ -206,10 +163,6 @@ DILITHIUM_MUL_QINV_SLOW
 DILITHIUM_MUL_Q_SLOW
 DILITHIUM_MUL_SLOW
 DILITHIUM_USE_HINT_CT
-DONT_HAVE_KVMALLOC
-DONT_HAVE_KVREALLOC
-DONT_USE_KVMALLOC
-DONT_USE_KVREALLOC
 DTLS_RECEIVEFROM_NO_TIMEOUT_ON_INVALID_PEER
 ECCSI_ORDER_MORE_BITS_THAN_PRIME
 ECC_DUMP_OID
@@ -218,21 +171,14 @@ ENABLE_SECURE_SOCKETS_LOGS
 ESP32
 ESP8266
 ESP_ENABLE_WOLFSSH
-ESP_IDF_VERSION
 ESP_IDF_VERSION_MAJOR
 ESP_IDF_VERSION_MINOR
 ESP_PLATFORM
 ESP_TASK_MAIN_STACK
-ETHERNET_AVAILABLE
-ETHERNET_H
 EV_TRIGGER
-EXTERNAL_LOADER_APP
-FIPS_OPTEST_FULL_RUN_AT_MODULE_INIT
-FORCE_FAILURE_GETRANDOM
 FP_ECC_CONTROL
 FREERTOS_TCP_WINSIM
 FREESCALE
-FREESCALE_MQX
 FREESCALE_RNGB
 FREESCALE_USE_MMCAU_CLASSIC
 FSL_FEATURE_HAS_L1CACHE
@@ -298,7 +244,6 @@ HSM_KEY_TYPE_HMAC_512
 HSM_OP_KEY_GENERATION_FLAGS_CREATE
 HSM_OP_KEY_GENERATION_FLAGS_UPDATE
 HSM_SVC_KEY_STORE_FLAGS_UPDATE
-HWCAP_ASIMDRDM
 IDIRECT_DEV_RANDOM
 IDIRECT_DEV_TIME
 ID_TRNG
@@ -310,7 +255,7 @@ INTIMEVER
 IOTSAFE_NO_GETDATA
 IOTSAFE_SIG_8BIT_LENGTH
 KCAPI_USE_XMALLOC
-KERNEL_ROOT
+KYBER_NONDETERMINISTIC
 K_SERIES
 LIBWOLFSSL_VERSION_GIT_BRANCH
 LIBWOLFSSL_VERSION_GIT_HASH
@@ -318,7 +263,7 @@ LIBWOLFSSL_VERSION_GIT_HASH_DATE
 LIBWOLFSSL_VERSION_GIT_ORIGIN
 LIBWOLFSSL_VERSION_GIT_SHORT_HASH
 LIBWOLFSSL_VERSION_GIT_TAG
-LINUXKM_DONT_FORCE_FIPS_ENABLED
+LINUXKM_FPU_STATES_FOLLOW_THREADS
 LINUXKM_LKCAPI_PRIORITY_ALLOW_MASKING
 LINUX_CYCLE_COUNT
 LINUX_RUSAGE_UTIME
@@ -329,7 +274,6 @@ MAXQ10XX_PRODUCTION_KEY
 MAXQ_EXPORT_TLS_KEYS
 MAXQ_SHA1
 MAXSEG_64K
-MAX_OID_SZ
 MAX_WOLFSSL_FILE_SIZE
 MDK_CONF_BARE_METAL
 MDK_CONF_FS
@@ -340,7 +284,6 @@ MICRIUM_MALLOC
 MICROCHIP_MPLAB_HARMONY
 MICROCHIP_MPLAB_HARMONY_3
 MICRO_SESSION_CACHEx
-MLKEM_NONDETERMINISTIC
 MODULE_SOCK_TCP
 MP_31BIT
 MP_8BIT
@@ -371,7 +314,6 @@ NO_ECC384
 NO_ECC521
 NO_ECC_CACHE_CURVE
 NO_ECC_CHECK_KEY
-NO_ECC_CHECK_PUBKEY_ORDER
 NO_ECC_KEY_IMPORT
 NO_ECC_MAKE_PUB
 NO_ED25519_CLIENT_AUTH
@@ -392,8 +334,6 @@ NO_GETENV
 NO_HANDSHAKE_DONE_CB
 NO_IMX6_CAAM_AES
 NO_IMX6_CAAM_HASH
-NO_KEEP_PEER_CERT
-NO_LINUXKM_DRBG_GET_RANDOM_BYTES
 NO_OLD_NAMES
 NO_OLD_POLY1305
 NO_OLD_TIMEVAL_NAME
@@ -418,7 +358,6 @@ NO_PKCS7_STREAM
 NO_POLY1305_ASM
 NO_PUBLIC_CCM_SET_NONCE
 NO_PUBLIC_GCM_SET_IV
-NO_QAT_RNG
 NO_RESUME_SUITE_CHECK
 NO_RNG
 NO_RNG_MUTEX
@@ -429,7 +368,6 @@ NO_STDIO_FGETS_REMAP
 NO_TKERNEL_MEM_POOL
 NO_TLSX_PSKKEM_PLAIN_ANNOUNCE
 NO_VERIFY_OID
-NO_WC_DHGENERATEPUBLIC
 NO_WC_SSIZE_TYPE
 NO_WOLFSSL_ALLOC_ALIGN
 NO_WOLFSSL_AUTOSAR_CRYIF
@@ -437,7 +375,6 @@ NO_WOLFSSL_AUTOSAR_CRYPTO
 NO_WOLFSSL_AUTOSAR_CSM
 NO_WOLFSSL_BASE64_DECODE
 NO_WOLFSSL_BN_CTX
-NO_WOLFSSL_CURVE25519_BLINDING
 NO_WOLFSSL_MSG_EX
 NO_WOLFSSL_RENESAS_FSPSM_AES
 NO_WOLFSSL_RENESAS_FSPSM_HASH
@@ -447,7 +384,6 @@ NO_WOLFSSL_SHA256_INTERLEAVE
 NO_WOLFSSL_SHA512_INTERLEAVE
 NO_WOLFSSL_SKIP_TRAILING_PAD
 NO_WOLFSSL_SMALL_STACK_STATIC
-NO_WOLFSSL_USE_ASM_CERT
 NO_WOLFSSL_XILINX_TAG_MALLOC
 NRF52
 NRF52_SERIES
@@ -477,13 +413,10 @@ REDIRECTION_OUT1_KEYID
 REDIRECTION_OUT2_KEYELMID
 REDIRECTION_OUT2_KEYID
 RENESAS_T4_USE
-RHEL_MAJOR
-RHEL_RELEASE_CODE
 RTC_ALARMSUBSECONDMASK_ALL
 RTE_CMSIS_RTOS_RTX
 RTOS_MODULE_NET_AVAIL
 RTPLATFORM
-SAL_IOMMU_CODE
 SA_INTERRUPT
 SCEKEY_INSTALLED
 SHA256_MANY_REGISTERS
@@ -502,7 +435,6 @@ SL_SE_KEY_TYPE_ECC_P521
 SL_SE_KEY_TYPE_ECC_X25519
 SL_SE_KEY_TYPE_ECC_X448
 SL_SE_PRF_HMAC_SHA1
-SNIFFER_SINGLE_SESSION_CACHE
 SOFTDEVICE_PRESENT
 SO_NOSIGPIPE
 SO_REUSEPORT
@@ -519,7 +451,6 @@ STM32F217xx
 STM32F401xE
 STM32F407xx
 STM32F437xx
-STM32F439xx
 STM32F756xx
 STM32F777xx
 STM32G071xx
@@ -535,38 +466,22 @@ STM32L4A6xx
 STM32L552xx
 STM32L562xx
 STM32MP135Fxx
-STM32N657xx
 STM32U575xx
 STM32U585xx
 STM32U5A9xx
 STM32WB55xx
-STM32WBA52xx
 STM32WL55xx
 STM32_AESGCM_PARTIAL
 STM32_HW_CLOCK_AUTO
 STM32_NUTTX_RNG
-STSAFE_HOST_KEY_CIPHER
-STSAFE_HOST_KEY_MAC
-STSAFE_I2C_BUS
-STSE_CONF_ECC_BRAINPOOL_P_256
-STSE_CONF_ECC_BRAINPOOL_P_384
 TASK_EXTRA_STACK_SIZE
 TCP_NODELAY
 TFM_ALREADY_SET
 TFM_SMALL_MONT_SET
 THREADED_SNIFFTEST
-TIF_NEED_FPU_LOAD
 TIME_T_NOT_LONG
 TI_DUMMY_BUILD
 TLS13_RSA_PSS_SIGN_CB_NO_PREHASH
-TSIP_AES_128_CTR
-TSIP_AES_256_CTR
-TSIP_ECDSA_P256
-TSIP_ECDSA_P384
-TSIP_RSAES_1024
-TSIP_RSAES_2048
-TSIP_RSASSA_1024
-TSIP_RSASSA_2048
 UNICODE
 USER_CA_CB
 USER_CUSTOM_SNIFFX
@@ -575,60 +490,49 @@ USE_ALT_MPRIME
 USE_ANY_ADDR
 USE_CERT_BUFFERS_25519
 USE_CERT_BUFFERS_3072
-USE_CONTESTMUTEX
 USE_ECDSA_KEYSZ_HASH_ALGO
 USE_FULL_ASSERT
 USE_HAL_DRIVER
-USE_LAC_SESSION_FOR_STRUCT_OFFSET
 USE_NXP_LTC
 USE_NXP_MMCAU
-USE_QAE_STATIC_MEM
 USE_QAE_THREAD_LS
 USE_SECRET_CALLBACK
 USE_STSAFE_RNG_SEED
 USE_STSAFE_VERBOSE
 USE_TLSV13
-USE_WINDOWS_API
 USE_WOLF_STRNSTR
 USS_API
 WC_AESXTS_STREAM_NO_REQUEST_ACCOUNTING
 WC_AES_BS_WORD_SIZE
 WC_AES_GCM_DEC_AUTH_EARLY
 WC_ASN_HASH_SHA256
-WC_ASN_RUNTIME_DATE_CHECK_CONTROL
+WC_ASYNC_ENABLE_3DES
+WC_ASYNC_ENABLE_AES
+/* ARC4 implementation has been removed */
+WC_ASYNC_ENABLE_DH
+WC_ASYNC_ENABLE_ECC
 WC_ASYNC_ENABLE_ECC_KEYGEN
-WC_ASYNC_NO_3DES
-WC_ASYNC_NO_AES
-WC_ASYNC_NO_ARC4
+WC_ASYNC_ENABLE_HMAC
+WC_ASYNC_ENABLE_MD5
+WC_ASYNC_ENABLE_RSA
+WC_ASYNC_ENABLE_RSA_KEYGEN
+WC_ASYNC_ENABLE_SHA
+WC_ASYNC_ENABLE_SHA224
+WC_ASYNC_ENABLE_SHA256
+WC_ASYNC_ENABLE_SHA3
+WC_ASYNC_ENABLE_SHA384
+WC_ASYNC_ENABLE_SHA512
 WC_ASYNC_NO_CRYPT
-WC_ASYNC_NO_DH
-WC_ASYNC_NO_ECC
-WC_ASYNC_NO_HMAC
-WC_ASYNC_NO_MD5
-WC_ASYNC_NO_PKI
-WC_ASYNC_NO_RNG
-WC_ASYNC_NO_RSA
-WC_ASYNC_NO_RSA_KEYGEN
-WC_ASYNC_NO_SHA
-WC_ASYNC_NO_SHA224
-WC_ASYNC_NO_SHA256
-WC_ASYNC_NO_SHA3
-WC_ASYNC_NO_SHA384
-WC_ASYNC_NO_SHA512
-WC_ASYNC_THREAD_BIND
-WC_CACHE_RESISTANT_BASE64_TABLE
+WC_ASYNC_NO_HASH
 WC_DILITHIUM_CACHE_PRIV_VECTORS
 WC_DILITHIUM_CACHE_PUB_VECTORS
 WC_DILITHIUM_FIXED_ARRAY
 WC_DISABLE_RADIX_ZERO_PAD
 WC_ECC_NONBLOCK_ONLY
-WC_FLAG_DONT_USE_AESNI
-WC_FORCE_LINUXKM_FORTIFY_SOURCE
+WC_KDF_NIST_SP_800_56C
 WC_LMS_FULL_HASH
-WC_NO_ASYNC_SLEEP
 WC_NO_RNG_SIMPLE
 WC_NO_STATIC_ASSERT
-WC_NO_VERBOSE_RNG
 WC_PKCS11_FIND_WITH_ID_ONLY
 WC_PROTECT_ENCRYPTED_MEM
 WC_RNG_BLOCKING
@@ -636,35 +540,25 @@ WC_RSA_DIRECT
 WC_RSA_NONBLOCK
 WC_RSA_NONBLOCK_TIME
 WC_RSA_NO_FERMAT_CHECK
-WC_RWLOCK_OPS_INLINE
 WC_SHA384
 WC_SHA384_DIGEST_SIZE
 WC_SHA512
-WC_SKIP_INCLUDED_C_FILES
 WC_SSIZE_TYPE
 WC_STRICT_SIG
-WC_USE_PIE_FENCEPOSTS_FOR_FIPS
-WC_WANT_FLAG_DONT_USE_VECTOR_OPS
 WC_XMSS_FULL_HASH
-WIFIESPAT
-WIFI_101
-WIFI_AVAILABLE
-WIFI_NINA
-WIN_REUSE_CRYPT_HANDLE
 WOLFCRYPT_FIPS_CORE_DYNAMIC_HASH_VALUE
 WOLFSENTRY_H
 WOLFSENTRY_NO_JSON
 WOLFSSL_32BIT_MILLI_TIME
+WOLFSSL_AARCH64_PRIVILEGE_MODE
 WOLFSSL_AESNI_BY4
 WOLFSSL_AESNI_BY6
-WOLFSSL_AES_CTR_EXAMPLE
 WOLFSSL_AFTER_DATE_CLOCK_SKEW
 WOLFSSL_ALGO_HW_MUTEX
-WOLFSSL_ALLOW_AKID_SKID_MATCH
-WOLFSSL_ALLOW_BAD_TLS_LEGACY_VERSION
 WOLFSSL_ALLOW_CRIT_AIA
 WOLFSSL_ALLOW_CRIT_AKID
 WOLFSSL_ALLOW_CRIT_SKID
+WOLFSSL_ALLOW_ENCODING_CA_FALSE
 WOLFSSL_ALLOW_MAX_FRAGMENT_ADJUST
 WOLFSSL_ALLOW_NO_CN_IN_SAN
 WOLFSSL_ALLOW_NO_SUITES
@@ -672,11 +566,11 @@ WOLFSSL_ALLOW_SERVER_SC_EXT
 WOLFSSL_ALLOW_TLS_SHA1
 WOLFSSL_ALTERNATIVE_DOWNGRADE
 WOLFSSL_ALT_NAMES_NO_REV
-WOLFSSL_ARMASM_NEON_NO_TABLE_LOOKUP
 WOLFSSL_ARM_ARCH_NEON_64BIT
 WOLFSSL_ASCON_UNROLL
 WOLFSSL_ASNC_CRYPT
 WOLFSSL_ASN_EXTRA
+WOLFSSL_ASN_INT_LEAD_0_ANY
 WOLFSSL_ASN_TEMPLATE_NEED_SET_INT32
 WOLFSSL_ASN_TEMPLATE_TYPE_CHECK
 WOLFSSL_ATECC508
@@ -695,20 +589,26 @@ WOLFSSL_BIGINT_TYPES
 WOLFSSL_BIO_NO_FLOW_STATS
 WOLFSSL_BLAKE2B_INIT_EACH_FIELD
 WOLFSSL_BLAKE2S_INIT_EACH_FIELD
+WOLFSSL_BLIND_PRIVATE_KEY
 WOLFSSL_BYTESWAP32_ASM
 WOLFSSL_CAAM_BLACK_KEY_AESCCM
 WOLFSSL_CAAM_BLACK_KEY_SM
 WOLFSSL_CAAM_NO_BLACK_KEY
 WOLFSSL_CALLBACKS
 WOLFSSL_CHECK_DESKEY
+WOLFSSL_CHECK_MEM_ZERO
 WOLFSSL_CHIBIOS
 WOLFSSL_CLANG_TIDY
-WOLFSSL_CLIENT_EXAMPLE
+WOLFSSL_COMMERCIAL_LICENSE
 WOLFSSL_CONTIKI
 WOLFSSL_CRL_ALLOW_MISSING_CDP
+WOLFSSL_CURVE25519_BLINDING
+WOLFSSL_CUSTOM_CONFIG
 WOLFSSL_DILITHIUM_ASSIGN_KEY
+WOLFSSL_DILITHIUM_MAKE_KEY_SMALL_MEM
 WOLFSSL_DILITHIUM_NO_ASN1
 WOLFSSL_DILITHIUM_NO_CHECK_KEY
+WOLFSSL_DILITHIUM_NO_LARGE_CODE
 WOLFSSL_DILITHIUM_NO_MAKE
 WOLFSSL_DILITHIUM_REVERSE_HASH_OID
 WOLFSSL_DILITHIUM_SIGN_CHECK_W0
@@ -716,9 +616,10 @@ WOLFSSL_DILITHIUM_SIGN_CHECK_Y
 WOLFSSL_DILITHIUM_SIGN_SMALL_MEM_PRECALC
 WOLFSSL_DILITHIUM_SIGN_SMALL_MEM_PRECALC_A
 WOLFSSL_DILITHIUM_SMALL_MEM_POLY64
+WOLFSSL_DILITHIUM_VERIFY_NO_MALLOC
+WOLFSSL_DILITHIUM_VERIFY_SMALL_MEM
 WOLFSSL_DISABLE_EARLY_SANITY_CHECKS
 WOLFSSL_DTLS_DISALLOW_FUTURE
-WOLFSSL_DTLS_RECORDS_CAN_SPAN_DATAGRAMS
 WOLFSSL_DTLS_RESEND_ONLY_TIMEOUT
 WOLFSSL_DUMP_MEMIO_STREAM
 WOLFSSL_DUP_CERTPOL
@@ -730,13 +631,13 @@ WOLFSSL_ECDHX_SHARED_NOT_ZERO
 WOLFSSL_ECDSA_MATCH_HASH
 WOLFSSL_ECDSA_SET_K_ONE_LOOP
 WOLFSSL_EC_POINT_CMP_JACOBIAN
-WOLFSSL_ED448_NO_LARGE_CODE
 WOLFSSL_EDDSA_CHECK_PRIV_ON_SIGN
 WOLFSSL_EMNET
 WOLFSSL_ESPWROOM32
 WOLFSSL_EVP_PRINT
 WOLFSSL_EXPORT_INT
 WOLFSSL_EXPORT_SPC_SZ
+WOLFSSL_EXTRA
 WOLFSSL_FORCE_OCSP_NONCE_CHECK
 WOLFSSL_FRDM_K64
 WOLFSSL_FRDM_K64_JENKINS
@@ -762,13 +663,11 @@ WOLFSSL_IMXRT_DCP
 WOLFSSL_ISOTP
 WOLFSSL_KEIL
 WOLFSSL_KEIL_NET
-WOLFSSL_KYBER_NO_DECAPSULATE
-WOLFSSL_KYBER_NO_ENCAPSULATE
-WOLFSSL_KYBER_NO_MAKE_KEY
+WOLFSSL_KYBER_INVNTT_UNROLL
+WOLFSSL_KYBER_NO_LARGE_CODE
+WOLFSSL_KYBER_NO_MALLOC
+WOLFSSL_KYBER_NTT_UNROLL
 WOLFSSL_LIB
-WOLFSSL_LINUXKM_USE_GET_RANDOM_KPROBES
-WOLFSSL_LINUXKM_USE_GET_RANDOM_USER_KRETPROBE
-WOLFSSL_LINUXKM_USE_MUTEXES
 WOLFSSL_LMS_CACHE_BITS
 WOLFSSL_LMS_FULL_HASH
 WOLFSSL_LMS_LARGE_CACHES
@@ -781,14 +680,12 @@ WOLFSSL_MAKE_SYSTEM_NAME_LINUX
 WOLFSSL_MAKE_SYSTEM_NAME_WSL
 WOLFSSL_MDK5
 WOLFSSL_MEM_FAIL_COUNT
-WOLFSSL_MLKEM_INVNTT_UNROLL
-WOLFSSL_MLKEM_NO_MALLOC
-WOLFSSL_MLKEM_NTT_UNROLL
+WOLFSSL_MLKEM_ENCAPSULATE_SMALL_MEM
+WOLFSSL_MLKEM_MAKEKEY_SMALL_MEM
 WOLFSSL_MONT_RED_CT
 WOLFSSL_MP_COND_COPY
 WOLFSSL_MP_INVMOD_CONSTANT_TIME
 WOLFSSL_MULTICIRCULATE_ALTNAMELIST
-WOLFSSL_NEW_PRIME_CHECK
 WOLFSSL_NONBLOCK_OCSP
 WOLFSSL_NOSHA3_384
 WOLFSSL_NOT_WINDOWS_API
@@ -799,14 +696,13 @@ WOLFSSL_NO_COPY_CERT
 WOLFSSL_NO_COPY_KEY
 WOLFSSL_NO_CRL_DATE_CHECK
 WOLFSSL_NO_CRL_NEXT_DATE
-WOLFSSL_NO_CT_MAX_MIN
-WOLFSSL_NO_DEBUG_CERTS
 WOLFSSL_NO_DECODE_EXTRA
 WOLFSSL_NO_DER_TO_PEM
 WOLFSSL_NO_DH186
 WOLFSSL_NO_DTLS_SIZE_CHECK
 WOLFSSL_NO_ETM_ALERT
 WOLFSSL_NO_FENCE
+WOLFSSL_NO_FSEEK
 WOLFSSL_NO_INIT_CTX_KEY
 WOLFSSL_NO_ISSUERHASH_TDPEER
 WOLFSSL_NO_KCAPI_AES_CBC
@@ -819,6 +715,7 @@ WOLFSSL_NO_KCAPI_SHA224
 WOLFSSL_NO_OCSP_DATE_CHECK
 WOLFSSL_NO_OCSP_ISSUER_CHAIN_CHECK
 WOLFSSL_NO_OCSP_OPTIONAL_CERTS
+WOLFSSL_NO_PUBLIC_FFDHE
 WOLFSSL_NO_RSA_KEY_CHECK
 WOLFSSL_NO_SERVER_GROUPS_EXT
 WOLFSSL_NO_SESSION_STATS
@@ -828,7 +725,6 @@ WOLFSSL_NO_SPHINCS
 WOLFSSL_NO_STRICT_CIPHER_SUITE
 WOLFSSL_NO_TICKET_EXPIRE
 WOLFSSL_NO_TRUSTED_CERTS_VERIFY
-WOLFSSL_NO_WORD64_OPS
 WOLFSSL_NO_XOR_OPS
 WOLFSSL_NRF51_AES
 WOLFSSL_OLDTLS_AEAD_CIPHERSUITES
@@ -852,6 +748,7 @@ WOLFSSL_PSK_IDENTITY_ALERT
 WOLFSSL_PSK_ID_PROTECTION
 WOLFSSL_PSK_MULTI_ID_PER_CS
 WOLFSSL_PSK_TLS13_CB
+WOLFSSL_PSOC6_CRYPTO
 WOLFSSL_PYTHON
 WOLFSSL_RENESAS_FSPSM_CRYPT_ONLY
 WOLFSSL_RENESAS_RA6M3
@@ -860,8 +757,6 @@ WOLFSSL_RENESAS_RSIP
 WOLFSSL_RENESAS_RZN2L
 WOLFSSL_RENESAS_TLS
 WOLFSSL_RENESAS_TSIP_IAREWRX
-WOLFSSL_REQUIRE_TCA
-WOLFSSL_RNG_USE_FULL_SEED
 WOLFSSL_RSA_CHECK_D_ON_DECRYPT
 WOLFSSL_RSA_DECRYPT_TO_0_LEN
 WOLFSSL_RW_THREADED
@@ -874,25 +769,23 @@ WOLFSSL_SE050_INIT
 WOLFSSL_SE050_NO_RSA
 WOLFSSL_SE050_NO_TRNG
 WOLFSSL_SECURE_RENEGOTIATION_ON_BY_DEFAULT
-WOLFSSL_SERVER_EXAMPLE
 WOLFSSL_SETTINGS_FILE
 WOLFSSL_SH224
 WOLFSSL_SHA256_ALT_CH_MAJ
-WOLFSSL_SHA512_HASHTYPE
 WOLFSSL_SHUTDOWNONCE
 WOLFSSL_SILABS_TRNG
 WOLFSSL_SM4_EBC
 WOLFSSL_SNIFFER_NO_RECOVERY
 WOLFSSL_SP_ARM32_UDIV
+WOLFSSL_SP_DH
 WOLFSSL_SP_FAST_NCT_EXPTMOD
 WOLFSSL_SP_INT_SQR_VOLATILE
 WOLFSSL_STACK_CHECK
 WOLFSSL_STM32F427_RNG
-WOLFSSL_STM32U5_DHUK
+WOLFSSL_STM32_RNG_NOLIB
 WOLFSSL_STRONGEST_HASH_SIG
 WOLFSSL_STSAFE_TAKES_SLOT
 WOLFSSL_TELIT_M2MB
-WOLFSSL_TEMPLATE_EXAMPLE
 WOLFSSL_THREADED_CRYPT
 WOLFSSL_TICKET_DECRYPT_NO_CREATE
 WOLFSSL_TICKET_ENC_AES128_GCM
@@ -905,24 +798,21 @@ WOLFSSL_TICKET_ENC_HMAC_SHA512
 WOLFSSL_TI_CURRTIME
 WOLFSSL_TLS13_DRAFT
 WOLFSSL_TLS13_IGNORE_AEAD_LIMITS
-WOLFSSL_TLS13_IGNORE_PT_ALERT_ON_ENC
 WOLFSSL_TLS13_SHA512
 WOLFSSL_TLS13_TICKET_BEFORE_FINISHED
 WOLFSSL_TLSX_PQC_MLKEM_STORE_PRIV_KEY
 WOLFSSL_TRACK_MEMORY_FULL
 WOLFSSL_TRAP_MALLOC_SZ
 WOLFSSL_UNALIGNED_64BIT_ACCESS
-WOLFSSL_USER_DEFINED_ATOMICS
 WOLFSSL_USER_FILESYSTEM
 WOLFSSL_USER_LOG
 WOLFSSL_USER_MUTEX
 WOLFSSL_USER_THREADING
 WOLFSSL_USE_ESP32C3_CRYPT_HASH_HW
 WOLFSSL_USE_FLASHMEM
-WOLFSSL_USE_FORCE_ZERO
 WOLFSSL_USE_OPTIONS_H
+WOLFSSL_USE_POPEN_HOST
 WOLFSSL_VALIDATE_DH_KEYGEN
-WOLFSSL_WC_LMS_SERIALIZE_STATE
 WOLFSSL_WC_XMSS_NO_SHA256
 WOLFSSL_WC_XMSS_NO_SHAKE256
 WOLFSSL_WICED_PSEUDO_UNIX_EPOCH_TIME
@@ -941,7 +831,6 @@ WOLF_CRYPTO_CB_ONLY_ECC
 WOLF_CRYPTO_CB_ONLY_RSA
 WOLF_CRYPTO_DEV
 WOLF_NO_TRAILING_ENUM_COMMAS
-WindowsCE
 XGETPASSWD
 XMSS_CALL_PRF_KEYGEN
 XPAR_VERSAL_CIPS_0_PSPMC_0_PSV_CORTEXA72_0_TIMESTAMP_CLK_FREQ
@@ -951,8 +840,6 @@ _ABIO64
 _ARCH_PPC64
 _COMPILER_VERSION
 _INTPTR_T_DECLARED
-_LINUX_REFCOUNT_H
-_LINUX_REFCOUNT_TYPES_H
 _LP64
 _MSC_VER
 _MSVC_LANG
@@ -962,7 +849,6 @@ _NETOS
 _POSIX_C_SOURCE
 _SDCC_VERSION_PATCHLEVEL
 _SH3
-_SILICON_LABS_32B_SERIES_3_CONFIG_301
 _SILICON_LABS_SECURITY_FEATURE
 _SOCKLEN_T
 _SYS_DEVCON_LOCAL_H
@@ -987,17 +873,13 @@ __ARCH_STRSTR_NO_REDIRECT
 __ARM_ARCH_7M__
 __ARM_FEATURE_CRYPTO
 __ASSEMBLER__
-__ATOMIC_CONSUME
 __ATOMIC_RELAXED
-__AVR_ARCH__
 __AVR__
 __BCPLUSPLUS__
 __BIG_ENDIAN__
 __BORLANDC__
 __CCRX__
-__CC_ARM
 __COMPILER_VER__
-__COUNTER__
 __CYGWIN__
 __DATE__
 __DCACHE_PRESENT
@@ -1023,7 +905,6 @@ __LINUX__
 __LP64
 __LP64__
 __MACH__
-__MEGAAVR__
 __MICROBLAZE__
 __MINGW32__
 __MINGW64_VERSION_MAJOR
@@ -1032,7 +913,6 @@ __MWERKS__
 __NT__
 __OS2__
 __OpenBSD__
-__PIC__
 __PIE__
 __POWERPC__
 __PPC__
@@ -1047,15 +927,12 @@ __SAM3X4C__
 __SAM3X4E__
 __SAM3X8C__
 __SAM3X8E__
-__SAMD21__
-__SAMD51__
 __SANITIZE_ADDRESS__
 __SDCC_VERSION_MAJOR
 __SDCC_VERSION_MINOR
 __SDCC_VERSION_PATCH
 __SIZEOF_INT128__
 __SIZEOF_LONG_LONG__
-__STDC_NO_ATOMICS__
 __STDC_VERSION__
 __STDC__
 __STM32__
@@ -1073,7 +950,6 @@ __WATCOMC__
 __WATCOM_INT64__
 __XC32
 __XTENSA__
-__ZEPHYR__
 __aarch64__
 __alpha__
 __arch64__
@@ -1104,7 +980,6 @@ __svr4__
 __thumb__
 __ti__
 __x86_64__
-__xtensa__
 byte
 configTICK_RATE_HZ
 fallthrough
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
     You must delete them, or cmake will refuse to work.")
 endif()

-project(wolfssl VERSION 5.8.4 LANGUAGES C ASM)
+project(wolfssl VERSION 5.7.6 LANGUAGES C ASM)

 # Set WOLFSSL_ROOT if not already defined
 if ("${WOLFSSL_ROOT}" STREQUAL "")
@@ -49,7 +49,7 @@ endif()

 # shared library versioning
 # increment if interfaces have been removed or changed
-set(WOLFSSL_LIBRARY_VERSION_FIRST 44)
+set(WOLFSSL_LIBRARY_VERSION_FIRST 43)

 # increment if interfaces have been added
 # set to zero if WOLFSSL_LIBRARY_VERSION_FIRST is incremented
@@ -58,7 +58,7 @@ set(WOLFSSL_LIBRARY_VERSION_SECOND 0)
 # increment if source code has changed
 # set to zero if WOLFSSL_LIBRARY_VERSION_FIRST is incremented or
 # WOLFSSL_LIBRARY_VERSION_SECOND is incremented
-set(WOLFSSL_LIBRARY_VERSION_THIRD 1)
+set(WOLFSSL_LIBRARY_VERSION_THIRD 0)

 set(LIBTOOL_FULL_VERSION ${WOLFSSL_LIBRARY_VERSION_FIRST}.${WOLFSSL_LIBRARY_VERSION_SECOND}.${WOLFSSL_LIBRARY_VERSION_THIRD})

@@ -66,9 +66,6 @@ set(WOLFSSL_DEFINITIONS)
 set(WOLFSSL_LINK_LIBS)
 set(WOLFSSL_INCLUDE_DIRS)

-# Initialize pkg-config private variables
-set(PC_LIBS_PRIVATE "")
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/functions.cmake)

@@ -127,10 +124,6 @@ check_function_exists("memset" HAVE_MEMSET)
 check_function_exists("socket" HAVE_SOCKET)
 check_function_exists("strftime" HAVE_STRFTIME)
 check_function_exists("__atomic_fetch_add" HAVE_C___ATOMIC)
-check_function_exists("getpid" HAVE_GETPID)
-
-include(CheckSymbolExists)
-check_symbol_exists(isascii "ctype.h" HAVE_ISASCII)

 include(CheckTypeSize)

@@ -284,28 +277,7 @@ add_option("WOLFSSL_DEBUG"
    "no" "yes;no")

 if(WOLFSSL_DEBUG)
-    # Optional variable inspection
-    if (0)
-        get_cmake_property(_variableNames VARIABLES)
-        list (SORT _variableNames)
-        message(STATUS "")
-        message(STATUS "ALL VARIABLES BEGIN")
-        message(STATUS "")
-        foreach (_variableName ${_variableNames})
-            message(STATUS "${_variableName}=${${_variableName}}")
-        endforeach()
-        message(STATUS "")
-        message(STATUS "ALL VARIABLES END")
-        message(STATUS "")
-    endif()
-
-    if (CMAKE_C_COMPILER_ID STREQUAL "Watcom" OR CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom" OR CMAKE_GENERATOR STREQUAL "Watcom WMake")
-        # Open Watcom v2 does not support -g debugging
-        message(STATUS "Detected Watcom compiler, using CMAKE_C_FLAGS_DEBUG -d2")
-        set(CMAKE_C_FLAGS_DEBUG "-d2 ${CMAKE_C_FLAGS_DEBUG}")
-    else()
-        set(CMAKE_C_FLAGS "-g ${CMAKE_C_FLAGS}")
-    endif()
+    set(CMAKE_C_FLAGS "-g ${CMAKE_C_FLAGS}")
    list(APPEND WOLFSSL_DEFINITIONS
        "-DDEBUG_WOLFSSL"
        "-DDEBUG")
@@ -459,7 +431,6 @@ if(WOLFSSL_CURL)
    set(WOLFSSL_MD4 "yes")
    set(WOLFSSL_DES3 "yes")
    set(WOLFSSL_ALPN "yes")
-    set(WOLFSSL_EX_DATA "yes")
    set(WOLFSSL_WOLFSSH "yes")
    set(WOLFSSL_OPENSSLEXTRA "yes")
    set(WOLFSSL_CRL "yes")
@@ -598,23 +569,9 @@ add_option(WOLFSSL_OQS
    "Enable integration with the OQS (Open Quantum Safe) liboqs library (default: disabled)"
    "no" "yes;no")

-# ML-KEM/Kyber
-add_option(WOLFSSL_MLKEM
-    "Enable the wolfSSL PQ ML-KEM library (default: disabled)"
-    "no" "yes;no")
-
-# Dilithium
-add_option(WOLFSSL_DILITHIUM
-    "Enable the wolfSSL PQ Dilithium (ML-DSA) implementation (default: disabled)"
-    "no" "yes;no")
-
-# LMS
-add_option(WOLFSSL_LMS
-    "Enable the PQ LMS Stateful Hash-based Signature Scheme (default: disabled)"
-    "no" "yes;no")
-
-add_option(WOLFSSL_LMSSHA256192
-    "Enable the LMS SHA_256_192 truncated variant (default: disabled)"
+# Kyber
+add_option(WOLFSSL_KYBER
+    "Enable the wolfSSL PQ Kyber library (default: disabled)"
    "no" "yes;no")

 # Experimental features
@@ -630,7 +587,7 @@ if (WOLFSSL_EXPERIMENTAL)
    # check if any experimental features are also enabled:
    set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 0)

-    set_wolfssl_definitions("WOLFSSL_EXPERIMENTAL_SETTINGS" RESULT)
+    set_wolfssl_definitions("WOLFSSL_EXPERIMENTAL_SETTINGS" RESUlT)

    # Checking for experimental feature: OQS
    message(STATUS "Looking for WOLFSSL_OQS")
@@ -645,9 +602,9 @@ if (WOLFSSL_EXPERIMENTAL)
            list(APPEND WOLFSSL_LINK_LIBS ${OQS_LIBRARY})
            list(APPEND WOLFSSL_INCLUDE_DIRS ${OQS_INCLUDE_DIR})

-            set_wolfssl_definitions("HAVE_LIBOQS"          RESULT)
-            set_wolfssl_definitions("HAVE_TLS_EXTENSIONS"  RESULT)
-            set_wolfssl_definitions("OPENSSL_EXTRA"        RESULT)
+            set_wolfssl_definitions("HAVE_LIBOQS"          RESUlT)
+            set_wolfssl_definitions("HAVE_TLS_EXTENSIONS"  RESUlT)
+            set_wolfssl_definitions("OPENSSL_EXTRA"        RESUlT)

        else()
            message(STATUS "Checking OQS - not found")
@@ -657,75 +614,20 @@ if (WOLFSSL_EXPERIMENTAL)
        message(STATUS "Looking for WOLFSSL_OQS - not found")
    endif()

-    # Checking for experimental feature: WOLFSSL_MLKEM
-    message(STATUS "Looking for WOLFSSL_MLKEM")
-    if (WOLFSSL_MLKEM)
+    # Checking for experimental feature: Kyber
+    message(STATUS "Looking for WOLFSSL_KYBER")
+    if (WOLFSSL_KYBER)
        set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 1)

-        message(STATUS "Automatically set related requirements for ML-KEM:")
-        add_definitions("-DWOLFSSL_HAVE_MLKEM")
-        add_definitions("-DWOLFSSL_WC_MLKEM")
-        add_definitions("-DWOLFSSL_SHA3")
-        add_definitions("-DWOLFSSL_SHAKE128")
-        add_definitions("-DWOLFSSL_SHAKE256")
-
-        set_wolfssl_definitions("WOLFSSL_HAVE_MLKEM" RESULT)
-        set_wolfssl_definitions("WOLFSSL_WC_MLKEM"   RESULT)
-        set_wolfssl_definitions("WOLFSSL_SHA3"       RESULT)
-        set_wolfssl_definitions("WOLFSSL_SHAKE128"   RESULT)
-        set_wolfssl_definitions("WOLFSSL_SHAKE256"   RESULT)
-        message(STATUS "Looking for WOLFSSL_MLKEM - found")
+        message(STATUS "Automatically set related requirements for Kyber:")
+        set_wolfssl_definitions("WOLFSSL_HAVE_KYBER" RESUlT)
+        set_wolfssl_definitions("WOLFSSL_WC_KYBER"   RESUlT)
+        set_wolfssl_definitions("WOLFSSL_SHA3"       RESUlT)
+        set_wolfssl_definitions("WOLFSSL_SHAKE128"   RESUlT)
+        set_wolfssl_definitions("WOLFSSL_SHAKE256"   RESUlT)
+        message(STATUS "Looking for WOLFSSL_KYBER - found")
    else()
-        message(STATUS "Looking for WOLFSSL_MLKEM - not found")
-    endif()
-
-    # Checking for experimental feature: WOLFSSL_LMS
-    message(STATUS "Looking for WOLFSSL_LMS")
-    if (WOLFSSL_LMS)
-        set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 2)
-
-        message(STATUS "Automatically set related requirements for LMS")
-        add_definitions("-DWOLFSSL_HAVE_LMS")
-        add_definitions("-DWOLFSSL_WC_LMS")
-        set_wolfssl_definitions("WOLFSSL_HAVE_LMS" RESULT)
-        set_wolfssl_definitions("WOLFSSL_WC_LMS"   RESULT)
-        message(STATUS "Looking for WOLFSSL_LMS - found")
-        # Checking for experimental feature: WOLFSSL_LMSSHA256192
-        if (WOLFSSL_LMSSHA256192)
-            message(STATUS "Automatically set related requirements for LMS SHA256-192")
-            add_definitions("-DWOLFSSL_LMS_SHA256_192")
-            add_definitions("-DWOLFSSL_NO_LMS_SHA256_256")
-            set_wolfssl_definitions("WOLFSSL_LMS_SHA256_192"    RESULT)
-            set_wolfssl_definitions("WOLFSSL_NO_LMS_SHA256_256" RESULT)
-            message(STATUS "Looking for WOLFSSL_LMSSHA256192 - found")
-        else()
-            message(STATUS "Looking for WOLFSSL_LMSSHA256192 - not found")
-        endif()
-    else()
-        message(STATUS "Looking for WOLFSSL_LMS - not found")
-    endif()
-
-    # Checking for experimental feature: Dilithium
-    message(STATUS "Looking for WOLFSSL_DILITHIUM")
-    if (WOLFSSL_DILITHIUM)
-        set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 1)
-
-        message(STATUS "Automatically set related requirements for Dilithium:")
-        add_definitions("-DHAVE_DILITHIUM")
-        add_definitions("-DWOLFSSL_WC_DILITHIUM")
-        add_definitions("-DWOLFSSL_SHA3")
-        add_definitions("-DWOLFSSL_SHAKE128")
-        add_definitions("-DWOLFSSL_SHAKE256")
-
-        message(STATUS "Automatically set related requirements for Dilithium:")
-        set_wolfssl_definitions("HAVE_DILITHIUM"       RESULT)
-        set_wolfssl_definitions("WOLFSSL_WC_DILITHIUM" RESULT)
-        set_wolfssl_definitions("WOLFSSL_SHA3"         RESULT)
-        set_wolfssl_definitions("WOLFSSL_SHAKE128"     RESULT)
-        set_wolfssl_definitions("WOLFSSL_SHAKE256"     RESULT)
-        message(STATUS "Looking for WOLFSSL_DILITHIUM - found")
-    else()
-        message(STATUS "Looking for WOLFSSL_DILITHIUM - not found")
+        message(STATUS "Looking for WOLFSSL_KYBER - not found")
    endif()

    # Other experimental feature detection can be added here...
@@ -738,23 +640,18 @@ if (WOLFSSL_EXPERIMENTAL)
    endif()

    # Sanity checks
-    if(WOLFSSL_OQS AND WOLFSSL_MLKEM)
-        message(FATAL_ERROR "Error: cannot enable both WOLFSSL_OQS and WOLFSSL_MLKEM at the same time.")
-    endif()
-    if(WOLFSSL_OQS AND WOLFSSL_DILITHIUM)
-        message(FATAL_ERROR "Error: cannot enable both WOLFSSL_OQS and WOLFSSL_DILITHIUM at the same time.")
+    if(WOLFSSL_OQS AND WOLFSSL_KYBER)
+        message(FATAL_ERROR "Error: cannot enable both WOLFSSL_OQS and WOLFSSL_KYBER at the same time.")
    endif()
+
 else()
    # Experimental mode not enabled, but were any experimental features enabled? Error out if so:
    message(STATUS "Looking for WOLFSSL_EXPERIMENTAL - not found")
    if (WOLFSSL_OQS)
        message(FATAL_ERROR "Error: WOLFSSL_OQS requires WOLFSSL_EXPERIMENTAL at this time.")
    endif()
-    if(WOLFSSL_MLKEM)
-        message(FATAL_ERROR "Error: WOLFSSL_MLKEM requires WOLFSSL_EXPERIMENTAL at this time.")
-    endif()
-    if(WOLFSSL_DILITHIUM)
-        message(FATAL_ERROR "Error: WOLFSSL_DILITHIUM requires WOLFSSL_EXPERIMENTAL at this time.")
+    if(WOLFSSL_KYBER)
+        message(FATAL_ERROR "Error: WOLFSSL_KYBER requires WOLFSSL_EXPERIMENTAL at this time.")
    endif()
 endif()

@@ -855,8 +752,7 @@ add_option("WOLFSSL_AESCTR"

 if(WOLFSSL_OPENVPN OR
   WOLFSSL_LIBSSH2 OR
-   WOLFSSL_AESSIV OR
-   WOLFSSL_CLU)
+   WOLFSSL_AESSIV)
    override_cache(WOLFSSL_AESCTR "yes")
 endif()

@@ -996,7 +892,7 @@ endif()
 #       - SEP

 add_option("WOLFSSL_KEYGEN"
-    "Enable key generation (default: disabled)"
+    "Enable key generation (default: disabled)])"
    "no" "yes;no")

 add_option("WOLFSSL_CERTGEN"
@@ -1070,41 +966,6 @@ if(WOLFSSL_ECC)
    endif()
 endif()

-# ECCSI
-add_option("WOLFSSL_ECCSI"
-    "Enable ECCSI (default: disabled)"
-    "no" "yes;no")
-
-if(WOLFSSL_ECCSI)
-    if (NOT WOLFSSL_ECC)
-        message(FATAL_ERROR "cannot enable ECCSI without enabling ECC.")
-    endif()
-
-    list(APPEND WOLFSSL_DEFINITIONS "-DWOLFCRYPT_HAVE_ECCSI -DWOLFSSL_PUBLIC_MP")
-endif()
-
-# SAKKE
-add_option("WOLFSSL_SAKKE"
-    "Enable SAKKE (default: disabled)"
-    "no" "yes;no")
-
-if(WOLFSSL_SAKKE)
-    if (NOT WOLFSSL_ECC)
-        message(FATAL_ERROR "cannot enable SAKKE without enabling ECC.")
-    endif()
-
-    list(APPEND WOLFSSL_DEFINITIONS "-DWOLFCRYPT_HAVE_SAKKE")
-endif()
-
-# SipHash
-add_option("WOLFSSL_SIPHASH"
-    "Enable SipHash (default: disabled)"
-    "no" "yes;no")
-
-if(WOLFSSL_SIPHASH)
-    list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_SIPHASH")
-endif()
-
 # TODO: - Compressed key
 #       - FP ECC, fixed point cache ECC
 #       - ECC encrypt
@@ -1158,7 +1019,7 @@ add_option("WOLFSSL_ED25519"
    "Enable ED25519 (default: disabled)"
    "no" "yes;no")

-if(WOLFSSL_OPENSSH OR WOLFSSL_CLU)
+if(WOLFSSL_OPENSSH)
    override_cache(WOLFSSL_ED25519 "yes")
 endif()

@@ -1249,8 +1110,8 @@ endif()

 # Old TLS
 add_option("WOLFSSL_OLD_TLS"
-    "Enable old TLS versions < 1.2 (default: disabled)"
-    "no" "yes;no")
+    "Enable old TLS versions < 1.2 (default: enabled)"
+    "yes" "yes;no")

 if(NOT WOLFSSL_OLD_TLS)
    list(APPEND WOLFSSL_DEFINITIONS "-DNO_OLD_TLS")
@@ -1492,8 +1353,8 @@ if(NOT WOLFSSL_DES3_TLS_SUITES)
    list(APPEND WOLFSSL_DEFINITIONS "-DNO_DES3_TLS_SUITES")
 endif()

-# ARC4
-set(WOLFSSL_ARC4_HELP_STRING "Enable ARC4 (default: disabled)")
+# RC4 API (ARC4 implementation removed)
+set(WOLFSSL_ARC4_HELP_STRING "Enable RC4 API (default: disabled, ARC4 implementation removed)")
 add_option("WOLFSSL_ARC4" ${WOLFSSL_ARC4_HELP_STRING} "no" "yes;no")

 if(WOLFSSL_OPENSSH OR WOLFSSL_WPAS)
@@ -1501,25 +1362,17 @@ if(WOLFSSL_OPENSSH OR WOLFSSL_WPAS)
 endif()

 # MD5
-set(WOLFSSL_MD5_HELP_STRING "Enable MD5 (default: disabled)")
-add_option("WOLFSSL_MD5" ${WOLFSSL_MD5_HELP_STRING} "no" "yes;no")
-
-if(WOLFSSL_WPAS OR
-   WOLFSSL_HAPROXY OR
-   WOLFSSL_NGINX OR
-   WOLFSSL_OPENSSH OR
-   WOLFSSL_OPENSSLEXTRA OR
-   WOLFSSL_OPENVPN OR
-   WOLFSSL_OLD_TLS OR
-   WOLFSSL_FORTRESS OR
-   WOLFSSL_LIGHTY OR
-   WOLFSSL_DES3 OR
-   WOLFSSL_OPENSSLALL)
-    override_cache(WOLFSSL_MD5 "yes")
-endif()
+set(WOLFSSL_MD5_HELP_STRING "Enable MD5 (default: enabled)")
+add_option("WOLFSSL_MD5" ${WOLFSSL_MD5_HELP_STRING} "yes" "yes;no")

 if(NOT WOLFSSL_MD5)
    list(APPEND WOLFSSL_DEFINITIONS "-DNO_MD5" "-DNO_OLD_TLS")
+else()
+    # turn off MD5 if leanpsk or leantls on
+    if(WOLFSSL_LEAN_PSK OR WOLFSSL_LEAN_TLS)
+        list(APPEND WOLFSSL_DEFINITIONS "-DNO_MD5" "-DNO_OLD_TLS")
+        override_cache(WOLFSSL_MD5 "no")
+    endif()
 endif()

 # SHA
@@ -1696,14 +1549,6 @@ if(NOT WOLFSSL_INLINE)
    list(APPEND WOLFSSL_DEFINITIONS "-DNO_INLINE")
 endif()

-add_option("WOLFSSL_ARMASM_INLINE"
-    "Enable ARM assembly inline functions (default: disabled)"
-    "no" "yes;no")
-
-if (WOLFSSL_ARMASM_INLINE)
-    list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_ARMASM_INLINE")
-endif()
-
 # TODO:
 #       - CRL monitor
 #       - User crypto
@@ -1849,9 +1694,6 @@ add_option(WOLFSSL_PKCS7 ${WOLFSSL_PKCS7_HELP_STRING} "no" "yes;no")
 set(WOLFSSL_TPM_HELP_STRING "Enable wolfTPM options (default: disabled)")
 add_option(WOLFSSL_TPM ${WOLFSSL_TPM_HELP_STRING} "no" "yes;no")

-set(WOLFSSL_CLU_HELP_STRING "Enable wolfCLU options (default: disabled)")
-add_option(WOLFSSL_CLU ${WOLFSSL_CLU_HELP_STRING} "no" "yes;no")
-
 set(WOLFSSL_AESKEYWRAP_HELP_STRING "Enable AES key wrap support (default: disabled)")
 add_option(WOLFSSL_AESKEYWRAP ${WOLFSSL_AESKEYWRAP_HELP_STRING} "no" "yes;no")

@@ -1934,16 +1776,6 @@ if(NOT WOLFSSL_PKCS12)
  list(APPEND WOLFSSL_DEFINITIONS "-DNO_PKCS12")
 endif()

-# PKCS#11
-add_option("WOLFSSL_PKCS11"
-    "Enable PKCS#11 (default: disabled)"
-    "no" "yes;no")
-
-if(WOLFSSL_PKCS11 AND NOT WIN32)
-    list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_PKCS11 -DHAVE_WOLF_BIGINT")
-    list(APPEND WOLFSSL_LINK_LIBS ${CMAKE_DL_LIBS})
-endif()
-

 # PWDBASED has to come after certservice since we want it on w/o explicit on
 # PWDBASED
@@ -2042,6 +1874,7 @@ add_option("WOLFSSL_CRYPT_TESTS_HELP"
    "no" "yes;no")

 # TODO: - LIBZ
+#       - PKCS#11
 #       - Cavium
 #       - Cavium V
 #       - Cavium Octeon
@@ -2140,7 +1973,10 @@ add_option("WOLFSSL_SYS_CA_CERTS"
    "yes" "yes;no")

 if(WOLFSSL_SYS_CA_CERTS)
-    if(APPLE)
+    if(NOT WOLFSSL_FILESYSTEM)
+        message("Can't enable system CA certs without a filesystem.")
+        override_cache(WOLFSSL_SYS_CA_CERTS "no")
+    elseif(APPLE)
        # Headers used for MacOS default system CA certs behavior. Only MacOS SDK will have this header
        check_include_file("Security/SecTrustSettings.h" HAVE_SECURITY_SECTRUSTSETTINGS_H)
        # Headers used for Apple native cert validation. All device SDKs should have these headers
@@ -2174,9 +2010,6 @@ if(WOLFSSL_SYS_CA_CERTS)
        else()
            message(FATAL_ERROR "Can't enable system CA certs without Apple Security.framework headers.")
        endif()
-    elseif(NOT WIN32 AND NOT WOLFSSL_FILESYSTEM)
-        message("Can't enable system CA certs without a filesystem.")
-        override_cache(WOLFSSL_SYS_CA_CERTS "no")
    endif()


@@ -2203,26 +2036,6 @@ if(WOLFSSL_TPM)
    override_cache(WOLFSSL_CERTEXT  "yes")
    override_cache(WOLFSSL_PKCS7    "yes")
    override_cache(WOLFSSL_AESCFB   "yes")
-    list(APPEND WOLFSSL_DEFINITIONS "-DWOLFSSL_ALLOW_ENCODING_CA_FALSE")
-endif()
-
-if(WOLFSSL_CLU)
-    override_cache(WOLFSSL_CERTGEN  "yes")
-    override_cache(WOLFSSL_CERTREQ  "yes")
-    override_cache(WOLFSSL_CERTEXT  "yes")
-    override_cache(WOLFSSL_MD5      "yes")
-    override_cache(WOLFSSL_AESCTR   "yes")
-    override_cache(WOLFSSL_KEYGEN   "yes")
-    override_cache(WOLFSSL_OPENSSLALL "yes")
-    override_cache(WOLFSSL_ED25519  "yes")
-    override_cache(WOLFSSL_SHA512   "yes")
-    override_cache(WOLFSSL_DES3     "yes")
-    override_cache(WOLFSSL_PKCS7    "yes")
-    list(APPEND WOLFSSL_DEFINITIONS "-DHAVE_OID_ENCODING" "-DWOLFSSL_NO_ASN_STRICT" "-DWOLFSSL_ALT_NAMES")
-    # Add OPENSSL_ALL definition to ensure OpenSSL compatibility functions are available
-    list(APPEND WOLFSSL_DEFINITIONS "-DOPENSSL_ALL")
-    # Remove NO_DES3 from WOLFSSL_DEFINITIONS to ensure DES3 is enabled
-    list(REMOVE_ITEM WOLFSSL_DEFINITIONS "-DNO_DES3")
 endif()

 if(WOLFSSL_AESCFB)
@@ -2484,18 +2297,6 @@ if (ENABLE_SCCACHE AND (NOT WOLFSSL_SCCACHE_ALREADY_SET_FLAG))
    endif()
 endif()

-add_option("WOLFSSL_KEYLOG_EXPORT"
-    "Enable insecure export of TLS secrets to an NSS keylog file (default: disabled)"
-    "no" "yes;no")
-if(WOLFSSL_KEYLOG_EXPORT)
-    message(WARNING "Keylog export enabled -- Sensitive key data will be stored insecurely.")
-    list(APPEND WOLFSSL_DEFINITIONS
-        "-DSHOW_SECRETS"
-        "-DHAVE_SECRET_CALLBACK"
-        "-DWOLFSSL_SSLKEYLOGFILE"
-        "-DWOLFSSL_KEYLOG_EXPORT_WARNED")
-endif()
-

 file(REMOVE ${OPTION_FILE})

@@ -2729,67 +2530,16 @@ if(WOLFSSL_EXAMPLES)
        tests/api/test_poly1305.c
        tests/api/test_chacha20_poly1305.c
        tests/api/test_camellia.c
-        tests/api/test_arc4.c
+        # ARC4 implementation has been removed
        tests/api/test_rc2.c
        tests/api/test_aes.c
        tests/api/test_ascon.c
        tests/api/test_sm4.c
        tests/api/test_wc_encrypt.c
-        tests/api/test_random.c
-        tests/api/test_wolfmath.c
-        tests/api/test_rsa.c
-        tests/api/test_dsa.c
-        tests/api/test_dh.c
-        tests/api/test_ecc.c
-        tests/api/test_sm2.c
-        tests/api/test_curve25519.c
-        tests/api/test_ed25519.c
-        tests/api/test_curve448.c
-        tests/api/test_ed448.c
        tests/api/test_mlkem.c
-        tests/api/test_mldsa.c
-        tests/api/test_signature.c
        tests/api/test_dtls.c
        tests/api/test_ocsp.c
        tests/api/test_evp.c
-        tests/api/test_tls_ext.c
-        tests/api/test_tls.c
-        tests/api/test_x509.c
-        tests/api/test_asn.c
-        tests/api/test_pkcs7.c
-        tests/api/test_pkcs12.c
-        tests/api/test_ossl_asn1.c
-        tests/api/test_ossl_bio.c
-        tests/api/test_ossl_bn.c
-        tests/api/test_ossl_cipher.c
-        tests/api/test_ossl_dh.c
-        tests/api/test_ossl_dgst.c
-        tests/api/test_ossl_dsa.c
-        tests/api/test_ossl_ec.c
-        tests/api/test_ossl_ecx.c
-        tests/api/test_ossl_mac.c
-        tests/api/test_ossl_rsa.c
-        tests/api/test_ossl_sk.c
-        tests/api/test_ossl_x509.c
-        tests/api/test_ossl_x509_ext.c
-        tests/api/test_ossl_x509_name.c
-        tests/api/test_ossl_x509_pk.c
-        tests/api/test_ossl_x509_vp.c
-        tests/api/test_ossl_x509_io.c
-        tests/api/test_ossl_x509_crypto.c
-        tests/api/test_ossl_x509_acert.c
-        tests/api/test_ossl_x509_info.c
-        tests/api/test_ossl_x509_str.c
-        tests/api/test_ossl_x509_lu.c
-        tests/api/test_ossl_pem.c
-        tests/api/test_ossl_rand.c
-        tests/api/test_ossl_obj.c
-        tests/api/test_ossl_p7p12.c
-        tests/api/test_evp_digest.c
-        tests/api/test_evp_cipher.c
-        tests/api/test_evp_pkey.c
-        tests/api/test_certman.c
-        tests/api/test_tls13.c
        tests/srp.c
        tests/suites.c
        tests/w64wrapper.c
@@ -3069,16 +2819,6 @@ if(WOLFSSL_INSTALL)
        endif()
    endif()

-    # Add required frameworks for static linking on Apple platforms
-    if(APPLE AND NOT BUILD_SHARED_LIBS)
-        if(WOLFSSL_SYS_CA_CERTS)
-            list(APPEND PC_LIBS_PRIVATE "-framework CoreFoundation" "-framework Security")
-        endif()
-    endif()
-
-    # Convert lists to space-separated strings for pkg-config
-    string(JOIN " " PC_LIBS_PRIVATE ${PC_LIBS_PRIVATE})
-
    configure_file(support/wolfssl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/support/wolfssl.pc @ONLY)
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/support/wolfssl.pc
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,20 +0,0 @@
-{
-    "version": 3,
-    "cmakeMinimumRequired": {
-        "major": 3,
-        "minor": 22,
-        "patch": 0
-    },
-    "configurePresets": [
-        {
-            "name": "vs2022-x64",
-            "displayName": "Visual Studio 2022 x64",
-            "generator": "Visual Studio 17 2022",
-            "architecture": "x64",
-            "binaryDir": "${sourceDir}/build",
-            "cacheVariables": {
-                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
-            }
-        }
-    ]
-}
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -1,9 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "No-CMake",
-            "generator": "Ninja",
-            "buildCommandArgs": "echo 'No build command'"
-        }
-    ]
-}
--- a/873
+++ b/873
@@ -1,622 +1,281 @@
                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 2, June 1991

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

                            Preamble

-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.

-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.

-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.

-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.

-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.

-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
 this License.

-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.

-  13. Use with the GNU Affero General Public License.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.

-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.

-  14. Revised Versions of this License.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.

-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.

-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.

-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
+                            NO WARRANTY

-  15. Disclaimer of Warranty.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.

-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.

                     END OF TERMS AND CONDITIONS

@@ -628,15 +287,15 @@ free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
+convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

-    This program is free software: you can redistribute it and/or modify
+    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
@@ -644,31 +303,37 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 Also add information on how to contact you by electronic and paper mail.

-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:

-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.

-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:

-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,501 +1,3 @@
-# wolfSSL Release 5.8.4 (Nov. 20, 2025)
-
-Release 5.8.4 has been developed according to wolfSSL's development and QA
-process (see link below) and successfully passed the quality criteria.
-https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
-
-NOTE: * --enable-heapmath is deprecated
-            * MD5 is now disabled by default
-
-PR stands for Pull Request, and PR <NUMBER> references a GitHub pull request number where the code change was added.
-
-## Vulnerabilities
-* [Low CVE-2025-12888] Vulnerability in X25519 constant-time cryptographic implementations due to timing side channels introduced by compiler optimizations and CPU architecture limitations, specifically with the Xtensa-based ESP32 chips. If targeting Xtensa it is recommended to use the low memory implementations of X25519, which is now turned on as the default for Xtensa. Thanks to Adrian Cinal for the report. Fixed in PR 9275.
-
-
-* [Med. CVE-2025-11936] Potential DoS vulnerability due to a memory leak through multiple KeyShareEntry with the same group in malicious TLS 1.3 ClientHello messages. This affects users who are running wolfSSL on the server side with TLS 1.3. Thanks to Jaehun Lee and Kyungmin Bae, Pohang University of Science and Technology (POSTECH) for the report. Fixed in PR 9117.
-
-* [Low CVE-2025-11935] PSK with PFS (Perfect Forward Secrecy) downgrades to PSK without PFS during TLS 1.3 handshake. If the client sends a ClientHello that has a key share extension and the server responds with a ServerHello that does not have a key share extension the connection would previously continue on without using PFS. Thanks to Jaehun Lee from Pohang University of Science and Technology (POSTECH) for the report. Fixed in PR 9112.
-
-* [Low CVE-2025-11934] Signature Algorithm downgrade from ECDSA P521 to P256 during TLS 1.3 handshake. When a client sends ECDSA P521 as the supported signature algorithm the server previously could respond as ECDSA P256 being the accepted signature algorithm and the connection would continue with using ECDSA P256. Thanks to Jaehun Lee from Pohang University of Science and Technology (POSTECH) for the report. Fixed in PR 9113.
-
-
-* [Low CVE-2025-11933] DoS Vulnerability in wolfSSL TLS 1.3 CKS extension parsing. Previously duplicate CKS extensions were not rejected leading to a potential memory leak when processing a ClientHello. Thanks to Jaehun Lee from Pohang University of Science and Technology (POSTECH) for the report. Fixed in PR 9132.
-
-
-* [Low CVE-2025-11931] Integer Underflow Leads to Out-of-Bounds Access in XChaCha20-Poly1305 Decrypt. This issue is hit specifically with a call to the function wc_XChaCha20Poly1305_Decrypt() which is not used with TLS connections, only from direct calls from an application. Thanks to Luigino Camastra from Aisle Research for the report. Fixed in PR 9223.
-
-* [Low CVE-2025-11932] Timing Side-Channel in PSK Binder Verification. The server previously verified the TLS 1.3 PSK binder using a non-constant time method which could potentially leak information about the PSK binder. Thanks to Luigino Camastra from Aisle Research for the report. Fixed in PR 9223.
-
-* [Low CVE-2025-12889] With TLS 1.2 connections a client can use any digest, specifically a weaker digest, rather than those in the CertificateRequest. Thanks to Jaehun Lee from Pohang University of Science and Technology (POSTECH) for the report. Fixed in PR 9395
-
-* [Low CVE-2025-13912] When using the Clang compiler, various optimization levels or flags could result in non-constant-time compiled code. Assembly implementations of the functions in wolfSSL were not affected. The report was done specifically with Clang version 18 but there was shown to be similarities in timing variations when using the optimization levels with Clang 14 and Clang 20.
-
-On the following architectures, the expected constant-time functions were found to have potential timing variations when specific compiler flags or optimization levels were used.
-
-AArch64: Using O3, Ofast, or --enable-nontrivial-unswitch with O1/O2 flags leads to possible timing variations with the software implementations of sp_read_radix, sp_div_2_mod_ct, and sp_addmod_ct. Using O3, O2, Ofast, Os, or Oz with --unroll-force-peel-count=50 leads to possible timing variations with wc_AesGcmDecrypt.
-
-RISC-V: TLS HMAC update/final operations, RSA unpad operations, and DH key pair generation with O1, O2, O3, Ofast, Oz, or Os. wc_AesGcmDecrypt and wc_Chacha_Process with O1, O2, O3, Os, or Ofast. Also SP software operations sp_div_2_mod_ct and sp_addmod_ct using O3 or Ofast.
-
-
-X86_64: TLS HMAC update/final operations and TimingVerifyPad used with verifying the TLS MAC with --fast-isel or --x86-cmov-converter-force-all compile flags. RSA unpad operations, ECC mulmod, and wc_Chacha_Process with the --x86-cmov-converter-force-all flag. DH key agreement, sp_div_2_mod_ct and sp_addmod_ct with O1, O2, O3, Os, or Ofast. wc_AesGcmDecrypt with the compiler flags O2, O3, Os, Ofast, Oz --x86-cmov-converter-force-all | --unroll-force-peel-count=50, or O1 --x86-cmov-converter-force-all.
-
-Thanks to Jing Liu, Zhiyuan Zhang, LUCÍA MARTÍNEZ GAVIER, Gilles Barthe, Marcel Böhme from Max Planck Institute for Security and Privacy (MPI-SP) for the report. Fixed in PR 9148.
-
-## New Features
-* New ML-KEM / ML-DSA APIs and seed/import PKCS8 support; added _new/_delete APIs for ML-KEM/ML-DSA. (PR 9039, 9000, 9049)
-* Initial wolfCrypt FreeBSD kernel module support (PR 9392)
-* Expanded PKCS7/CMS capabilities: decode SymmetricKeyPackage / OneSymmetricKey, add wc_PKCS7_GetEnvelopedDataKariRid, and allow PKCS7 builds with AES keywrap unset. (PR 9018, 9029, 9032)
-* Add custom AES key wrap/unwrap callbacks and crypto callback copy/free operations. (PR 9002, 9309)
-* Add support for certificate_authorities extension in ClientHello and certificate manager CA-type selection/unloading. (PR 9209, 9046)
-* Large expansion of Rust wrapper modules: random, aes, rsa, ecc, dh, sha, hmac, cmac, ed25519/ed448, pbkdf2/PKCS#12, kdf/prf, SRTP KDFs, and conditional compilation options. (PR 9191, 9212, 9273, 9306, 9320, 9328, 9368, 9389, 9357, 9433)
-* Rust: support optional heap and dev_id parameters and enable conditional compilation based on C build options. (PR 9407, 9433)
-* STM32 fixes (benchmarking and platform fixes) and PSoC6 hardware acceleration additions. (PR 9228, 9256, 9185)
-* STM32U5 added support for SAES and DHUK. (PR 9087)
-* Add --enable-curl=tiny option for a smaller build when used with cURL. (PR 9174)
-
-## Improvements / Optimizations
-* Regression test fixes and expansion: TLS 1.3/1.2 tests, ARDUINO examples, libssh2 tests, hostap workflows, and nightly test improvements. (PR 9096, 9141, 9091, 9122, 9388)
-* Improved test ordering and CI test stability (random tests run order changes, FIPS test fixes). (PR 9204, 9257)
-* Docs and readme fixes, docstring updates, AsconAEAD comment placement, and example certificate renewals. (PR 9131, 9293, 9262, 9429)
-* Updated GPL exception lists (GPLv2 and GPLv3 exception updates: add Fetchmail and OpenVPN). (PR 9398, 9413)
-* Introduced WOLFSSL_DEBUG_CERTS and additional debug/logging refinements. (PR 8902, 9055)
-* Expanded crypto-callback support (SHA family, HKDF, SHA-224, sha512_family digest selection) and improved crypto-only build cases. (PR 9070, 9252, 9271, 9100, 9194)
-* AES & HW offload improvements including AES-CTR support in PKCS11 driver and AES ECB offload sizing fix. (PR 9277, 9364)
-* ESP32: PSRAM allocator support and SHA HW fixes for ESP-IDF v6/v5. (PR 8987, 9225, 9264)
-* Renesas FSP / RA examples updated and security-module TLS context improvements. (PR 9047, 9010, 9158, 9150)
-* Broad configure/CMake/Autotools workflow improvements (Apple options tracking, Watcom pinning, Debian packaging, ESP-IDF pinning). (PR 9037, 9167, 9161, 9264)
-* New assembly introspection / performance helpers for RISC-V and PPC32; benchmarking enhancements (cycle counts). (PR 9101, 9317)
-* Update to SGX build for using assembly optimizations. (PR 8463, 9138)
-* Testing with Fil-C compiler version to 0.674 (PR 9396)
-* Refactors and compressing of small stack code (PR 9153)
-
-## Bug Fixes
-* Removed the test feature using popen when defining the macro WOLFSSL_USE_POPEN_HOST and not having HAVE_GETADDRINFO defined, along with having the macro HAVE_HTTP_CLIENT set. There was the potential for vulnerable behavior with the use of popen when the API wolfSSL_BIO_new_connect() was called with this specific build. This exact build configuration is only intended for testing with QEMU and is not enabled with any autoconf/cmake flags. Thanks to linraymond2006 for the report. (PR 9038)
-* Fix for C# wrapper Ed25519 potential crash and heap overwrite with raw public key import when using the API Ed25519ImportPublic.This was a broken API with the C# wrapper that would crash on use. Thanks to Luigino Camastra from Aisle Research for the bug report. (PR 9291)
-* Coverity, cppcheck, MISRA, clang-tidy, ZeroPath and other static-analysis driven fixes across the codebase. (PR 9006, 9078, 9068, 9265, 9324)
-* TLS 1.2/DTLS improvements: client message order checks, DTLS cookie/exchange and replay protections, better DTLS early-data handling. (PR 9387, 9253, 9205, 9367)
-* Improved X.509 & cert handling: allow larger pathLen in Basic Constraints, restore inner server name for ECH, retrying cert candidate chains. (PR 8890, 9234, 8692)
-* Sniffer robustness: fix infinite recursion, better handling of OOO appData and partial overlaps, and improved retransmission detection. (PR 9051, 9106, 9140, 9094)
-* Numerous linuxkm (kernel-mode) fixes, relocation/PIE normalization, and FIPS-related build tweaks across many iterations. (PR 9025, 9035, 9067, 9111, 9121)
-* ML-KEM/Kyber and ML-DSA fixes for out-of-bounds and seed-import correctness; multiple ML-related safety fixes. (PR 9142, 9105, 9439)
-* Avoid uninitialized-variable and GCC warnings; several fixes for undefined-shift/overflow issues. (PR 9020, 9372, 9195)
-* Memory & leak fixes in X509 verification and various struct sizing fixes for WOLFSSL_NO_MALLOC usage. (PR 9258, 9036)
-* Fixed RSA / signing / verify-only warnings allowing WOLFSSL_NO_CT_OPS when WOLFSSL_RSA_VERIFY_ONLY is used and API cleanups for using const. (PR 9031, 9263)
-
-
-# wolfSSL Release 5.8.2 (July 17, 2025)
-
-Release 5.8.2 has been developed according to wolfSSL's development and QA
-process (see link below) and successfully passed the quality criteria.
-https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
-
-NOTE: * wolfSSL is now GPLv3 instead of GPLv2
-            * --enable-heapmath is deprecated
-            * MD5 is now disabled by default
-
-
-PR stands for Pull Request, and PR (NUMBER) references a GitHub pull request number where the code change was added.
-
-## Vulnerabilities
-
-* [Low] There is the potential for a fault injection attack on ECC and Ed25519 verify operations. In versions of wolfSSL 5.7.6 and later the --enable-faultharden option is available to help mitigate against potential fault injection attacks. The mitigation added in wolfSSL version 5.7.6 is to help harden applications relying on the results of the verify operations, such as when used with wolfBoot. If doing ECC or Ed25519 verify operations on a device at risk for fault injection attacks then --enable-faultharden could be used to help mitigate it. Thanks to Kevin from Fraunhofer AISEC for the report.
-
-Hardening option added in PR https://github.com/wolfSSL/wolfssl/pull/8289
-
-
-* [High CVE-2025-7395] When using WOLFSSL_SYS_CA_CERTS and WOLFSSL_APPLE_NATIVE_CERT_VALIDATION on an Apple platform, the native trust store verification routine overrides errors produced elsewhere in the wolfSSL certificate verification process including failures due to hostname matching/SNI, OCSP, CRL, etc. This allows any trusted cert chain to override other errors detected during chain verification that should have resulted in termination of the TLS connection. If building wolfSSL on versions after 5.7.6 and before 5.8.2 with use of the system CA support and the apple native cert validation feature enabled on Apple devices (on by default for non-macOS Apple targets when using autotools or CMake) we recommend updating to the latest version of wolfSSL. Thanks to Thomas Leong from ExpressVPN for the report.
-
-Fixed in PR https://github.com/wolfSSL/wolfssl/pull/8833
-
-
-* [Med. CVE-2025-7394] In the OpenSSL compatibility layer implementation, the function RAND_poll() was not behaving as expected and leading to the potential for predictable values returned from RAND_bytes() after fork() is called. This can lead to weak or predictable random numbers generated in applications that are both using RAND_bytes() and doing fork() operations. This only affects applications explicitly calling RAND_bytes() after fork() and does not affect any internal TLS operations. Although RAND_bytes() documentation in OpenSSL calls out not being safe for use with fork() without first calling RAND_poll(), an additional code change was also made in wolfSSL to make RAND_bytes() behave similar to OpenSSL after a fork() call without calling RAND_poll(). Now the Hash-DRBG used gets reseeded after detecting running in a new process. If making use of RAND_bytes() and calling fork() we recommend updating to the latest version of wolfSSL. Thanks to Per Allansson from Appgate for the report.
-
-Fixed in the following PR’s
-https://github.com/wolfSSL/wolfssl/pull/8849
-https://github.com/wolfSSL/wolfssl/pull/8867
-https://github.com/wolfSSL/wolfssl/pull/8898
-
-
-
-* [Low CVE-2025-7396] In wolfSSL 5.8.0 the option of hardening the C implementation of Curve25519 private key operations was added with the addition of blinding support (https://www.wolfssl.com/curve25519-blinding-support-added-in-wolfssl-5-8-0/). In wolfSSL release 5.8.2 that blinding support is turned on by default in applicable builds. The blinding configure option is only for the base C implementation of Curve25519. It is not needed, or available with; ARM assembly builds, Intel assembly builds, and the small Curve25519 feature. While the attack would be very difficult to execute in practice, enabling blinding provides an additional layer of protection for devices that may be more susceptible to physical access or side-channel observation. Thanks to Arnaud Varillon, Laurent Sauvage, and Allan Delautre from Telecom Paris for the report.
-
-Blinding enabled by default in PR https://github.com/wolfSSL/wolfssl/pull/8736
-
-
-## New Features
-* Multiple sessions are now supported in the sniffer due to the removal of a cached check. (PR #8723)
-* New API ssl_RemoveSession() has been implemented for sniffer cleanup operations. (PR #8768)
-* The new ASN X509 API, `wc_GetSubjectPubKeyInfoDerFromCert`, has been introduced for retrieving public key information from certificates. (PR #8758)
-* `wc_PKCS12_create()` has been enhanced to support PBE_AES(256|128)_CBC key and certificate encryptions. (PR #8782, PR #8822, PR #8859)
-* `wc_PKCS7_DecodeEncryptedKeyPackage()` has been added for decoding encrypted key packages. (PR #8976)
-* All AES, SHA, and HMAC functionality has been implemented within the Linux Kernel Module. (PR #8998)
-* Additions to the compatibility layer have been introduced for X.509 extensions and RSA PSS. Adding the API i2d_PrivateKey_bio, BN_ucmp and X509v3_get_ext_by_NID. (PR #8897)
-* Added support for STM32N6. (PR #8914)
-* Implemented SHA-256 for PPC 32 assembly. (PR #8894)
-
-## Improvements / Optimizations
-
-### Linux Kernel Module (LinuxKM) Enhancements
-* Registered DH and FFDHE for the Linux Kernel Module. (PR #8707)
-* Implemented fixes for standard RNG in the Linux Kernel Module. (PR #8718)
-* Added an ECDSA workaround for the Linux Kernel Module. (PR #8727)
-* Added more PKCS1 pad SHA variants for RSA in the Linux Kernel Module. (PR #8730)
-* Set default priority to 100000 for LKCAPI in the Linux Kernel Module. (PR #8740)
-* Ensured ECDH never has FIPS enabled in the Linux Kernel Module. (PR #8751)
-* Implemented further Linux Kernel Module and SP tweaks. (PR #8773)
-* Added sig_alg support for Linux 6.13 RSA in the Linux Kernel Module. (PR #8796)
-* Optimized wc_linuxkm_fpu_state_assoc. (PR #8828)
-* Ensured DRBG is multithread-round-1 in the Linux Kernel Module. (PR #8840)
-* Prevented toggling of fips_enabled in the Linux Kernel Module. (PR #8873)
-* Refactored drbg_ctx clear in the Linux Kernel Module. (PR #8876)
-* Set sig_alg max_size and digest_size callbacks for RSA in the Linux Kernel Module. (PR #8915)
-* Added get_random_bytes for the Linux Kernel Module. (PR #8943)
-* Implemented distro fix for the Linux Kernel Module. (PR #8994)
-* Fixed page-flags-h in the Linux Kernel Module. (PR #9001)
-* Added MODULE_LICENSE for the Linux Kernel Module. (PR #9005)
-
-### Post-Quantum Cryptography (PQC) & Asymmetric Algorithms
-* Kyber has been updated to the MLKEM ARM file for Zephyr (PR #8781)
-* Backward compatibility has been implemented for ML_KEM IDs (PR #8827)
-* ASN.1 is now ensured to be enabled when only building PQ algorithms (PR #8884)
-* Building LMS with verify-only has been fixed (PR #8913)
-* Parameters for LMS SHA-256_192 have been corrected (PR #8912)
-* State can now be saved with the private key for LMS (PR #8836)
-* Support for OpenSSL format has been added for ML-DSA/Dilithium (PR #8947)
-* `dilithium_coeff_eta2[]` has been explicitly declared as signed (PR #8955)
-
-### Build System & Portability
-* Prepared for the inclusion of v5.8.0 in the Ada Alire index. (PR #8714)
-* Introduced a new build option to allow reuse of the Windows crypt provider handle. (PR #8706)
-* Introduced general fixes for various build configurations. (PR #8763)
-* Made improvements for portability using older GCC 4.8.2. (PR #8753)
-* Macro guards updated to allow tests to build with opensslall and no server. (PR #8776)
-* Added a check for STDC_NO_ATOMICS macro before use of atomics. (PR #8885)
-* Introduced CMakePresets.json and CMakeSettings.json. (PR #8905)
-* Added an option to not use constant time code with min/max. (PR #8830)
-* Implemented proper MacOS dispatch for conditional signal/wait. (PR #8928)
-* Disabled MD5 by default for both general and CMake builds. (PR #8895, PR #8948)
-* Improved to allow building OPENSSL_EXTRA without KEEP_PEER_CERT. (PR #8926)
-* Added introspection for Intel and ARM assembly speedups. (PR #8954)
-* Fixed cURL config to set HAVE_EX_DATA and HAVE_ALPN. (PR #8973)
-* Moved FREESCALE forced algorithm HAVE_ECC to IDE/MQX/user_settings.h. (PR #8977)
-
-### Testing & Debugging
-* Fixed the exit status for testwolfcrypt. (PR #8762)
-* Added WOLFSSL_DEBUG_PRINTF and WOLFSSL_DEBUG_CERTIFICATE_LOADS for improved debugging output. (PR #8769, PR #8770)
-* Guarded some benchmark tests with NO_SW_BENCH. (PR #8760)
-* Added an additional unit test for wolfcrypt PKCS12 file to improve code coverage. (PR #8831)
-* Added an additional unit test for increased DH code coverage. (PR #8837)
-* Adjusted for warnings with NO_TLS build and added GitHub actions test. (PR #8851)
-* Added additional compatibility layer RAND tests. (PR #8852)
-* Added an API unit test for checking domain name. (PR #8863)
-* Added bind v9.18.33 testing. (PR #8888)
-* Fixed issue with benchmark help options and descriptions not lining up. (PR #8957)
-
-### Certificates & ASN.1
-* Changed the algorithm for sum in ASN.1 OIDs. (PR #8655)
-* Updated PKCS7 to use X509 STORE for internal verification. (PR #8748)
-* Improved handling of temporary buffer size for X509 extension printing. (PR #8710)
-* Marked IP address as WOLFSSL_V_ASN1_OCTET_STRING for ALT_NAMES_OID. (PR #8842)
-* Fixed printing empty names in certificates. (PR #8880)
-* Allowed CA:FALSE on wolftpm. (PR #8925)
-* Fixed several inconsistent function prototype parameter names in wc/asn. (PR #8949)
-* Accounted for custom extensions when creating a Cert from a WOLFSSL_X509. (PR #8960)
-
-### TLS/DTLS & Handshake
-* Checked group correctness outside of TLS 1.3 too for TLSX_UseSupportedCurve. (PR #8785)
-* Dropped records that span datagrams in DTLS. (PR #8642)
-* Implemented WC_NID_netscape_cert_type. (PR #8800)
-* Refactored GetHandshakeHeader/GetHandShakeHeader into one function. (PR #8787)
-* Correctly set the current peer in dtlsProcessPendingPeer. (PR #8848)
-* Fixed set_groups for TLS. (PR #8824)
-* Allowed trusted_ca_keys with TLSv1.3. (PR #8860)
-* Moved Dtls13NewEpoch into DeriveTls13Keys. (PR #8858)
-* Cleared tls1_3 on downgrade. (PR #8861)
-* Always sent ACKs on detected retransmission for DTLS1.3. (PR #8882)
-* Removed DTLS from echo examples. (PR #8889)
-* Recalculated suites at SSL initialization. (PR #8757)
-* No longer using BIO for ALPN. (PR #8969)
-* Fixed wolfSSL_BIO_new_connect's handling of IPV6 addresses. (PR #8815)
-* Memory Management & Optimizations
-* Performed small stack refactors, improved stack size with mlkem and dilithium, and added additional tests. (PR #8779)
-* Implemented FREE_MP_INT_SIZE in heap math. (PR #8881)
-* Detected correct MAX_ENCODED_SIG_SZ based on max support in math lib. (PR #8931)
-* Fixed improper access of sp_int_minimal using sp_int. (PR #8985)
-
-### Cryptography & Hash Functions
-* Implemented WC_SIPHASH_NO_ASM for not using assembly optimizations with siphash. (PR #8789, PR #8791)
-* Added missing DH_MAX_SIZE define for FIPS and corrected wolfssl.rc FILETYPE to VFT_DLL. (PR #8794)
-* Implemented WC_SHA3_NO_ASM for not using assembly with SHA3. (PR #8817)
-* Improved Aarch64 XFENCE. (PR #8832)
-* Omitted frame pointer for ARM32/Thumb2/RISC-V 64 assembly. (PR #8893)
-* Fixed branch instruction in ARMv7a ASM. (PR #8933)
-* Enabled EVP HMAC to work with WOLFSSL_HMAC_COPY_HASH. (PR #8944)
-* Platform-Specific & Hardware Integration
-* Added HAVE_HKDF for wolfssl_test and explicit support for ESP32P4. (PR #8742)
-* Corrected Espressif default time setting. (PR #8829)
-* Made wc_tsip_* APIs public. (PR #8717)
-* Improved PlatformIO Certificate Bundle Support. (PR #8847)
-* Fixed the TSIP TLS example program. (PR #8857)
-* Added crypto callback functions for TROPIC01 secure element. (PR #8812)
-* Added Renesas RX TSIP AES CTR support. (PR #8854)
-* Fixed TSIP port using crypto callback. (PR #8937)
-
-### General Improvements & Refactoring
-* Attempted wolfssl_read_bio_file in read_bio even when XFSEEK is available. (PR #8703)
-* Refactored GetHandshakeHeader/GetHandShakeHeader into one function. (PR #8787)
-* Updated libspdm from 3.3.0 to 3.7.0. (PR #8906)
-* Fixed missing dashes on the end of header and footer for Falcon PEM key. (PR #8904)
-* Fixed minor code typos for macos signal and types.h max block size. (PR #8934)
-* Make the API wolfSSL_X509_STORE_CTX_get_error accessible to more build configurations for ease of getting the "store" error code and depth with certificate failure callback implementations. (PR #8903)
-
-## Bug Fixes
-* Fixed issues to support _WIN32_WCE (VS 2008 with WinCE 6.0/7.0). (PR #8709)
-* Fixed STM32 Hash with IRQ enabled. (PR #8705)
-* Fixed raw hash when using crypto instructions on RISC-V 64-bit. (PR #8733)
-* Fixed ECDH decode secret in the Linux Kernel Module. (PR #8729)
-* Passed in the correct hash type to wolfSSL_RSA_verify_ex. (PR #8726)
-* Fixed issues for Intel QuickAssist latest driver (4.28). (PR #8728)
-* Speculative fix for CodeSonar overflow issue in ssl_certman.c. (PR #8715)
-* Fixed Arduino progmem print and AVR WOLFSSL_USER_IO. (PR #8668)
-* Correctly advanced the index in wc_HKDF_Expand_ex. (PR #8737)
-* Fixed STM32 hash status check logic, including NO_AES_192 and NO_AES_256. (PR #8732)
-* Added missing call to wolfSSL_RefFree in FreeCRL to prevent memory leaks. (PR #8750)
-* Fixed sanity check on --group with unit test app and null sanity check with des decrypt. (PR #8711)
-* Fixed Curve25519 and static ephemeral issue with blinding. (PR #8766)
-* Fixed edge case issue with STM32 AES GCM auth padding. (PR #8745)
-* Removed redefinition of MlKemKey and fixed build issue in benchmark. (PR #8755)
-* Used proper heap hint when freeing CRL in error case. (PR #8713)
-* Added support for no malloc with wc_CheckCertSigPubKey. (PR #8725)
-* Fixed C# wrapper Release build. (PR #8802)
-* Handled malformed CCS and CCS before CH in TLS1.3. (PR #8788)
-* Fixed ML-DSA with WOLFSSL_DILITHIUM_NO_SIGN. (PR #8798)
-* Fixed AesGcmCrypt_1 no-stream in the Linux Kernel Module. (PR #8814)
-* Fixed return value usage for crypto_sig_sign in the Linux Kernel Module. (PR #8816)
-* Fixed issue with CSharp and Windows CE with conversion of ASCII and Unicode. (PR #8799)
-* Fixed Renesas SCE on RA6M4. (PR #8838)
-* Fixed tests for different configs for ML-DSA. (PR #8865)
-* Fixed bug in ParseCRL_Extensions around the size of a CRL number handled and CRL number OID. (PR #8587)
-* Fixed uninitialized wc_FreeRng in prime_test. (PR #8886)
-* Fixed ECC configuration issues with ECC verify only and no RNG. (PR #8901)
-* Fixed issues with max size, openssl.test netcat, and clang-tidy. (PR #8909)
-* Fixed for casting down and uninit issues in Dilithium/ML-DSA. (PR #8868)
-* Fixed memory allocation failure testing and related unit test cases. (PR #8945, PR #8952)
-* Fixed build issue with ML-DSA 44 only. (PR #8981)
-* Fixed possible memory leak with X509 reference counter when using x509small. (PR #8982)
-
-
-# wolfSSL Release 5.8.0 (Apr 24, 2025)
-
-Release 5.8.0 has been developed according to wolfSSL's development and QA
-process (see link below) and successfully passed the quality criteria.
-https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
-
-NOTE: * --enable-heapmath is deprecated
-
-PR stands for Pull Request, and PR (NUMBER) references a GitHub pull request
- number where the code change was added.
-
-
-## New Feature Additions
-* Algorithm registration in the Linux kernel module for all supported FIPS AES,
- SHA, HMAC, ECDSA, ECDH, and RSA modes, key sizes, and digest sizes.
-* Implemented various fixes to support building for Open Watcom including OS/2
- support and Open Watcom 1.9 compatibility (PR 8505, 8484)
-* Added support for STM32H7S (tested on NUCLEO-H7S3L8) (PR 8488)
-* Added support for STM32WBA (PR 8550)
-* Added Extended Master Secret Generation Callback to the --enable-pkcallbacks
- build (PR 8303)
-* Implement AES-CTS (configure flag --enable-aescts) in wolfCrypt (PR 8594)
-* Added support for libimobiledevice commit 860ffb (PR 8373)
-* Initial ASCON hash256 and AEAD128 support based on NIST SP 800-232 IPD
- (PR 8307)
-* Added blinding option when using a Curve25519 private key by defining the
- macro WOLFSSL_CURVE25519_BLINDING (PR 8392)
-
-
-## Linux Kernel Module
-* Production-ready LKCAPI registration for cbc(aes), cfb(aes), gcm(aes),
- rfc4106 (gcm(aes)), ctr(aes), ofb(aes), and ecb(aes), ECDSA with P192, P256,
- P384, and P521 curves, ECDH with P192, P256, and P384 curves, and RSA with
- bare and PKCS1 padding
-* Various fixes for LKCAPI wrapper for AES-CBC and AES-CFB (PR 8534, 8552)
-* Adds support for the legacy one-shot AES-GCM back end (PR 8614, 8567) for
- compatibility with FIPS 140-3 Cert #4718.
-* On kernel >=6.8, for CONFIG_FORTIFY_SOURCE, use 5-arg fortify_panic() override
- macro (PR 8654)
-* Update calls to scatterwalk_map() and scatterwalk_unmap() for linux commit
- 7450ebd29c (merged for Linux 6.15) (PR 8667)
-* Inhibit LINUXKM_LKCAPI_REGISTER_ECDH on kernel <5.13 (PR 8673)
-* Fix for uninitialized build error with fedora (PR 8569)
-* Register ecdsa, ecdh, and rsa for use with linux kernel crypto (PR 8637, 8663,
- 8646)
-* Added force zero shared secret buffer, and clear of old key with ecdh
- (PR 8685)
-* Update fips-check.sh script to pickup XTS streaming support on aarch64 and
- disable XTS-384 as an allowed use in FIPS mode (PR 8509, 8546)
-
-
-## Enhancements and Optimizations
-
-### Security & Cryptography
-* Add constant-time implementation improvements for encoding functions. We thank
- Zhiyuan and Gilles for sharing a new constant-time analysis tool (CT-LLVM) and
- reporting several non-constant-time implementations. (PR 8396, 8617)
-* Additional support for PKCS7 verify and decode with indefinite lengths
- (PR 8520, 834, 8645)
-* Add more PQC hybrid key exchange algorithms such as support for combinations
- with X25519 and X448 enabling compatibility with the PQC key exchange support
- in Chromium browsers and Mozilla Firefox (PR 7821)
-* Add short-circuit comparisons to DH key validation for RFC 7919 parameters
- (PR 8335)
-* Improve FIPS compatibility with various build configurations for more resource
- constrained builds (PR 8370)
-* Added option to disable ECC public key order checking (PR 8581)
-* Allow critical alt and basic constraints extensions (PR 8542)
-* New codepoint for MLDSA to help with interoperability (PR 8393)
-* Add support for parsing trusted PEM certs having the header
- “BEGIN_TRUSTED_CERT” (PR 8400)
-* Add support for parsing only of DoD certificate policy and Comodo Ltd PKI OIDs
- (PR 8599, 8686)
-* Update ssl code in `src/*.c` to be consistent with wolfcrypt/src/asn.c
- handling of ML_DSA vs Dilithium and add dual alg. test (PR 8360, 8425)
-
-### Build System, Configuration, CI & Protocols
-* Internal refactor for include of config.h and when building with
- BUILDING_WOLFSSL macro. This refactor will give a warning of “deprecated
- function” when trying to improperly use an internal API of wolfSSL in an
- external application. (PR 8640, 8647, 8660, 8662, 8664)
-* Add WOLFSSL_CLU option to CMakeLists.txt (PR 8548)
-* Add CMake and Zephyr support for XMSS and LMS (PR 8494)
-* Added GitHub CI for CMake builds (PR 8439)
-* Added necessary macros when building wolfTPM Zephyr with wolfSSL (PR 8382)
-* Add MSYS2 build continuous integration test (PR 8504)
-* Update DevKitPro doc to list calico dependency with build commands (PR 8607)
-* Conversion compiler warning fixes and additional continuous integration test
- added (PR 8538)
-* Enable DTLS 1.3 by default in --enable-jni builds (PR 8481)
-* Enabled TLS 1.3 middlebox compatibility by default for --enable-jni builds
- (PR 8526)
-
-### Performance Improvements
-* Performance improvements AES-GCM and HMAC (in/out hash copy) (PR 8429)
-* LMS fixes and improvements adding API to get Key ID from raw private key,
- change to identifiers to match standard, and fix for when
- WOLFSSL_LMS_MAX_LEVELS is 1 (PR 8390, 8684, 8613, 8623)
-* ML-KEM/Kyber improvements and fixes; no malloc builds, small memory usage,
- performance improvement, fix for big-endian (PR 8397, 8412, 8436, 8467, 8619,
- 8622, 8588)
-* Performance improvements for AES-GCM and when doing multiple HMAC operations
- (PR 8445)
-
-### Assembly and Platform-Specific Enhancements
-* Poly1305 arm assembly changes adding ARM32 NEON implementation and fix for
- Aarch64 use (PR 8344, 8561, 8671)
-* Aarch64 assembly enhancement to use more CPU features, fix for FreeBSD/OpenBSD
- (PR 8325, 8348)
-* Only perform ARM assembly CPUID checks if support was enabled at build time
- (PR 8566)
-* Optimizations for ARM32 assembly instructions on platforms less than ARMv7
- (PR 8395)
-* Improve MSVC feature detection for static assert macros (PR 8440)
-* Improve Espressif make and CMake for ESP8266 and ESP32 series (PR 8402)
-* Espressif updates for Kconfig, ESP32P4 and adding a sample user_settings.h
- (PR 8422, PR 8641)
-
-### OpenSSL Compatibility Layer
-* Modification to the push/pop to/from in OpenSSL compatibility layer. This is
- a pretty major API change in the OpenSSL compatibility stack functions.
- Previously the API would push/pop from the beginning of the list but now they
- operate on the tail of the list. This matters when using the sk_value with
- index values. (PR 8616)
-* OpenSSL Compat Layer: OCSP response improvements (PR 8408, 8498)
-* Expand the OpenSSL compatibility layer to include an implementation of
- BN_CTX_get (PR 8388)
-
-### API Additions and Modifications
-* Refactor Hpke to allow multiple uses of a context instead of just one shot
- mode (PR 6805)
-* Add support for PSK client callback with Ada and use with Alire (thanks
- @mgrojo, PR 8332, 8606)
-* Change wolfSSL_CTX_GenerateEchConfig to generate multiple configs and add
- functions wolfSSL_CTX_SetEchConfigs and wolfSSL_CTX_SetEchConfigsBase64 to
- rotate the server's echConfigs (PR 8556)
-* Added the public API wc_PkcsPad to do PKCS padding (PR 8502)
-* Add NULL_CIPHER_TYPE support to wolfSSL_EVP_CipherUpdate (PR 8518)
-* Update Kyber APIs to ML-KEM APIs (PR 8536)
-* Add option to disallow automatic use of "default" devId using the macro
- WC_NO_DEFAULT_DEVID (PR 8555)
-* Detect unknown key format on ProcessBufferTryDecode() and handle RSA-PSSk
- format (PR 8630)
-
-### Porting and Language Support
-* Update Python port to support version 3.12.6 (PR 8345)
-* New additions for MAXQ with wolfPKCS11 (PR 8343)
-* Port to ntp 4.2.8p17 additions (PR 8324)
-* Add version 0.9.14 to tested libvncserver builds (PR 8337)
-
-### General Improvements and Cleanups
-* Cleanups for STM32 AES GCM (PR 8584)
-* Improvements to isascii() and the CMake key log option (PR 8596)
-* Arduino documentation updates, comments and spelling corrections (PR 8381,
- 8384, 8514)
-* Expanding builds with WOLFSSL_NO_REALLOC for use with --enable-opensslall and
- --enable-all builds (PR 8369, 8371)
-
-
-## Fixes
-* Fix a use after free caused by an early free on error in the X509 store
- (PR 8449)
-* Fix to account for existing PKCS8 header with
- wolfSSL_PEM_write_PKCS8PrivateKey (PR 8612)
-* Fixed failing CMake build issue when standard threads support is not found in
- the system (PR 8485)
-* Fix segmentation fault in SHA-512 implementation for AVX512 targets built with
- gcc -march=native -O2 (PR 8329)
-* Fix Windows socket API compatibility warning with mingw32 build (PR 8424)
-* Fix potential null pointer increments in cipher list parsing (PR 8420)
-* Fix for possible stack buffer overflow read with wolfSSL_SMIME_write_PKCS7.
- Thanks to the team at Code Intelligence for the report. (PR 8466)
-* Fix AES ECB implementation for Aarch64 ARM assembly (PR 8379)
-* Fixed building with VS2008 and .NET 3.5 (PR 8621)
-* Fixed possible error case memory leaks in CRL and EVP_Sign_Final (PR 8447)
-* Fixed SSL_set_mtu compatibility function return code (PR 8330)
-* Fixed Renesas RX TSIP (PR 8595)
-* Fixed ECC non-blocking tests (PR 8533)
-* Fixed CMake on MINGW and MSYS (PR 8377)
-* Fixed Watcom compiler and added new CI test (PR 8391)
-* Fixed STM32 PKA ECC 521-bit support (PR 8450)
-* Fixed STM32 PKA with P521 and shared secret (PR 8601)
-* Fixed crypto callback macro guards with `DEBUG_CRYPTOCB` (PR 8602)
-* Fix outlen return for RSA private decrypt with WOLF_CRYPTO_CB_RSA_PAD
- (PR 8575)
-* Additional sanity check on r and s lengths in DecodeECC_DSA_Sig_Bin (PR 8350)
-* Fix compat. layer ASN1_TIME_diff to accept NULL output params (PR 8407)
-* Fix CMake lean_tls build (PR 8460)
-* Fix for QUIC callback failure (PR 8475)
-* Fix missing alert types in AlertTypeToString for print out with debugging
- enabled (PR 8572)
-* Fixes for MSVS build issues with PQC configure (PR 8568)
-* Fix for SE050 port and minor improvements (PR 8431, 8437)
-* Fix for missing rewind function in zephyr and add missing files for compiling
- with assembly optimizations (PR 8531, 8541)
-* Fix for quic_record_append to return the correct code (PR 8340, 8358)
-* Fixes for Bind 9.18.28 port (PR 8331)
-* Fix to adhere more closely with RFC8446 Appendix D and set haveEMS when
- negotiating TLS 1.3 (PR 8487)
-* Fix to properly check for signature_algorithms from the client in a TLS 1.3
- server (PR 8356)
-* Fix for when BIO data is less than seq buffer size. Thanks to the team at Code
- Intelligence for the report (PR 8426)
-* ARM32/Thumb2 fixes for WOLFSSL_NO_VAR_ASSIGN_REG and td4 variable declarations
- (PR 8590, 8635)
-* Fix for Intel AVX1/SSE2 assembly to not use vzeroupper instructions unless ymm
- or zmm registers are used (PR 8479)
-* Entropy MemUse fix for when block size less than update bits (PR 8675)
-
-
 # wolfSSL Release 5.7.6 (Dec 31, 2024)

 Release 5.7.6 has been developed according to wolfSSL's development and QA
@@ -510,7 +12,7 @@ NOTE:
 user_settings.h.


-PR stands for Pull Request, and PR (NUMBER) references a GitHub pull request
+PR stands for Pull Request, and PR <NUMBER> references a GitHub pull request
 number where the code change was added.


@@ -630,7 +132,7 @@ https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assur

 NOTE: * --enable-heapmath is being deprecated and will be removed by end of 2024

-PR stands for Pull Request, and PR (NUMBER) references a GitHub pull request
+PR stands for Pull Request, and PR <NUMBER> references a GitHub pull request
 number where the code change was added.


--- a/Docker/packaging/debian/Dockerfile
+++ b/Docker/packaging/debian/Dockerfile
@@ -2,4 +2,5 @@ FROM debian:latest

 RUN apt-get -y update
 RUN apt-get -y upgrade
-RUN apt-get install -y build-essential autoconf gawk debhelper lintian dpkg-dev
+RUN apt-get install -y build-essential autoconf gawk debhelper lintian
+
--- a/IDE/ARDUINO/README.md
+++ b/IDE/ARDUINO/README.md
@@ -1,20 +1,9 @@
 # wolfSSL with Arduino

-See the [example sketches](https://github.com/wolfSSL/wolfssl-examples/tree/master/Arduino):
+See the [example sketches](./sketches/README.md):

-Bare-bones templates:
-
- [sketches/wolfssl_version](https://github.com/wolfSSL/wolfssl-examples/tree/master/Arduino/sketches/wolfssl_version/README.md) single file.
- [sketches/template](https://github.com/wolfSSL/wolfssl-examples/tree/master/Arduino/sketches/template/README.md) multiple file example.
-
-Functional examples:
- [sketches/wolfssl_AES_CTR](https://github.com/wolfSSL/wolfssl-examples/tree/master/Arduino/sketches/wolfssl_AES_CTR/README.md) AES CTR Encrypt / decrypt.
- [sketches/wolfssl_client](https://github.com/wolfSSL/wolfssl-examples/tree/master/Arduino/sketches/wolfssl_client/README.md) TLS Client.
- [sketches/wolfssl_server](https://github.com/wolfSSL/wolfssl-examples/tree/master/Arduino/sketches/wolfssl_server/README.md) TLS Server.
- [sketches/wolfssl_client_dtls](https://github.com/wolfSSL/wolfssl-examples/tree/master/Arduino/sketches/wolfssl_client_dtls/README.md) DTLS Client.
- [sketches/wolfssl_server_dtls](https://github.com/wolfSSL/wolfssl-examples/tree/master/Arduino/sketches/wolfssl_server_dtls/README.md) DTLS Server.
-
-Both the `template` and `wolfssl_AES_CTR` examples include VisualGDB project files.
+- [sketches/wolfssl_server](./sketches/wolfssl_server/README.md)
+- [sketches/wolfssl_client](./sketches/wolfssl_client/README.md)

 When publishing a new version to the Arduino Registry, be sure to edit `WOLFSSL_VERSION_ARUINO_SUFFIX` in the `wolfssl-arduino.sh` script.

@@ -73,7 +62,7 @@ from within the `wolfssl/IDE/ARDUINO` directory:

 1. `./wolfssl-arduino.sh`
    - Creates an Arduino Library directory structure in the local `wolfSSL` directory of `IDE/ARDUINO`.
-    - You can add your own `user_settings.h`, or copy/rename the [default](https://github.com/wolfSSL/wolfssl/blob/master/examples/configs/user_settings_arduino.h).
+    - You can add your own `user_settings.h`, or copy/rename the [default](../../examples/configs/user_settings_arduino.h).

 2. `./wolfssl-arduino.sh INSTALL` (The most common option)
    - Creates an Arduino Library in the local `wolfSSL` directory
--- a/IDE/ARDUINO/include.am
+++ b/IDE/ARDUINO/include.am
@@ -2,32 +2,16 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root

-# Library files:
 EXTRA_DIST+= IDE/ARDUINO/README.md
-
-# There's an Arduino-specific Arduino_README_prepend.md that will be prepended to wolfSSL README.md
-# Not to be confused with the interim PREPENDED_README.md that is created by script.
 EXTRA_DIST+= IDE/ARDUINO/Arduino_README_prepend.md
-
-# Core library files
-EXTRA_DIST+= IDE/ARDUINO/wolfssl.h
-EXTRA_DIST+= IDE/ARDUINO/wolfssl.h
-EXTRA_DIST+= IDE/ARDUINO/wolfssl-arduino.cpp
-
 EXTRA_DIST+= IDE/ARDUINO/keywords.txt
 EXTRA_DIST+= IDE/ARDUINO/library.properties.template
-
-# Sketch Examples
 EXTRA_DIST+= IDE/ARDUINO/sketches/README.md
-
-# wolfssl_client example sketch
 EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_client/README.md
-
-# wolfssl_server example sketch
+EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino
 EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_server/README.md
-
-# wolfssl_version example sketch
+EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino
 EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_version/README.md
-
-# Publishing script, either local install or to github.com/wolfSSL/Arduino-wolfSSL clone directory.
+EXTRA_DIST+= IDE/ARDUINO/sketches/wolfssl_version/wolfssl_version.ino
+EXTRA_DIST+= IDE/ARDUINO/wolfssl.h
 EXTRA_DIST+= IDE/ARDUINO/wolfssl-arduino.sh
--- a/IDE/ARDUINO/sketches/README.md
+++ b/IDE/ARDUINO/sketches/README.md
@@ -1,20 +1,15 @@
 # wolfSSL Arduino Examples

-There are currently five example Arduino sketches:
+There are currently two example Arduino sketches:

-NOTE: Moving; See https://github.com/wolfSSL/wolfssl-examples/pull/499
-
-* `template`: Reference template wolfSSL example, including optional VisualGDB project files.
-* `wolfssl_AES_CTR`: Basic AES CTR Encryption / Decryption example.
-* `wolfssl_client`: Basic TLS listening client.
-* `wolfssl_server`: Basic TLS server.
-* `wolfssl_version`: Bare-bones wolfSSL example.
+* [wolfssl_client](./wolfssl_client/README.md): Basic TLS listening client.
+* [wolfssl_server](./wolfssl_server/README.md): Basic TLS server.

 Examples have been most recently confirmed operational on the
 [Arduino IDE](https://www.arduino.cc/en/software) 2.2.1.

 For examples on other platforms, see the [IDE directory](https://github.com/wolfssl/wolfssl/tree/master/IDE).
-Additional wolfssl examples can be found at [wolfSSL/wolfssl-examples](https://github.com/wolfSSL/wolfssl-examples/).
+Additional examples can be found on [wolfSSL/wolfssl-examples](https://github.com/wolfSSL/wolfssl-examples/).

 ## Using wolfSSL

@@ -25,7 +20,7 @@ The typical include will look something like this:

 /* wolfSSL user_settings.h must be included from settings.h
  * Make all configurations changes in user_settings.h
-  * Do not edit wolfSSL `settings.h` or `config.h` files.
+  * Do not edit wolfSSL `settings.h` or `configh.h` files.
  * Do not explicitly include user_settings.h in any source code.
  * Each Arduino sketch that uses wolfSSL must have: #include "wolfssl.h"
  * C/C++ source files can use: #include <wolfssl/wolfcrypt/settings.h>
@@ -33,43 +28,7 @@ The typical include will look something like this:
  * The wolfSSL "settings.h" must appear before any other wolfSSL include.
  */
 #include <wolfssl.h>
-
-/* settings.h is typically included in wolfssl.h, but here as a reminder: */
-#include <wolfssl/wolfcrypt/settings.h>
-
-/* Any other wolfSSL includes follow:*
 #include <wolfssl/version.h>
 ```

-## Configuring wolfSSL
-
-See the `user_settings.h` in the Arduino library `wolfssl/src` directory. For Windows users this is typically:
-
-```
-C:\Users\%USERNAME%\Documents\Arduino\libraries\wolfssl\src
-```
-
-WARNING: Changes to the library `user_settings.h` file will be lost when upgrading wolfSSL using the Arduino IDE.
-
-## Troubleshooting
-
-If compile problems are encountered, for example:
-
-```
-ctags: cannot open temporary file : File exists
-exit status 1
-
-Compilation error: exit status 1
-```
-
-Try deleting the Arduino cache directory:
-
-```
-C:\Users\%USERNAME%\AppData\Local\arduino\sketches
-```
-
-For VisualGDB users, delete the project `.vs`, `Output`, and `TraceReports` directories.
-
-## More Information
-
 For more details, see [IDE/ARDUINO/README.md](https://github.com/wolfSSL/wolfssl/blob/master/IDE/ARDUINO/README.md)
--- a/IDE/ARDUINO/sketches/wolfssl_client/README.md
+++ b/IDE/ARDUINO/sketches/wolfssl_client/README.md
@@ -1,14 +1,6 @@
 # Arduino Basic TLS Listening Client

-Open the `wolfssl_client.ino` file in the Arduino IDE.
-
-NOTE: Moving; See https://github.com/wolfSSL/wolfssl-examples/pull/499
-
-If using WiFi, be sure to set `ssid` and `password` values.
-
-May need "Ethernet by Various" library to be installed. Tested with v2.0.2 and v2.8.1.
-
-See the `#define WOLFSSL_TLS_SERVER_HOST` to set your own server address.
+Open the [wolfssl_client.ino](./wolfssl_client.ino) file in the Arduino IDE.

 Other IDE products are also supported, such as:

--- a/IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino
+++ b/IDE/ARDUINO/sketches/wolfssl_client/wolfssl_client.ino
@@ -0,0 +1,903 @@
+/* wolfssl_client.ino
+ *
+ * Copyright (C) 2006-2025 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+/*
+Tested with:
+
+1) Intel Galileo acting as the Client, with a laptop acting as a server using
+   the server example provided in examples/server.
+   Legacy Arduino v1.86 was used to compile and program the Galileo
+
+2) Espressif ESP32 WiFi
+
+3) Arduino Due, Nano33 IoT, Nano RP-2040
+*/
+
+/*
+ * Note to code editors: the Arduino client and server examples are edited in
+ * parallel for side-by-side comparison between examples.
+ */
+
+/* If you have a private include, define it here, otherwise edit WiFi params */
+#define MY_PRIVATE_CONFIG "/workspace/my_private_config.h"
+
+/* set REPEAT_CONNECTION to a non-zero value to continually run the example. */
+#define REPEAT_CONNECTION 0
+
+/* Edit this with your other TLS host server address to connect to: */
+#define WOLFSSL_TLS_SERVER_HOST "192.168.1.39"
+
+/* wolfssl TLS examples communicate on port 11111 */
+#define WOLFSSL_PORT 11111
+
+/* Choose a monitor serial baud rate: 9600, 14400, 19200, 57600, 74880, etc. */
+#define SERIAL_BAUD 115200
+
+/* We'll wait up to 2000 milliseconds to properly shut down connection */
+#define SHUTDOWN_DELAY_MS 2000
+
+/* Number of times to retry connection.  */
+#define RECONNECT_ATTEMPTS 20
+
+/* Optional stress test. Define to consume memory until exhausted: */
+/* #define MEMORY_STRESS_TEST */
+
+/* Choose client or server example, not both. */
+#define WOLFSSL_CLIENT_EXAMPLE
+/* #define WOLFSSL_SERVER_EXAMPLE */
+
+#if defined(MY_PRIVATE_CONFIG)
+    /* the /workspace directory may contain a private config
+     * excluded from GitHub with items such as WiFi passwords */
+    #include MY_PRIVATE_CONFIG
+    static const char* ssid PROGMEM = MY_ARDUINO_WIFI_SSID;
+    static const char* password PROGMEM = MY_ARDUINO_WIFI_PASSWORD;
+#else
+    /* when using WiFi capable boards: */
+    static const char* ssid PROGMEM  = "your_SSID";
+    static const char* password PROGMEM = "your_PASSWORD";
+#endif
+
+#define BROADCAST_ADDRESS "255.255.255.255"
+
+/* There's an optional 3rd party NTPClient library by Fabrice Weinberg.
+ * If it is installed, uncomment define USE_NTP_LIB here: */
+/* #define USE_NTP_LIB */
+#ifdef USE_NTP_LIB
+    #include <NTPClient.h>
+#endif
+
+/* wolfSSL user_settings.h must be included from settings.h
+ * Make all configurations changes in user_settings.h
+ * Do not edit wolfSSL `settings.h` or `config.h` files.
+ * Do not explicitly include user_settings.h in any source code.
+ * Each Arduino sketch that uses wolfSSL must have: #include "wolfssl.h"
+ * C/C++ source files can use: #include <wolfssl/wolfcrypt/settings.h>
+ * The wolfSSL "settings.h" must be included in each source file using wolfSSL.
+ * The wolfSSL "settings.h" must appear before any other wolfSSL include.
+ */
+#include <wolfssl.h>
+/* Important: make sure settings.h appears before any other wolfSSL headers */
+#include <wolfssl/wolfcrypt/settings.h>
+/* Reminder: settings.h includes user_settings.h
+ * For ALL project wolfSSL settings, see:
+ * [your path]/Arduino\libraries\wolfSSL\src\user_settings.h   */
+#include <wolfssl/ssl.h>
+#include <wolfssl/certs_test.h>
+#include <wolfssl/wolfcrypt/error-crypt.h>
+
+/* Define DEBUG_WOLFSSL in user_settings.h for more verbose logging. */
+#if defined(DEBUG_WOLFSSL)
+    #define PROGRESS_DOT F("")
+#else
+    #define PROGRESS_DOT F(".")
+#endif
+
+/* Convert a macro to a string */
+#define xstr(x) str(x)
+#define str(x) #x
+
+/* optional board-specific networking includes */
+#if defined(ESP32)
+    #define USING_WIFI
+    #include <WiFi.h>
+    #include <WiFiUdp.h>
+    #ifdef USE_NTP_LIB
+        WiFiUDP ntpUDP;
+    #endif
+    /* Ensure the F() flash macro is defined */
+    #ifndef F
+        #define F
+    #endif
+    WiFiClient client;
+
+#elif defined(ESP8266)
+    #define USING_WIFI
+    #include <ESP8266WiFi.h>
+    WiFiClient client;
+
+#elif defined(ARDUINO_SAM_DUE)
+    #include <SPI.h>
+    /* There's no WiFi/Ethernet on the Due. Requires Ethernet Shield.
+    /* Needs "Ethernet by Various" library to be installed. Tested with V2.0.2 */
+    #include <Ethernet.h>
+    EthernetClient client;
+
+#elif defined(ARDUINO_SAMD_NANO_33_IOT)
+    #define USING_WIFI
+    #include <SPI.h>
+    #include <WiFiNINA.h> /* Needs Arduino WiFiNINA library installed manually */
+    WiFiClient client;
+
+#elif defined(ARDUINO_ARCH_RP2040)
+    #define USING_WIFI
+    #include <SPI.h>
+    #include <WiFiNINA.h>
+    WiFiClient client;
+
+#elif defined(USING_WIFI)
+    #define USING_WIFI
+    #include <WiFi.h>
+    #include <WiFiUdp.h>
+    #ifdef USE_NTP_LIB
+        WiFiUDP ntpUDP;
+    #endif
+    WiFiClient client;
+
+/* TODO
+#elif defined(OTHER_BOARD)
+*/
+#else
+    #define USING_WIFI
+    WiFiClient client;
+
+#endif
+
+/* Only for syntax highlighters to show interesting options enabled: */
+#if defined(HAVE_SNI)                           \
+   || defined(HAVE_MAX_FRAGMENT)                  \
+   || defined(HAVE_TRUSTED_CA)                    \
+   || defined(HAVE_TRUNCATED_HMAC)                \
+   || defined(HAVE_CERTIFICATE_STATUS_REQUEST)    \
+   || defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) \
+   || defined(HAVE_SUPPORTED_CURVES)              \
+   || defined(HAVE_ALPN)                          \
+   || defined(HAVE_SESSION_TICKET)                \
+   || defined(HAVE_SECURE_RENEGOTIATION)          \
+   || defined(HAVE_SERVER_RENEGOTIATION_INFO)
+#endif
+
+static const char host[] PROGMEM = WOLFSSL_TLS_SERVER_HOST; /* server to connect to */
+static const int port PROGMEM = WOLFSSL_PORT; /* port on server to connect to */
+
+static WOLFSSL_CTX* ctx = NULL;
+static WOLFSSL* ssl = NULL;
+static char* wc_error_message = (char*)malloc(80 + 1);
+static char errBuf[80];
+
+#if defined(MEMORY_STRESS_TEST)
+    #define MEMORY_STRESS_ITERATIONS 100
+    #define MEMORY_STRESS_BLOCK_SIZE 1024
+    #define MEMORY_STRESS_INITIAL (4*1024)
+    static char* memory_stress[MEMORY_STRESS_ITERATIONS]; /* typically 1K per item */
+    static int mem_ctr        = 0;
+#endif
+
+static int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx);
+static int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx);
+static int reconnect = RECONNECT_ATTEMPTS;
+static int lng_index PROGMEM = 0; /* 0 = English */
+
+#if defined(__arm__)
+    #include <malloc.h>
+    extern char _end;
+    extern "C" char *sbrk(int i);
+    static char *ramstart=(char *)0x20070000;
+    static char *ramend=(char *)0x20088000;
+#endif
+
+/*****************************************************************************/
+/* fail_wait - in case of unrecoverable error                                */
+/*****************************************************************************/
+int fail_wait(void) {
+    show_memory();
+
+    Serial.println(F("Failed. Halt."));
+    while (1) {
+        delay(1000);
+    }
+    return 0;
+}
+
+/*****************************************************************************/
+/* show_memory() to optionally view during debugging.                         */
+/*****************************************************************************/
+int show_memory(void)
+{
+#if defined(__arm__)
+    struct mallinfo mi = mallinfo();
+
+    char *heapend=sbrk(0);
+    register char * stack_ptr asm("sp");
+    #if defined(DEBUG_WOLFSSL_VERBOSE)
+        Serial.print("    arena=");
+        Serial.println(mi.arena);
+        Serial.print("  ordblks=");
+        Serial.println(mi.ordblks);
+        Serial.print(" uordblks=");
+        Serial.println(mi.uordblks);
+        Serial.print(" fordblks=");
+        Serial.println(mi.fordblks);
+        Serial.print(" keepcost=");
+        Serial.println(mi.keepcost);
+    #endif
+
+    #if defined(DEBUG_WOLFSSL) || defined(MEMORY_STRESS_TEST)
+        Serial.print("Estimated free memory: ");
+        Serial.print(stack_ptr - heapend + mi.fordblks);
+        Serial.println(F(" bytes"));
+    #endif
+
+    #if (0)
+        /* Experimental: not supported on all devices: */
+        Serial.print("RAM Start %lx\n", (unsigned long)ramstart);
+        Serial.print("Data/Bss end %lx\n", (unsigned long)&_end);
+        Serial.print("Heap End %lx\n", (unsigned long)heapend);
+        Serial.print("Stack Ptr %lx\n",(unsigned long)stack_ptr);
+        Serial.print("RAM End %lx\n", (unsigned long)ramend);
+
+        Serial.print("Heap RAM Used: ",mi.uordblks);
+        Serial.print("Program RAM Used ",&_end - ramstart);
+        Serial.print("Stack RAM Used ",ramend - stack_ptr);
+
+        Serial.print("Estimated Free RAM: %d\n\n",stack_ptr - heapend + mi.fordblks);
+    #endif
+#else
+    Serial.println(F("show_memory() not implemented for this platform"));
+#endif
+    return 0;
+}
+
+/*****************************************************************************/
+/* EthernetSend() to send a message string.                                  */
+/*****************************************************************************/
+int EthernetSend(WOLFSSL* ssl, char* message, int sz, void* ctx) {
+    int sent = 0;
+    (void)ssl;
+    (void)ctx;
+
+    sent = client.write((byte*)message, sz);
+    return sent;
+}
+
+/*****************************************************************************/
+/* EthernetReceive() to receive a reply string.                              */
+/*****************************************************************************/
+int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx) {
+    int ret = 0;
+    (void)ssl;
+    (void)ctx;
+
+    while (client.available() > 0 && ret < sz) {
+        reply[ret++] = client.read();
+    }
+    return ret;
+}
+
+/*****************************************************************************/
+/* Arduino setup_hardware()                                                  */
+/*****************************************************************************/
+int setup_hardware(void) {
+    int ret = 0;
+
+#if defined(ARDUINO_SAMD_NANO_33_IOT)
+    Serial.println(F("Detected known tested and working Arduino Nano 33 IoT"));
+#elif defined(ARDUINO_ARCH_RP2040)
+    Serial.println(F("Detected known tested and working Arduino RP-2040"));
+#elif defined(__arm__) && defined(ID_TRNG) && defined(TRNG)
+    /* need to manually turn on random number generator on Arduino Due, etc. */
+    pmc_enable_periph_clk(ID_TRNG);
+    trng_enable(TRNG);
+    Serial.println(F("Enabled ARM TRNG"));
+#endif
+
+    show_memory();
+    randomSeed(analogRead(0));
+    return ret;
+}
+
+/*****************************************************************************/
+/* Arduino setup_datetime()                                                  */
+/*   The device needs to have a valid date within the valid range of certs.  */
+/*****************************************************************************/
+int setup_datetime(void) {
+    int ret = 0;
+    int ntp_tries = 20;
+
+    /* we need a date in the range of cert expiration */
+#ifdef USE_NTP_LIB
+    #if defined(ESP32)
+        NTPClient timeClient(ntpUDP, "pool.ntp.org");
+
+        timeClient.begin();
+        timeClient.update();
+        delay(1000);
+        while (!timeClient.isTimeSet() && (ntp_tries > 0)) {
+            timeClient.forceUpdate();
+            Serial.println(F("Waiting for NTP update"));
+            delay(2000);
+            ntp_tries--;
+        }
+        if (ntp_tries <= 0) {
+            Serial.println(F("Warning: gave up waiting on NTP"));
+        }
+        Serial.println(timeClient.getFormattedTime());
+        Serial.println(timeClient.getEpochTime());
+    #endif
+#endif
+
+#if defined(ESP32)
+    /* see esp32-hal-time.c */
+    ntp_tries = 5;
+    /* Replace "pool.ntp.org" with your preferred NTP server */
+    configTime(0, 0, "pool.ntp.org");
+
+    /* Wait for time to be set */
+    while ((time(nullptr) <= 100000) && ntp_tries > 0) {
+        Serial.println(F("Waiting for time to be set..."));
+        delay(2000);
+        ntp_tries--;
+    }
+#endif
+
+    return ret;
+} /* setup_datetime */
+
+/*****************************************************************************/
+/* Arduino setup_network()                                                   */
+/*****************************************************************************/
+int setup_network(void) {
+    int ret = 0;
+
+#if defined(USING_WIFI)
+    int status = WL_IDLE_STATUS;
+
+    /* The ESP8266 & ESP32 support both AP and STA. We'll use STA: */
+    #if defined(ESP8266) || defined(ESP32)
+        WiFi.mode(WIFI_STA);
+    #else
+        String fv;
+        if (WiFi.status() == WL_NO_MODULE) {
+            Serial.println("Communication with WiFi module failed!");
+            /* don't continue if no network */
+            while (true) ;
+        }
+
+        fv = WiFi.firmwareVersion();
+        if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
+            Serial.println("Please upgrade the firmware");
+        }
+    #endif
+
+    Serial.print(F("Connecting to WiFi "));
+    Serial.print(ssid);
+    status = WiFi.begin(ssid, password);
+    while (status != WL_CONNECTED) {
+        delay(1000);
+        Serial.print(F("."));
+        Serial.print(status);
+        status = WiFi.status();
+    }
+
+    Serial.println(F(" Connected!"));
+#else
+    /* Newer Ethernet shields have a
+     * MAC address printed on a sticker on the shield */
+    byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+    IPAddress ip(192, 168, 1, 42);
+    IPAddress myDns(192, 168, 1, 1);
+    Ethernet.init(10); /* Most Arduino shields */
+    /* Ethernet.init(5);   * MKR ETH Shield */
+    /* Ethernet.init(0);   * Teensy 2.0 */
+    /* Ethernet.init(20);  * Teensy++ 2.0 */
+    /* Ethernet.init(15);  * ESP8266 with Adafruit FeatherWing Ethernet */
+    /* Ethernet.init(33);  * ESP32 with Adafruit FeatherWing Ethernet */
+    Serial.println(F("Initialize Ethernet with DHCP:"));
+    if (Ethernet.begin(mac) == 0) {
+        Serial.println(F("Failed to configure Ethernet using DHCP"));
+        /* Check for Ethernet hardware present */
+        if (Ethernet.hardwareStatus() == EthernetNoHardware) {
+            Serial.println(F("Ethernet shield was not found."));
+            while (true) {
+                delay(1); /* do nothing */
+            }
+        }
+        if (Ethernet.linkStatus() == LinkOFF) {
+            Serial.println(F("Ethernet cable is not connected."));
+        }
+        /* try to configure using IP address instead of DHCP : */
+        Ethernet.begin(mac, ip, myDns);
+    }
+    else {
+        Serial.print(F("  DHCP assigned IP "));
+        Serial.println(Ethernet.localIP());
+    }
+    /* We'll assume the Ethernet connection is ready to go. */
+#endif
+
+    Serial.println(F("********************************************************"));
+    Serial.print(F("      wolfSSL Example Client IP = "));
+#if defined(USING_WIFI)
+    Serial.println(WiFi.localIP());
+#else
+    Serial.println(Ethernet.localIP());
+#endif
+    Serial.print(F("   Configured Server Host to connect to: "));
+    Serial.println(host);
+    Serial.println(F("********************************************************"));
+    Serial.println(F("Setup network complete."));
+
+    return ret;
+}
+
+/*****************************************************************************/
+/* Arduino setup_wolfssl()                                                   */
+/*****************************************************************************/
+int setup_wolfssl(void) {
+    int ret = 0;
+    WOLFSSL_METHOD* method;
+
+    /* Show a revision of wolfssl user_settings.h file in use when available: */
+#if defined(WOLFSSL_USER_SETTINGS_ID)
+    Serial.print(F("WOLFSSL_USER_SETTINGS_ID: "));
+    Serial.println(F(WOLFSSL_USER_SETTINGS_ID));
+#else
+    Serial.println(F("No WOLFSSL_USER_SETTINGS_ID found."));
+#endif
+
+#if defined(NO_WOLFSSL_SERVER)
+    Serial.println(F("wolfSSL server code disabled to save space."));
+#endif
+#if defined(NO_WOLFSSL_CLIENT)
+    Serial.println(F("wolfSSL client code disabled to save space."));
+#endif
+
+#if defined(DEBUG_WOLFSSL)
+    wolfSSL_Debugging_ON();
+    Serial.println(F("wolfSSL Debugging is On!"));
+#else
+    Serial.println(F("wolfSSL Debugging is Off! (enable with DEBUG_WOLFSSL)"));
+#endif
+
+    /* See ssl.c for TLS cache settings. Larger cache = use more RAM. */
+#if defined(NO_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS NO_SESSION_CACHE"));
+#elif defined(MICRO_SESSION_CACHEx)
+    Serial.println(F("wolfSSL TLS MICRO_SESSION_CACHE"));
+#elif defined(SMALL_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS SMALL_SESSION_CACHE"));
+#elif defined(MEDIUM_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS MEDIUM_SESSION_CACHE"));
+#elif defined(BIG_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS BIG_SESSION_CACHE"));
+#elif defined(HUGE_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS HUGE_SESSION_CACHE"));
+#elif defined(HUGE_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS HUGE_SESSION_CACHE"));
+#else
+    Serial.println(F("WARNING: Unknown or no TLS session cache setting."));
+    /* See wolfssl/src/ssl.c for amount of memory used.
+     * It is best on embedded devices to choose a TLS session cache size. */
+#endif
+
+    ret = wolfSSL_Init();
+    if (ret == WOLFSSL_SUCCESS) {
+        Serial.println("Successfully called wolfSSL_Init");
+    }
+    else {
+        Serial.println("ERROR: wolfSSL_Init failed");
+    }
+
+    /* See companion server example with wolfSSLv23_server_method here.
+     * method = wolfSSLv23_client_method());   SSL 3.0 - TLS 1.3.
+     * method = wolfTLSv1_2_client_method();   only TLS 1.2
+     * method = wolfTLSv1_3_client_method();   only TLS 1.3
+     *
+     * see Arduino\libraries\wolfssl\src\user_settings.h */
+
+    Serial.println("Here we go!");
+
+    method = wolfSSLv23_client_method();
+    if (method == NULL) {
+        Serial.println(F("unable to get wolfssl client method"));
+        fail_wait();
+    }
+    ctx = wolfSSL_CTX_new(method);
+    if (ctx == NULL) {
+        Serial.println(F("unable to get ctx"));
+        fail_wait();
+    }
+
+    return ret;
+}
+
+/*****************************************************************************/
+/* Arduino setup_certificates()                                              */
+/*****************************************************************************/
+int setup_certificates(void) {
+    int ret = 0;
+
+    Serial.println(F("Initializing certificates..."));
+    show_memory();
+
+    /* Use built-in validation, No verification callback function: */
+    wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, 0);
+
+    /* Certificate */
+    Serial.println("Initializing certificates...");
+    ret = wolfSSL_CTX_use_certificate_buffer(ctx,
+                                             CTX_CLIENT_CERT,
+                                             CTX_CLIENT_CERT_SIZE,
+                                             CTX_CLIENT_CERT_TYPE);
+    if (ret == WOLFSSL_SUCCESS) {
+        Serial.print("Success: use certificate: ");
+        Serial.println(xstr(CTX_SERVER_CERT));
+    }
+    else {
+        Serial.println(F("Error: wolfSSL_CTX_use_certificate_buffer failed: "));
+        wc_ErrorString(ret, wc_error_message);
+        Serial.println(wc_error_message);
+        fail_wait();
+    }
+
+    /* Setup private client key */
+    ret = wolfSSL_CTX_use_PrivateKey_buffer(ctx,
+                                            CTX_CLIENT_KEY,
+                                            CTX_CLIENT_KEY_SIZE,
+                                            CTX_CLIENT_KEY_TYPE);
+    if (ret == WOLFSSL_SUCCESS) {
+        Serial.print("Success: use private key buffer: ");
+        Serial.println(xstr(CTX_SERVER_KEY));
+    }
+    else {
+        Serial.println(F("Error: wolfSSL_CTX_use_PrivateKey_buffer failed: "));
+        wc_ErrorString(ret, wc_error_message);
+        Serial.println(wc_error_message);
+        fail_wait();
+    }
+
+    ret = wolfSSL_CTX_load_verify_buffer(ctx,
+                                         CTX_CA_CERT,
+                                         CTX_CA_CERT_SIZE,
+                                         CTX_CA_CERT_TYPE);
+    if (ret == WOLFSSL_SUCCESS) {
+        Serial.println(F("Success: load_verify CTX_CA_CERT"));
+    }
+    else {
+        Serial.println(F("Error: wolfSSL_CTX_load_verify_buffer failed: "));
+        wc_ErrorString(ret, wc_error_message);
+        Serial.println(wc_error_message);
+        fail_wait();
+    }
+
+
+
+    return ret;
+} /* Arduino setup */
+
+/*****************************************************************************/
+/*****************************************************************************/
+/* Arduino setup()                                                           */
+/*****************************************************************************/
+/*****************************************************************************/
+void setup(void) {
+    int i = 0;
+    Serial.begin(SERIAL_BAUD);
+    while (!Serial && (i < 10)) {
+        /* wait for serial port to connect. Needed for native USB port only */
+        delay(1000);
+        i++;
+    }
+    Serial.println(F(""));
+    Serial.println(F(""));
+    Serial.println(F("wolfSSL TLS Client Example Startup."));
+
+    /* define DEBUG_WOLFSSL in wolfSSL user_settings.h for diagnostics */
+#if defined(DEBUG_WOLFSSL)
+    wolfSSL_Debugging_ON();
+#endif
+
+    /* Optionally pre-allocate a large block of memory for testing */
+#if defined(MEMORY_STRESS_TEST)
+    Serial.println(F("WARNING: Memory Stress Test Active!"));
+    Serial.print(F("Allocating extra memory: "));
+    Serial.print(MEMORY_STRESS_INITIAL);
+    Serial.println(F(" bytes..."));
+    memory_stress[mem_ctr] = (char*)malloc(MEMORY_STRESS_INITIAL);
+    show_memory();
+#endif
+
+    setup_hardware();
+
+    setup_network();
+
+    setup_datetime();
+
+    setup_wolfssl();
+
+    setup_certificates();
+
+    /* Initialize wolfSSL using callback functions. */
+    wolfSSL_SetIOSend(ctx, EthernetSend);
+    wolfSSL_SetIORecv(ctx, EthernetReceive);
+
+    Serial.println(F("Completed Arduino setup!"));
+    /* See companion wolfssl_server.ino code; server begins listening here
+     * https://github.com/wolfSSL/wolfssl/tree/master/IDE/ARDUINO/sketches/wolfssl_server
+     * Any other server will work. See also:
+     * https://github.com/wolfSSL/wolfssl/tree/master/examples/client
+     */
+    /* See companion wolfssl_server.ino code */
+    return;
+} /* Arduino setup */
+
+/*****************************************************************************/
+/* wolfSSL error_check()                                                     */
+/*****************************************************************************/
+int error_check(int this_ret, bool halt_on_error,
+                      const __FlashStringHelper* message) {
+    int ret = 0;
+    if (this_ret == WOLFSSL_SUCCESS) {
+        Serial.print(F("Success: "));
+        Serial.println(message);
+    }
+    else {
+        Serial.print(F("ERROR: return = "));
+        Serial.print(this_ret);
+        Serial.print(F(": "));
+        Serial.println(message);
+        Serial.println(wc_GetErrorString(this_ret));
+        if (halt_on_error) {
+            fail_wait();
+        }
+    }
+    show_memory();
+
+    return ret;
+} /* error_check */
+
+/*****************************************************************************/
+/* wolfSSL error_check_ssl                                                   */
+/*   Parameters:                                                             */
+/*     ssl           is the current WOLFSSL object pointer                   */
+/*     halt_on_error set to true to suspend operations for critical error    */
+/*     message       is expected to be a memory-efficient F("") macro string */
+/*****************************************************************************/
+int error_check_ssl(WOLFSSL* ssl, int this_ret, bool halt_on_error,
+                           const __FlashStringHelper* message) {
+    int err = 0;
+
+    if (ssl == NULL) {
+        Serial.println(F("ssl is Null; Unable to allocate SSL object?"));
+#ifndef DEBUG_WOLFSSL
+        Serial.println(F("Define DEBUG_WOLFSSL in user_settings.h for more."));
+#else
+        Serial.println(F("See wolfssl/wolfcrypt/error-crypt.h for codes."));
+#endif
+        Serial.print(F("ERROR: "));
+        Serial.println(message);
+        show_memory();
+        if (halt_on_error) {
+            fail_wait();
+        }
+    }
+    else {
+        err = wolfSSL_get_error(ssl, this_ret);
+        if (err == WOLFSSL_SUCCESS) {
+            Serial.print(F("Success m: "));
+            Serial.println(message);
+        }
+        else {
+            if (err < 0) {
+                wolfSSL_ERR_error_string(err, errBuf);
+                Serial.print(F("WOLFSSL Error: "));
+                Serial.print(err);
+                Serial.print(F("; "));
+                Serial.println(errBuf);
+            }
+            else {
+                Serial.println(F("Success: ssl object."));
+            }
+        }
+    }
+
+    return err;
+}
+
+/*****************************************************************************/
+/*****************************************************************************/
+/* Arduino loop()                                                            */
+/*****************************************************************************/
+/*****************************************************************************/
+void loop() {
+    char reply[80];
+    char msg[32]       = "hello wolfssl!";
+    const char* cipherName;
+    int retry_shutdown = SHUTDOWN_DELAY_MS; /* max try, once per millisecond */
+    int total_input    = 0;
+    int msgSz          = 0;
+    int input          = 0;
+    int ret            = 0;
+    int err            = 0;
+    msgSz = (int)strlen(msg);
+    Serial.println(F(""));
+    Serial.println(F("Starting Arduino loop() ..."));
+
+    if (reconnect) {
+        reconnect--;
+        /* WiFi client returns true if connection succeeds, false if not.  */
+        /* Wired client returns int (1,-1,-2,-3,-4) for connection status. */
+        Serial.print(F("Connecting to "));
+        Serial.print(host);
+        Serial.print(F(":"));
+        Serial.println(port);
+        /* can also use: IPAddress server(192,168,1,37); */
+        Serial.println(F("Here we go..."));
+        ret = client.connect(host, port);
+        Serial.println(F("Ok, checking..."));
+        if (ret > 0) {
+            Serial.println(F("Connected!"));
+
+            /* initialize wolfSSL */
+            ret = wolfSSL_Init();
+            error_check(ret, false, F("calling wolfSSL_Init") );
+
+            /* create secure connection object. see setup for ctx certs. */
+            Serial.println(F("Calling ssl = wolfSSL_new(ctx)"));
+            ssl = wolfSSL_new(ctx);
+            error_check_ssl(ssl, 0, true, F("Create WOLFSSL object from ctx"));
+
+            Serial.print(F("Connecting to wolfSSL TLS Secure Server..."));
+            do {
+                err = 0; /* reset error */
+                Serial.println(F("wolfSSL_connect ..."));
+                ret = wolfSSL_connect(ssl);
+                Serial.print("wolfSSL_connect return result =");
+                Serial.println(ret);
+                if ((ret != WOLFSSL_SUCCESS) && (ret != WC_PENDING_E)) {
+                    Serial.println(F("Failed connection, checking error."));
+                    err = error_check_ssl(ssl, ret, true,
+                                    F("Create WOLFSSL object from ctx"));
+                    Serial.print("err =");
+                    Serial.println(err);
+                }
+                else {
+                   Serial.print(PROGRESS_DOT);
+                }
+            } while (err == WC_PENDING_E);
+
+            Serial.println();
+            Serial.println(F("Connected!"));
+            Serial.print(F("SSL version is "));
+            Serial.println(wolfSSL_get_version(ssl));
+
+            cipherName = wolfSSL_get_cipher(ssl);
+            Serial.print(F("SSL cipher suite is "));
+            Serial.println(cipherName);
+
+            /* see test.h
+             * TODO: test.h needs a little bit of Arduino work for these:
+            showPeerEx(ssl, lng_index);
+            showPeerPEM(ssl);
+            */
+
+            Serial.print(F("Sending secure message to server: "));
+            Serial.println(msg);
+            ret = wolfSSL_write(ssl, msg, msgSz);
+            if (ret == msgSz) {
+                Serial.print(F("Waiting for Server response..."));
+
+                while (!client.available()) {
+                    /* wait for data */
+                    delay(1); /* 1 ms delay */
+                }
+
+                Serial.print(F("Reading response.."));
+                /* read data */
+                do {
+                    ret = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
+                    if (ret < 0) {
+                        error_check_ssl(ssl, ret, false,
+                                        F("during TLS Read"));
+                    }
+                    else {
+                        Serial.print(PROGRESS_DOT);
+                    }
+                } while (err == WC_PENDING_E);
+                Serial.println();
+
+                Serial.println();
+                Serial.println(reply); /* typically: I hear you fa shizzle! */
+                Serial.println();
+
+            } /* wolfSSL_write message size matched */
+            else {
+                error_check_ssl(ssl, ret, false,
+                    F("during TLS Write"));
+            }  /* any wolfSSL_write message size mismatch is an error */
+
+            Serial.print(F("Shutting down.."));
+            do {
+                delay(1);
+                Serial.print(PROGRESS_DOT);
+                retry_shutdown--;
+                ret = wolfSSL_shutdown(ssl);
+            } while (   (ret == WOLFSSL_SHUTDOWN_NOT_DONE)
+                     && (retry_shutdown > 0)
+                    ); /* There may be pending data, so wait until done. */
+            Serial.println();
+
+            if (retry_shutdown <= 0) {
+                /* if wolfSSL_free is called before properly shutting down the
+                 * ssl object, undesired results may occur. */
+                Serial.println(F("Warning! Shutdown did not properly complete."));
+            }
+
+            wolfSSL_free(ssl);
+            client.stop();
+            Serial.println(F("Connection complete."));
+            if (REPEAT_CONNECTION) {
+                reconnect = RECONNECT_ATTEMPTS;
+            }
+            else {
+                reconnect = 0;
+            }
+        } /* client.connect(host, port) */
+        else {
+            Serial.println(F("Problem sending message. Trying to reconnect..."));
+        }
+    }
+    delay(1000);
+    if ((reconnect > 0) && (REPEAT_CONNECTION)) {
+        Serial.println(F("Arduino loop repeating..."));
+        Serial.println();
+    }
+    else {
+        printf("wow");
+        Serial.println(F("Done!"));
+        while(1) {
+            /* wait forever */
+        }
+    }
+
+#if defined(MEMORY_STRESS_TEST)
+    if (mem_ctr < MEMORY_STRESS_ITERATIONS) {
+        /* reminder: mem_ctr == 0 is MEMORY_STRESS_INITIAL allocation */
+        mem_ctr++;
+        Serial.print(F("Memory stress increment: "));
+        Serial.print(mem_ctr);
+        Serial.print(F(". Allocating addition memory (bytes): "));
+        Serial.println(MEMORY_STRESS_BLOCK_SIZE);
+        memory_stress[mem_ctr] = (char*)malloc(MEMORY_STRESS_BLOCK_SIZE);
+        show_memory();
+    }
+#endif
+} /* Arduino loop repeats */
--- a/IDE/ARDUINO/sketches/wolfssl_server/README.md
+++ b/IDE/ARDUINO/sketches/wolfssl_server/README.md
@@ -1,14 +1,6 @@
 # Arduino Basic TLS Server

-Open the `wolfssl_server.ino` file in the Arduino IDE.
-
-NOTE: Moving; See https://github.com/wolfSSL/wolfssl-examples/pull/499
-
-If using WiFi, be sure to set `ssid` and `password` values.
-
-May need "Ethernet by Various" library to be installed. Tested with v2.0.2 and v2.8.1.
-
-See the `#define WOLFSSL_TLS_SERVER_HOST` to set your own server address.
+Open the [wolfssl_server.ino](./wolfssl_server.ino) file in the Arduino IDE.

 Other IDE products are also supported, such as:

--- a/IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino
+++ b/IDE/ARDUINO/sketches/wolfssl_server/wolfssl_server.ino
@@ -0,0 +1,847 @@
+/* wolfssl_server.ino
+ *
+ * Copyright (C) 2006-2025 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+/*
+Tested with:
+
+1) Intel Galileo acting as the Client, with a laptop acting as a server using
+   the server example provided in examples/server.
+   Legacy Arduino v1.86 was used to compile and program the Galileo
+
+2) Espressif ESP32 WiFi
+
+3) Arduino Due, Nano33 IoT, Nano RP-2040
+*/
+
+/*
+ * Note to code editors: the Arduino client and server examples are edited in
+ * parallel for side-by-side comparison between examples.
+ */
+
+/* If you have a private include, define it here, otherwise edit WiFi params */
+#define MY_PRIVATE_CONFIG "/workspace/my_private_config.h"
+
+/* set REPEAT_CONNECTION to a non-zero value to continually run the example. */
+#define REPEAT_CONNECTION 1
+
+/* Edit this with your other TLS host server address to connect to: */
+/* #define WOLFSSL_TLS_SERVER_HOST "192.168.1.34" */
+
+/* wolfssl TLS examples communicate on port 11111 */
+#define WOLFSSL_PORT 11111
+
+/* Choose a monitor serial baud rate: 9600, 14400, 19200, 57600, 74880, etc. */
+#define SERIAL_BAUD 115200
+
+/* We'll wait up to 2000 milliseconds to properly shut down connection */
+#define SHUTDOWN_DELAY_MS 2000
+
+/* Number of times to retry connection.  */
+#define RECONNECT_ATTEMPTS 20
+
+/* Optional stress test. Define to consume memory until exhausted: */
+/* #define MEMORY_STRESS_TEST */
+
+/* Choose client or server example, not both. */
+/* #define WOLFSSL_CLIENT_EXAMPLE */
+#define WOLFSSL_SERVER_EXAMPLE
+
+#if defined(MY_PRIVATE_CONFIG)
+    /* the /workspace directory may contain a private config
+     * excluded from GitHub with items such as WiFi passwords */
+    #include MY_PRIVATE_CONFIG
+    static const char* ssid PROGMEM = MY_ARDUINO_WIFI_SSID;
+    static const char* password PROGMEM = MY_ARDUINO_WIFI_PASSWORD;
+#else
+    /* when using WiFi capable boards: */
+    static const char* ssid PROGMEM  = "your_SSID";
+    static const char* password PROGMEM = "your_PASSWORD";
+#endif
+
+#define BROADCAST_ADDRESS "255.255.255.255"
+
+/* There's an optional 3rd party NTPClient library by Fabrice Weinberg.
+ * If it is installed, uncomment define USE_NTP_LIB here: */
+/* #define USE_NTP_LIB */
+#ifdef USE_NTP_LIB
+    #include <NTPClient.h>
+#endif
+
+/* wolfSSL user_settings.h must be included from settings.h
+ * Make all configurations changes in user_settings.h
+ * Do not edit wolfSSL `settings.h` or `config.h` files.
+ * Do not explicitly include user_settings.h in any source code.
+ * Each Arduino sketch that uses wolfSSL must have: #include "wolfssl.h"
+ * C/C++ source files can use: #include <wolfssl/wolfcrypt/settings.h>
+ * The wolfSSL "settings.h" must be included in each source file using wolfSSL.
+ * The wolfSSL "settings.h" must appear before any other wolfSSL include.
+ */
+#include <wolfssl.h>
+/* Important: make sure settings.h appears before any other wolfSSL headers */
+#include <wolfssl/wolfcrypt/settings.h>
+/* Reminder: settings.h includes user_settings.h
+ * For ALL project wolfSSL settings, see:
+ * [your path]/Arduino\libraries\wolfSSL\src\user_settings.h   */
+#include <wolfssl/ssl.h>
+#include <wolfssl/certs_test.h>
+#include <wolfssl/wolfcrypt/error-crypt.h>
+
+/* Define DEBUG_WOLFSSL in user_settings.h for more verbose logging. */
+#if defined(DEBUG_WOLFSSL)
+    #define PROGRESS_DOT F("")
+#else
+    #define PROGRESS_DOT F(".")
+#endif
+
+/* Convert a macro to a string */
+#define xstr(x) str(x)
+#define str(x) #x
+
+/* optional board-specific networking includes */
+#if defined(ESP32)
+    #define USING_WIFI
+    #include <WiFi.h>
+    #include <WiFiUdp.h>
+    #ifdef USE_NTP_LIB
+        WiFiUDP ntpUDP;
+    #endif
+    /* Ensure the F() flash macro is defined */
+    #ifndef F
+        #define F
+    #endif
+    WiFiClient client;
+    WiFiServer server(WOLFSSL_PORT);
+#elif defined(ESP8266)
+    #define USING_WIFI
+    #include <ESP8266WiFi.h>
+    WiFiClient client;
+    WiFiServer server(WOLFSSL_PORT);
+#elif defined(ARDUINO_SAM_DUE)
+    #include <SPI.h>
+    /* There's no WiFi/Ethernet on the Due. Requires Ethernet Shield.
+    /* Needs "Ethernet by Various" library to be installed. Tested with V2.0.2 */
+    #include <Ethernet.h>
+    EthernetClient client;
+    EthernetClient server(WOLFSSL_PORT);
+#elif defined(ARDUINO_SAMD_NANO_33_IOT)
+    #define USING_WIFI
+    #include <SPI.h>
+    #include <WiFiNINA.h> /* Needs Arduino WiFiNINA library installed manually */
+    WiFiClient client;
+    WiFiServer server(WOLFSSL_PORT);
+#elif defined(ARDUINO_ARCH_RP2040)
+    #define USING_WIFI
+    #include <SPI.h>
+    #include <WiFiNINA.h>
+    WiFiClient client;
+    WiFiServer server(WOLFSSL_PORT);
+#elif defined(USING_WIFI)
+    #define USING_WIFI
+    #include <WiFi.h>
+    #include <WiFiUdp.h>
+    #ifdef USE_NTP_LIB
+        WiFiUDP ntpUDP;
+    #endif
+    WiFiClient client;
+    WiFiServer server(WOLFSSL_PORT);
+/* TODO
+#elif defined(OTHER_BOARD)
+*/
+#else
+    #define USING_WIFI
+    WiFiClient client;
+    WiFiServer server(WOLFSSL_PORT);
+#endif
+
+/* Only for syntax highlighters to show interesting options enabled: */
+#if defined(HAVE_SNI)                           \
+   || defined(HAVE_MAX_FRAGMENT)                  \
+   || defined(HAVE_TRUSTED_CA)                    \
+   || defined(HAVE_TRUNCATED_HMAC)                \
+   || defined(HAVE_CERTIFICATE_STATUS_REQUEST)    \
+   || defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) \
+   || defined(HAVE_SUPPORTED_CURVES)              \
+   || defined(HAVE_ALPN)                          \
+   || defined(HAVE_SESSION_TICKET)                \
+   || defined(HAVE_SECURE_RENEGOTIATION)          \
+   || defined(HAVE_SERVER_RENEGOTIATION_INFO)
+#endif
+
+
+/* we expect our IP address from DHCP */
+
+static WOLFSSL_CTX* ctx = NULL;
+static WOLFSSL* ssl = NULL;
+static char* wc_error_message = (char*)malloc(80 + 1);
+static char errBuf[80];
+
+#if defined(MEMORY_STRESS_TEST)
+    #define MEMORY_STRESS_ITERATIONS 100
+    #define MEMORY_STRESS_BLOCK_SIZE 1024
+    #define MEMORY_STRESS_INITIAL (4*1024)
+    static char* memory_stress[MEMORY_STRESS_ITERATIONS]; /* typically 1K per item */
+    static int mem_ctr        = 0;
+#endif
+
+static int EthernetSend(WOLFSSL* ssl, char* msg, int sz, void* ctx);
+static int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx);
+static int reconnect = RECONNECT_ATTEMPTS;
+static int lng_index PROGMEM = 0; /* 0 = English */
+
+#if defined(__arm__)
+    #include <malloc.h>
+    extern char _end;
+    extern "C" char *sbrk(int i);
+    static char *ramstart=(char *)0x20070000;
+    static char *ramend=(char *)0x20088000;
+#endif
+
+/*****************************************************************************/
+/* fail_wait - in case of unrecoverable error                                */
+/*****************************************************************************/
+int fail_wait(void) {
+    show_memory();
+
+    Serial.println(F("Failed. Halt."));
+    while (1) {
+        delay(1000);
+    }
+    return 0;
+}
+
+/*****************************************************************************/
+/* show_memory() to optionally view during debugging.                         */
+/*****************************************************************************/
+int show_memory(void)
+{
+#if defined(__arm__)
+    struct mallinfo mi = mallinfo();
+
+    char *heapend=sbrk(0);
+    register char * stack_ptr asm("sp");
+    #if defined(DEBUG_WOLFSSL_VERBOSE)
+        Serial.print("    arena=");
+        Serial.println(mi.arena);
+        Serial.print("  ordblks=");
+        Serial.println(mi.ordblks);
+        Serial.print(" uordblks=");
+        Serial.println(mi.uordblks);
+        Serial.print(" fordblks=");
+        Serial.println(mi.fordblks);
+        Serial.print(" keepcost=");
+        Serial.println(mi.keepcost);
+    #endif
+
+    #if defined(DEBUG_WOLFSSL) || defined(MEMORY_STRESS_TEST)
+        Serial.print("Estimated free memory: ");
+        Serial.print(stack_ptr - heapend + mi.fordblks);
+        Serial.println(F(" bytes"));
+    #endif
+
+    #if (0)
+        /* Experimental: not supported on all devices: */
+        Serial.print("RAM Start %lx\n", (unsigned long)ramstart);
+        Serial.print("Data/Bss end %lx\n", (unsigned long)&_end);
+        Serial.print("Heap End %lx\n", (unsigned long)heapend);
+        Serial.print("Stack Ptr %lx\n",(unsigned long)stack_ptr);
+        Serial.print("RAM End %lx\n", (unsigned long)ramend);
+
+        Serial.print("Heap RAM Used: ",mi.uordblks);
+        Serial.print("Program RAM Used ",&_end - ramstart);
+        Serial.print("Stack RAM Used ",ramend - stack_ptr);
+
+        Serial.print("Estimated Free RAM: %d\n\n",stack_ptr - heapend + mi.fordblks);
+    #endif
+#else
+    Serial.println(F("show_memory() not implemented for this platform"));
+#endif
+    return 0;
+}
+
+/*****************************************************************************/
+/* EthernetSend() to send a message string.                                  */
+/*****************************************************************************/
+int EthernetSend(WOLFSSL* ssl, char* message, int sz, void* ctx) {
+    int sent = 0;
+    (void)ssl;
+    (void)ctx;
+
+    sent = client.write((byte*)message, sz);
+    return sent;
+}
+
+/*****************************************************************************/
+/* EthernetReceive() to receive a reply string.                              */
+/*****************************************************************************/
+int EthernetReceive(WOLFSSL* ssl, char* reply, int sz, void* ctx) {
+    int ret = 0;
+    (void)ssl;
+    (void)ctx;
+
+    while (client.available() > 0 && ret < sz) {
+        reply[ret++] = client.read();
+    }
+    return ret;
+}
+
+/*****************************************************************************/
+/* Arduino setup_hardware()                                                  */
+/*****************************************************************************/
+int setup_hardware(void) {
+    int ret = 0;
+
+#if defined(ARDUINO_SAMD_NANO_33_IOT)
+    Serial.println(F("Detected known tested and working Arduino Nano 33 IoT"));
+#elif defined(ARDUINO_ARCH_RP2040)
+    Serial.println(F("Detected known tested and working Arduino RP-2040"));
+#elif defined(__arm__) && defined(ID_TRNG) && defined(TRNG)
+    /* need to manually turn on random number generator on Arduino Due, etc. */
+    pmc_enable_periph_clk(ID_TRNG);
+    trng_enable(TRNG);
+    Serial.println(F("Enabled ARM TRNG"));
+#endif
+
+    show_memory();
+    randomSeed(analogRead(0));
+    return ret;
+}
+
+/*****************************************************************************/
+/* Arduino setup_datetime()                                                  */
+/*   The device needs to have a valid date within the valid range of certs.  */
+/*****************************************************************************/
+int setup_datetime(void) {
+    int ret = 0;
+    int ntp_tries = 20;
+
+    /* we need a date in the range of cert expiration */
+#ifdef USE_NTP_LIB
+    #if defined(ESP32)
+        NTPClient timeClient(ntpUDP, "pool.ntp.org");
+
+        timeClient.begin();
+        timeClient.update();
+        delay(1000);
+        while (!timeClient.isTimeSet() && (ntp_tries > 0)) {
+            timeClient.forceUpdate();
+            Serial.println(F("Waiting for NTP update"));
+            delay(2000);
+            ntp_tries--;
+        }
+        if (ntp_tries <= 0) {
+            Serial.println(F("Warning: gave up waiting on NTP"));
+        }
+        Serial.println(timeClient.getFormattedTime());
+        Serial.println(timeClient.getEpochTime());
+    #endif
+#endif
+
+#if defined(ESP32)
+    /* see esp32-hal-time.c */
+    ntp_tries = 5;
+    /* Replace "pool.ntp.org" with your preferred NTP server */
+    configTime(0, 0, "pool.ntp.org");
+
+    /* Wait for time to be set */
+    while ((time(nullptr) <= 100000) && ntp_tries > 0) {
+        Serial.println(F("Waiting for time to be set..."));
+        delay(2000);
+        ntp_tries--;
+    }
+#endif
+
+    return ret;
+} /* setup_datetime */
+
+/*****************************************************************************/
+/* Arduino setup_network()                                                   */
+/*****************************************************************************/
+int setup_network(void) {
+    int ret = 0;
+
+#if defined(USING_WIFI)
+    int status = WL_IDLE_STATUS;
+
+    /* The ESP8266 & ESP32 support both AP and STA. We'll use STA: */
+    #if defined(ESP8266) || defined(ESP32)
+        WiFi.mode(WIFI_STA);
+    #else
+        String fv;
+        if (WiFi.status() == WL_NO_MODULE) {
+            Serial.println("Communication with WiFi module failed!");
+            /* don't continue if no network */
+            while (true) ;
+        }
+
+        fv = WiFi.firmwareVersion();
+        if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
+            Serial.println("Please upgrade the firmware");
+        }
+    #endif
+
+    Serial.print(F("Connecting to WiFi "));
+    Serial.print(ssid);
+    status = WiFi.begin(ssid, password);
+    while (status != WL_CONNECTED) {
+        delay(1000);
+        Serial.print(F("."));
+        Serial.print(status);
+        status = WiFi.status();
+    }
+
+    Serial.println(F(" Connected!"));
+#else
+    /* Newer Ethernet shields have a
+     * MAC address printed on a sticker on the shield */
+    byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+    IPAddress ip(192, 168, 1, 42);
+    IPAddress myDns(192, 168, 1, 1);
+    Ethernet.init(10); /* Most Arduino shields */
+    /* Ethernet.init(5);   * MKR ETH Shield */
+    /* Ethernet.init(0);   * Teensy 2.0 */
+    /* Ethernet.init(20);  * Teensy++ 2.0 */
+    /* Ethernet.init(15);  * ESP8266 with Adafruit FeatherWing Ethernet */
+    /* Ethernet.init(33);  * ESP32 with Adafruit FeatherWing Ethernet */
+    Serial.println(F("Initialize Ethernet with DHCP:"));
+    if (Ethernet.begin(mac) == 0) {
+        Serial.println(F("Failed to configure Ethernet using DHCP"));
+        /* Check for Ethernet hardware present */
+        if (Ethernet.hardwareStatus() == EthernetNoHardware) {
+            Serial.println(F("Ethernet shield was not found."));
+            while (true) {
+                delay(1); /* do nothing */
+            }
+        }
+        if (Ethernet.linkStatus() == LinkOFF) {
+            Serial.println(F("Ethernet cable is not connected."));
+        }
+        /* try to configure using IP address instead of DHCP : */
+        Ethernet.begin(mac, ip, myDns);
+    }
+    else {
+        Serial.print(F("  DHCP assigned IP "));
+        Serial.println(Ethernet.localIP());
+    }
+    /* We'll assume the Ethernet connection is ready to go. */
+#endif
+
+    Serial.println(F("********************************************************"));
+    Serial.print(F("      wolfSSL Example Server IP = "));
+#if defined(USING_WIFI)
+    Serial.println(WiFi.localIP());
+#else
+    Serial.println(Ethernet.localIP());
+#endif
+    /* In server mode, there's no host definition. */
+    /* See companion example: wolfssl_client.ino */
+    Serial.println(F("********************************************************"));
+    Serial.println(F("Setup network complete."));
+
+    return ret;
+}
+
+/*****************************************************************************/
+/* Arduino setup_wolfssl()                                                   */
+/*****************************************************************************/
+int setup_wolfssl(void) {
+    int ret = 0;
+    WOLFSSL_METHOD* method;
+
+    /* Show a revision of wolfssl user_settings.h file in use when available: */
+#if defined(WOLFSSL_USER_SETTINGS_ID)
+    Serial.print(F("WOLFSSL_USER_SETTINGS_ID: "));
+    Serial.println(F(WOLFSSL_USER_SETTINGS_ID));
+#else
+    Serial.println(F("No WOLFSSL_USER_SETTINGS_ID found."));
+#endif
+
+#if defined(NO_WOLFSSL_SERVER)
+    Serial.println(F("wolfSSL server code disabled to save space."));
+#endif
+#if defined(NO_WOLFSSL_CLIENT)
+    Serial.println(F("wolfSSL client code disabled to save space."));
+#endif
+
+#if defined(DEBUG_WOLFSSL)
+    wolfSSL_Debugging_ON();
+    Serial.println(F("wolfSSL Debugging is On!"));
+#else
+    Serial.println(F("wolfSSL Debugging is Off! (enable with DEBUG_WOLFSSL)"));
+#endif
+
+    /* See ssl.c for TLS cache settings. Larger cache = use more RAM. */
+#if defined(NO_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS NO_SESSION_CACHE"));
+#elif defined(MICRO_SESSION_CACHEx)
+    Serial.println(F("wolfSSL TLS MICRO_SESSION_CACHE"));
+#elif defined(SMALL_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS SMALL_SESSION_CACHE"));
+#elif defined(MEDIUM_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS MEDIUM_SESSION_CACHE"));
+#elif defined(BIG_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS BIG_SESSION_CACHE"));
+#elif defined(HUGE_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS HUGE_SESSION_CACHE"));
+#elif defined(HUGE_SESSION_CACHE)
+    Serial.println(F("wolfSSL TLS HUGE_SESSION_CACHE"));
+#else
+    Serial.println(F("WARNING: Unknown or no TLS session cache setting."));
+    /* See wolfssl/src/ssl.c for amount of memory used.
+     * It is best on embedded devices to choose a TLS session cache size. */
+#endif
+
+    ret = wolfSSL_Init();
+    if (ret == WOLFSSL_SUCCESS) {
+        Serial.println("Successfully called wolfSSL_Init");
+    }
+    else {
+        Serial.println("ERROR: wolfSSL_Init failed");
+    }
+
+    /* See companion server example with wolfSSLv23_server_method here.
+     * method = wolfSSLv23_client_method());   SSL 3.0 - TLS 1.3.
+     * method = wolfTLSv1_2_client_method();   only TLS 1.2
+     * method = wolfTLSv1_3_client_method();   only TLS 1.3
+     *
+     * see Arduino\libraries\wolfssl\src\user_settings.h */
+
+    Serial.println("Here we go!");
+
+    method = wolfSSLv23_server_method();
+    if (method == NULL) {
+        Serial.println(F("unable to get wolfssl server method"));
+        fail_wait();
+    }
+    ctx = wolfSSL_CTX_new(method);
+    if (ctx == NULL) {
+        Serial.println(F("unable to get ctx"));
+        fail_wait();
+    }
+
+    return ret;
+}
+
+/*****************************************************************************/
+/* Arduino setup_certificates()                                              */
+/*****************************************************************************/
+int setup_certificates(void) {
+    int ret = 0;
+
+    Serial.println(F("Initializing certificates..."));
+    show_memory();
+
+    /* Use built-in validation, No verification callback function: */
+    wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
+
+    /* Certificate */
+    Serial.println("Initializing certificates...");
+    ret = wolfSSL_CTX_use_certificate_buffer(ctx,
+                                             CTX_SERVER_CERT,
+                                             CTX_SERVER_CERT_SIZE,
+                                             CTX_CA_CERT_TYPE);
+    if (ret == WOLFSSL_SUCCESS) {
+        Serial.print("Success: use certificate: ");
+        Serial.println(xstr(CTX_SERVER_CERT));
+    }
+    else {
+        Serial.print("Error: wolfSSL_CTX_use_certificate_buffer failed: ");
+        wc_ErrorString(ret, wc_error_message);
+        Serial.println(wc_error_message);
+        fail_wait();
+    }
+
+    /* Setup private server key */
+    ret = wolfSSL_CTX_use_PrivateKey_buffer(ctx,
+                                            CTX_SERVER_KEY,
+                                            CTX_SERVER_KEY_SIZE,
+                                            CTX_SERVER_KEY_TYPE);
+    if (ret == WOLFSSL_SUCCESS) {
+        Serial.print("Success: use private key buffer: ");
+        Serial.println(xstr(CTX_SERVER_KEY));
+    }
+    else {
+        Serial.print("Error: wolfSSL_CTX_use_PrivateKey_buffer failed: ");
+        wc_ErrorString(ret, wc_error_message);
+        Serial.println(wc_error_message);
+        fail_wait();
+    }
+
+    return ret;
+} /* Arduino setup */
+
+/*****************************************************************************/
+/*****************************************************************************/
+/* Arduino setup()                                                           */
+/*****************************************************************************/
+/*****************************************************************************/
+void setup(void) {
+    int i = 0;
+    Serial.begin(SERIAL_BAUD);
+    while (!Serial && (i < 10)) {
+        /* wait for serial port to connect. Needed for native USB port only */
+        delay(1000);
+        i++;
+    }
+
+    Serial.println(F(""));
+    Serial.println(F(""));
+    Serial.println(F("wolfSSL TLS Server Example Startup."));
+
+    /* define DEBUG_WOLFSSL in wolfSSL user_settings.h for diagnostics */
+#if defined(DEBUG_WOLFSSL)
+    wolfSSL_Debugging_ON();
+#endif
+
+    /* Optionally pre-allocate a large block of memory for testing */
+#if defined(MEMORY_STRESS_TEST)
+    Serial.println(F("WARNING: Memory Stress Test Active!"));
+    Serial.print(F("Allocating extra memory: "));
+    Serial.print(MEMORY_STRESS_INITIAL);
+    Serial.println(F(" bytes..."));
+    memory_stress[mem_ctr] = (char*)malloc(MEMORY_STRESS_INITIAL);
+    show_memory();
+#endif
+
+    setup_hardware();
+
+    setup_network();
+
+    setup_datetime();
+
+    setup_wolfssl();
+
+    setup_certificates();
+
+    /* Initialize wolfSSL using callback functions. */
+    wolfSSL_SetIOSend(ctx, EthernetSend);
+    wolfSSL_SetIORecv(ctx, EthernetReceive);
+
+#if defined THIS_USER_SETTINGS_VERSION
+    Serial.print(F("This user_settings.h version:"))
+    Serial.println(THIS_USER_SETTINGS_VERSION)
+#endif
+
+    /* Start the server
+     * See https://www.arduino.cc/reference/en/libraries/ethernet/server.begin/
+     */
+
+    Serial.println(F("Completed Arduino setup()"));
+
+    server.begin();
+    Serial.println("Begin Server... (waiting for remote client to connect)");
+
+    /* See companion wolfssl_client.ino code */
+    return;
+} /* Arduino setup */
+
+/*****************************************************************************/
+/* wolfSSL error_check()                                                     */
+/*****************************************************************************/
+int error_check(int this_ret, bool halt_on_error,
+                      const __FlashStringHelper* message) {
+    int ret = 0;
+    if (this_ret == WOLFSSL_SUCCESS) {
+        Serial.print(F("Success: "));
+        Serial.println(message);
+    }
+    else {
+        Serial.print(F("ERROR: return = "));
+        Serial.print(this_ret);
+        Serial.print(F(": "));
+        Serial.println(message);
+        Serial.println(wc_GetErrorString(this_ret));
+        if (halt_on_error) {
+            fail_wait();
+        }
+    }
+    show_memory();
+
+    return ret;
+} /* error_check */
+
+/*****************************************************************************/
+/* wolfSSL error_check_ssl                                                   */
+/*   Parameters:                                                             */
+/*     ssl           is the current WOLFSSL object pointer                   */
+/*     halt_on_error set to true to suspend operations for critical error    */
+/*     message       is expected to be a memory-efficient F("") macro string */
+/*****************************************************************************/
+int error_check_ssl(WOLFSSL* ssl, int this_ret, bool halt_on_error,
+                           const __FlashStringHelper* message) {
+    int err = 0;
+
+    if (ssl == NULL) {
+        Serial.println(F("ssl is Null; Unable to allocate SSL object?"));
+#ifndef DEBUG_WOLFSSL
+        Serial.println(F("Define DEBUG_WOLFSSL in user_settings.h for more."));
+#else
+        Serial.println(F("See wolfssl/wolfcrypt/error-crypt.h for codes."));
+#endif
+        Serial.print(F("ERROR: "));
+        Serial.println(message);
+        show_memory();
+        if (halt_on_error) {
+            fail_wait();
+        }
+    }
+    else {
+        err = wolfSSL_get_error(ssl, this_ret);
+        if (err == WOLFSSL_SUCCESS) {
+            Serial.print(F("Success m: "));
+            Serial.println(message);
+        }
+        else {
+            if (err < 0) {
+                wolfSSL_ERR_error_string(err, errBuf);
+                Serial.print(F("WOLFSSL Error: "));
+                Serial.print(err);
+                Serial.print(F("; "));
+                Serial.println(errBuf);
+            }
+            else {
+                Serial.println(F("Success: ssl object."));
+            }
+        }
+    }
+
+    return err;
+}
+
+/*****************************************************************************/
+/*****************************************************************************/
+/* Arduino loop()                                                            */
+/*****************************************************************************/
+/*****************************************************************************/
+void loop() {
+    char errBuf[80]    = "(no error";
+    char reply[80]     = "(no reply)";
+    const char msg[]   = "I hear you fa shizzle!";
+    const char* cipherName;
+    int input          = 0;
+    int replySz        = 0;
+    int retry_shutdown = SHUTDOWN_DELAY_MS; /* max try, once per millisecond */
+    int ret            = 0;
+    IPAddress broadcast_address(255, 255, 255, 255);
+
+    /* Listen for incoming client requests. */
+    client = server.available();
+    if (client)  {
+       Serial.println("Have Client");
+       while (!client.connected()) {
+           /* wait for the client to actually connect */
+           delay(10);
+       }
+        Serial.print("Client connected from remote IP: ");
+        Serial.println(client.remoteIP());
+
+        ssl = wolfSSL_new(ctx);
+        if (ssl == NULL) {
+            Serial.println("Unable to allocate SSL object");
+            fail_wait();
+        }
+
+        ret = wolfSSL_accept(ssl);
+        if (ret != WOLFSSL_SUCCESS) {
+            ret = wolfSSL_get_error(ssl, 0);
+            wolfSSL_ERR_error_string(ret, errBuf);
+            Serial.print("TLS Accept Error: ");
+            Serial.println(errBuf);
+        }
+
+        cipherName = wolfSSL_get_cipher(ssl);
+        Serial.print("SSL cipher suite is ");
+        Serial.println(cipherName);
+
+        Serial.print("Server Read: ");
+        while (!client.available()) {
+            /* wait for data */
+        }
+
+        /* read data */
+        while (wolfSSL_pending(ssl)) {
+            input = wolfSSL_read(ssl, reply, sizeof(reply) - 1);
+            if (input < 0) {
+                ret = wolfSSL_get_error(ssl, 0);
+                wolfSSL_ERR_error_string(ret, errBuf);
+                Serial.print("TLS Read Error: ");
+                Serial.println(errBuf);
+                break;
+            }
+            else if (input > 0) {
+                replySz = input;
+                reply[input] = '\0';
+                Serial.print(reply);
+            }
+            else {
+                Serial.println("<end of reply, input == 0>");
+            }
+        }
+
+        /* Write our message into reply buffer to send */
+        memset(reply, 0, sizeof(reply));
+        memcpy(reply, msg, sizeof(msg));
+        replySz = strnlen(reply, sizeof(reply));
+
+        Serial.println("Sending reply...");
+        if ((wolfSSL_write(ssl, reply, replySz)) != replySz) {
+            ret = wolfSSL_get_error(ssl, 0);
+            wolfSSL_ERR_error_string(ret, errBuf);
+            Serial.print("TLS Write Error: ");
+            Serial.println(errBuf);
+        }
+        else {
+            Serial.println("Reply sent!");
+        }
+
+        Serial.println("Shutdown!");
+        do {
+            delay(1);
+            retry_shutdown--;
+            ret = wolfSSL_shutdown(ssl);
+        } while ((ret == WOLFSSL_SHUTDOWN_NOT_DONE) && (retry_shutdown > 0));
+
+        if (retry_shutdown <= 0) {
+            /* if wolfSSL_free is called before properly shutting down the
+             * ssl object, undesired results may occur. */
+            Serial.println("Warning! Shutdown did not properly complete.");
+        }
+
+        wolfSSL_free(ssl);
+        Serial.println("Connection complete.");
+        if (REPEAT_CONNECTION) {
+            Serial.println();
+            Serial.println("Waiting for next connection.");
+        }
+        else {
+            client.stop();
+            Serial.println("Done!");
+            while (1) {
+                /* wait forever if not repeating */
+                delay(100);
+            }
+        }
+    }
+    else {
+        /* Serial.println("Client not connected. Trying again..."); */
+    }
+
+    delay(100);
+} /* Arduino loop repeats */
--- a/IDE/ARDUINO/sketches/wolfssl_version/README.md
+++ b/IDE/ARDUINO/sketches/wolfssl_version/README.md
@@ -1,5 +1,3 @@
 # Arduino Basic Hello World

 This example simply compiles in wolfSSL and shows the current version number.
-
-NOTE: Moving; See https://github.com/wolfSSL/wolfssl-examples/pull/499
--- a/IDE/ARDUINO/sketches/wolfssl_version/wolfssl_version.ino
+++ b/IDE/ARDUINO/sketches/wolfssl_version/wolfssl_version.ino
@@ -0,0 +1,55 @@
+/* wolfssl_server.ino
+ *
+ * Copyright (C) 2006-2025 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
+#include <Arduino.h>
+
+ /* wolfSSL user_settings.h must be included from settings.h
+  * Make all configurations changes in user_settings.h
+  * Do not edit wolfSSL `settings.h` or `config.h` files.
+  * Do not explicitly include user_settings.h in any source code.
+  * Each Arduino sketch that uses wolfSSL must have: #include "wolfssl.h"
+  * C/C++ source files can use: #include <wolfssl/wolfcrypt/settings.h>
+  * The wolfSSL "settings.h" must be included in each source file using wolfSSL.
+  * The wolfSSL "settings.h" must appear before any other wolfSSL include.
+  */
+#include <wolfssl.h>
+#include <wolfssl/version.h>
+
+/* Choose a monitor serial baud rate: 9600, 14400, 19200, 57600, 74880, etc. */
+#define SERIAL_BAUD 115200
+
+/* Arduino setup */
+void setup() {
+    Serial.begin(SERIAL_BAUD);
+    while (!Serial) {
+        /* wait for serial port to connect. Needed for native USB port only */
+    }
+    Serial.println(F(""));
+    Serial.println(F(""));
+    Serial.println(F("wolfSSL setup complete!"));
+}
+
+/* Arduino main application loop. */
+void loop() {
+    Serial.print("wolfSSL Version: ");
+    Serial.println(LIBWOLFSSL_VERSION_STRING);
+    delay(60000);
+}
--- a/IDE/ARDUINO/wolfssl-arduino.cpp
+++ b/IDE/ARDUINO/wolfssl-arduino.cpp
@@ -1,57 +0,0 @@
-/* wolfssl-arduino.cpp
- *
- * Copyright (C) 2006-2025 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-#include <Arduino.h>
-#include "wolfssl.h"
-
-/* Function to allow wolfcrypt to use Arduino Serial.print for debug messages.
- * See wolfssl/wolfcrypt/logging.c */
-
-#if defined(__AVR__)
-#include <avr/pgmspace.h>  /* Required for PROGMEM handling on AVR */
-#endif
-
-int wolfSSL_Arduino_Serial_Print(const char* const s)
-{
-    /* Reminder: Serial.print is only available in C++ */
-    int is_progmem = 0;
-
-#if defined(__AVR__)
-    const char* t;
-    t = s;
-
-    /* Safely check if `s` is in PROGMEM, 0x8000 is typical for AVR flash */
-    if (reinterpret_cast<uint16_t>(t) >= 0x8000) {
-        while (pgm_read_byte(t)) {
-            Serial.write(pgm_read_byte(t++));
-        }
-        Serial.println();
-        is_progmem = 1;
-    }
-#endif
-
-    /* Print normally for non-AVR boards or RAM-stored strings */
-    if (!is_progmem) {
-        Serial.println(s);
-    }
-
-    return 0;
-};
--- a/IDE/ARDUINO/wolfssl-arduino.sh
+++ b/IDE/ARDUINO/wolfssl-arduino.sh
@@ -26,9 +26,6 @@
 # The Arduino library include file is "wolfssl.h" (all lower case)
 # The Published wolfSSL Arduino Registry is at https://github.com/wolfSSL/Arduino-wolfSSL.git
 # See https://downloads.arduino.cc/libraries/logs/github.com/wolfSSL/Arduino-wolfSSL/
-#
-echo "wolfssl-arduino.sh v5.8.2 rev B"
-
 ROOT_DIR="/wolfssl"

 # The Arduino Version will initially have a suffix appended during fine tuning stage.
@@ -73,24 +70,17 @@ if [ "$ROOT_DIR" = "" ]; then
    exit 1
 fi

-if [ "$ARDUINO_ROOT" = "" ]; then
-    echo "No ARDUINO_ROOT export... detecting..."
-    ARDUINO_ROOT="$HOME/Arduino/libraries"
-
-    # Check environment
-    if [ -n "$WSL_DISTRO_NAME" ]; then
-        # we found a non-blank WSL environment distro name
-        echo "Found WSL: $WSL_DISTRO_NAME"
-        current_path="$(pwd)"
-        pattern="/mnt/?"
-        if echo "$current_path" | grep -Eq "^$pattern"; then
-            # if we are in WSL and shared Windows file system, 'ln' does not work.
-            ARDUINO_ROOT="/mnt/c/Users/$USER/Documents/Arduino/libraries"
-            echo "ARDUINO_ROOT set to $ARDUINO_ROOT"
-        fi
+# Check environment
+if [ -n "$WSL_DISTRO_NAME" ]; then
+    # we found a non-blank WSL environment distro name
+    current_path="$(pwd)"
+    pattern="/mnt/?"
+    if echo "$current_path" | grep -Eq "^$pattern"; then
+        # if we are in WSL and shared Windows file system, 'ln' does not work.
+        ARDUINO_ROOT="/mnt/c/Users/$USER/Documents/Arduino/libraries"
+    else
+        ARDUINO_ROOT="$HOME/Arduino/libraries"
    fi
-else
-    echo "Using export ARDUINO_ROOT"
 fi
 echo "The Arduino library root is: $ARDUINO_ROOT"

@@ -126,21 +116,11 @@ if [ $# -gt 0 ]; then
        echo "Error: not a valid operation: $THIS_OPERATION"
        exit 1
    fi
-else
-    echo "INSTALL parameter not specified. Installing to ROOT_DIR=$ROOT_DIR"
 fi


 ROOT_SRC_DIR="${ROOT_DIR}/src"
 EXAMPLES_DIR="${ROOT_DIR}/examples"
-
-if [ -n "$WOLFSSL_EXAMPLES_ROOT" ]; then
-    EXTRA_EXAMPLES_DIR="${WOLFSSL_EXAMPLES_ROOT}/Arduino"
-    echo "EXTRA_EXAMPLES_DIR=$EXTRA_EXAMPLES_DIR"
-else
-    echo "There are additional examples at https://github.com/wolfSSL/wolfssl-examples"
-    echo "Set WOLFSSL_EXAMPLES_ROOT to your local directory to include those examples."
-fi
 WOLFSSL_SRC="${ROOT_SRC_DIR}/src"
 WOLFSSL_HEADERS="${ROOT_SRC_DIR}/wolfssl"
 WOLFCRYPT_ROOT="${ROOT_SRC_DIR}/wolfcrypt"
@@ -161,16 +141,8 @@ OPENSSL_DIR_TOP="${WOLFSSL_HEADERS_TOP}/openssl"

 WOLFSSL_VERSION=$(grep -i "LIBWOLFSSL_VERSION_STRING" ${TOP_DIR}/wolfssl/version.h | cut -d '"' -f 2)
 if [ "$WOLFSSL_VERSION" = "" ]; then
-    echo "Current user: [$USER]"
-    if [ "$USER" = "" ] || [ "$USER" = "runner" ]; then
-        # Typically when there's no user, it is a GitHub workflow. It is not guaranteed to be "runner"
-        echo "No USER found, no version.h found. Setting Version text to [GitHub] for assumed workflow."
-        WOLFSSL_VERSION="GitHub"
-    else
-        echo "ERROR: Could not find wolfSSL Version in ${TOP_DIR}/wolfssl/version.h"
-        echo "Check autogen.sh and configure"
-        exit 1
-    fi
+    echo "ERROR: Could not find wolfSSL Version in ${TOP_DIR}/wolfssl/version.h"
+    exit 1
 else
    echo "Found wolfSSL version $WOLFSSL_VERSION"
    echo "# WOLFSSL_VERSION_ARUINO_SUFFIX $WOLFSSL_VERSION_ARUINO_SUFFIX"
@@ -182,7 +154,7 @@ THIS_DIR=${PWD##*/}
 if [ "$THIS_DIR" = "ARDUINO" ]; then
    # mkdir ./wolfssl
    if [ -d ".${ROOT_DIR}" ]; then
-        echo "ERROR: $(realpath ".${ROOT_DIR}") is not empty; failed prior install? Please remove."
+        echo "ERROR: $(realpath ".${ROOT_DIR}") is not empty"
        exit 1
    else
        echo "Step 01: mkdir .${ROOT_DIR}"
@@ -263,65 +235,26 @@ if [ "$THIS_DIR" = "ARDUINO" ]; then
    $CP_CMD "${OPENSSL_DIR_TOP}"/* ."${OPENSSL_DIR}"                                          || exit 1

    # Finally, copy the Arduino-specific wolfssl library files into place: [lib]/src
-    $CP_CMD ./wolfssl.h           ".${ROOT_SRC_DIR}"/wolfssl.h           || exit 1
-    $CP_CMD ./wolfssl-arduino.cpp ".${ROOT_SRC_DIR}"/wolfssl-arduino.cpp || exit 1
+    $CP_CMD ./wolfssl.h ".${ROOT_SRC_DIR}"/wolfssl.h

-    unset NO_ARDUINO_EXAMPLES
    echo "Copy examples...."
    # Copy examples
    mkdir -p ".${ROOT_SRC_DIR}"/examples

-    EXAMPLES_DIR_REAL_PATH=$(realpath ".${EXAMPLES_DIR}")
-    echo "Source WOLFSSL_EXAMPLES_ROOT=$WOLFSSL_EXAMPLES_ROOT"
-    echo "Destination EXAMPLES_DIR=.${EXAMPLES_DIR}"
-    echo "EXAMPLES_DIR_REAL_PATH=${EXAMPLES_DIR_REAL_PATH}"
+    echo "Copy wolfssl_client example...."
+    mkdir -p ".${EXAMPLES_DIR}"/wolfssl_client
+    $CP_CMD ./sketches/wolfssl_client/wolfssl_client.ino ".${EXAMPLES_DIR}"/wolfssl_client/wolfssl_client.ino || exit 1
+    $CP_CMD ./sketches/wolfssl_client/README.md          ".${EXAMPLES_DIR}"/wolfssl_client/README.md          || exit 1

-    # Only explicit source code is copied to the Arduino library. Edit with caution, no automation:
-    if [ -n "$WOLFSSL_EXAMPLES_ROOT" ]; then
-        echo "Copy template example...."
-        mkdir -p ".${EXAMPLES_DIR}"/template/wolfssl_library/src
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/template/template.ino                             ".${EXAMPLES_DIR}"/template/template.ino                             || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/template/README.md                                ".${EXAMPLES_DIR}"/template/README.md                                || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/template/wolfssl_helper.c                         ".${EXAMPLES_DIR}"/template/wolfssl_helper.c                         || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/template/wolfssl_helper.h                         ".${EXAMPLES_DIR}"/template/wolfssl_helper.h                         || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/template/wolfssl_library/wolfssl_library.h        ".${EXAMPLES_DIR}"/template/wolfssl_library/wolfssl_library.h        || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/template/wolfssl_library/src/wolfssl_library.cpp  ".${EXAMPLES_DIR}"/template/wolfssl_library/src/wolfssl_library.cpp  || exit 1
+    echo "Copy wolfssl_server example...."
+    mkdir -p .${EXAMPLES_DIR}/wolfssl_server
+    $CP_CMD ./sketches/wolfssl_server/wolfssl_server.ino ".${EXAMPLES_DIR}"/wolfssl_server/wolfssl_server.ino || exit 1
+    $CP_CMD ./sketches/wolfssl_server/README.md          ".${EXAMPLES_DIR}"/wolfssl_server/README.md          || exit 1

-        echo "Copy wolfssl_AES_CTR example...."
-        mkdir -p ".${EXAMPLES_DIR}"/wolfssl_AES_CTR
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_AES_CTR/wolfssl_AES_CTR.ino               ".${EXAMPLES_DIR}"/wolfssl_AES_CTR/wolfssl_AES_CTR.ino               || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_AES_CTR/README.md                         ".${EXAMPLES_DIR}"/wolfssl_AES_CTR/README.md                         || exit 1
-
-        echo "Copy wolfssl_client example...."
-        mkdir -p ".${EXAMPLES_DIR}"/wolfssl_client
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_client/wolfssl_client.ino                 ".${EXAMPLES_DIR}"/wolfssl_client/wolfssl_client.ino                 || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_client/README.md                          ".${EXAMPLES_DIR}"/wolfssl_client/README.md                          || exit 1
-
-        echo "Copy wolfssl_client_dtls example...."
-        mkdir -p ".${EXAMPLES_DIR}"/wolfssl_client_dtls
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_client_dtls/wolfssl_client_dtls.ino       ".${EXAMPLES_DIR}"/wolfssl_client_dtls/wolfssl_client_dtls.ino       || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_client_dtls/README.md                     ".${EXAMPLES_DIR}"/wolfssl_client_dtls/README.md                     || exit 1
-
-        echo "Copy wolfssl_server example...."
-        mkdir -p .${EXAMPLES_DIR}/wolfssl_server
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_server/wolfssl_server.ino                 ".${EXAMPLES_DIR}"/wolfssl_server/wolfssl_server.ino                 || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_server/README.md                          ".${EXAMPLES_DIR}"/wolfssl_server/README.md                          || exit 1
-
-        echo "Copy wolfssl_server_dtls example...."
-        mkdir -p .${EXAMPLES_DIR}/wolfssl_server_dtls
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_server_dtls/wolfssl_server_dtls.ino       ".${EXAMPLES_DIR}"/wolfssl_server_dtls/wolfssl_server_dtls.ino       || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_server_dtls/README.md                     ".${EXAMPLES_DIR}"/wolfssl_server_dtls/README.md                     || exit 1
-
-        echo "Copy wolfssl_version example...."
-        mkdir -p .${EXAMPLES_DIR}/wolfssl_version
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_version/wolfssl_version.ino               ".${EXAMPLES_DIR}"/wolfssl_version/wolfssl_version.ino               || exit 1
-        $CP_CMD "$WOLFSSL_EXAMPLES_ROOT"/Arduino/sketches/wolfssl_version/README.md                         ".${EXAMPLES_DIR}"/wolfssl_version/README.md                         || exit 1
-    else
-        NO_ARDUINO_EXAMPLES=1
-    fi
-    echo "Examples copied to .${EXAMPLES_DIR}"
-    echo "ls ${EXAMPLES_DIR_REAL_PATH}"
-    ls "${EXAMPLES_DIR_REAL_PATH}"
+    echo "Copy wolfssl_server example...."
+    mkdir -p .${EXAMPLES_DIR}/wolfssl_version
+    $CP_CMD ./sketches/wolfssl_version/wolfssl_version.ino ".${EXAMPLES_DIR}"/wolfssl_version/wolfssl_version.ino || exit 1
+    $CP_CMD ./sketches/wolfssl_version/README.md           ".${EXAMPLES_DIR}"/wolfssl_version/README.md           || exit 1
 else
    echo "ERROR: You must be in the IDE/ARDUINO directory to run this script"
    exit 1
@@ -340,8 +273,6 @@ fi
 # as an Arduino-specific README.md file.
 VERSION_PLACEHOLDER="\${WOLFSSL_VERSION}"
 ARDUINO_VERSION_SUFFIX_PLACEHOLDER="\${WOLFSSL_VERSION_ARUINO_SUFFIX}"
-
-# This is the SOURCE to prepend. Note the OUTPUT is PREPENDED_README.md later copied to README.md
 PREPEND_FILE="Arduino_README_prepend.md"
 PROPERTIES_FILE_TEMPLATE="library.properties.template"
 sed s/"$VERSION_PLACEHOLDER"/"$WOLFSSL_VERSION"/ "$PREPEND_FILE" > "$PREPEND_FILE.tmp"
@@ -384,46 +315,29 @@ if [ "$THIS_OPERATION" = "INSTALL" ]; then
    # Nearly an ordinary copy, but we remove any lines with ">>" (typically edit with caution warning in comments)
    grep -v '>>' ../../examples/configs/user_settings_arduino.h > ".${ROOT_SRC_DIR}"/user_settings.h || exit 1

-    echo "This user_settings.h revision string:"
+    # Show the user_settings.h revision string:
    grep "WOLFSSL_USER_SETTINGS_ID" ."${ROOT_SRC_DIR}/user_settings.h"
    echo ""

    if [ "$THIS_INSTALL_IS_GITHUB" = "true" ]; then
        echo "Installing to GitHub directory: $THIS_INSTALL_DIR"
-        cp -r ."$ROOT_DIR"/* "$THIS_INSTALL_DIR"                || exit 1
+        cp -r ."$ROOT_DIR"/* "$THIS_INSTALL_DIR" || exit 1
        echo "Removing workspace library directory: .$ROOT_DIR"
-        rm -rf ".$ROOT_DIR"                                     || exit 1
+        rm -rf ".$ROOT_DIR"
    else

        echo "Installing to local directory:"
        if [ "$THIS_INSTALL_DIR" = "" ]; then
-            if [ -n "$WSL_DISTRO_NAME" ]; then
-                # setfattr not installed by default
-                # echo "Set system.wsl_case_sensitive .$ROOT_DIR"
-                # setfattr -x system.wsl_case_sensitive .$ROOT_DIR
-                #
-                # use copy instead of move to avoid possible system.wsl_case_sensitive warnings
-                echo "cp -r  .\"$ROOT_DIR\" \"$ARDUINO_ROOT\""
-                      cp -r   ."$ROOT_DIR"   "$ARDUINO_ROOT"    || exit 1
+            echo "mv .$ROOT_DIR $ARDUINO_ROOT"
+            mv  ."$ROOT_DIR" "$ARDUINO_ROOT" || exit 1

-                echo "rm -rf .\"$ROOT_DIR\""
-                      rm -rf  ."$ROOT_DIR"                      || exit 1
-            else
-                echo "mv  .$ROOT_DIR   $ARDUINO_ROOT"
-                      mv ."$ROOT_DIR" "$ARDUINO_ROOT"           || exit 1
-            fi
            echo "Arduino wolfSSL Version: $WOLFSSL_VERSION$WOLFSSL_VERSION_ARUINO_SUFFIX"
        else
            echo "cp -r .\"$ROOT_DIR\"/* \"$THIS_INSTALL_DIR\""
-            mkdir -p "$THIS_INSTALL_DIR"                        || exit 1
-            cp -r ."$ROOT_DIR"/* "$THIS_INSTALL_DIR"            || exit 1
+            mkdir -p "$THIS_INSTALL_DIR" || exit 1
+            cp -r ."$ROOT_DIR"/* "$THIS_INSTALL_DIR" || exit 1
        fi
    fi
 fi

-if [ -n "$NO_ARDUINO_EXAMPLES" ]; then
-    echo ""
-    echo "WARNING: No examples copied. Set WOLFSSL_EXAMPLES_ROOT as appropriate."
-    echo ""
-fi
 echo "Done!"
--- a/IDE/ARDUINO/wolfssl.h
+++ b/IDE/ARDUINO/wolfssl.h
@@ -6,7 +6,7 @@
 *
 * wolfSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * wolfSSL is distributed in the hope that it will be useful,
@@ -22,7 +22,6 @@
 /* Edit with caution. This is an Arduino-library specific header for wolfSSL */

 #ifndef WOLFSSL_USER_SETTINGS
-    /* Should already be defined in settings.h for #if defined(ARDUINO) */
    #define WOLFSSL_USER_SETTINGS
 #endif

@@ -40,10 +39,9 @@
 #include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/ssl.h>

-#ifndef WOLFSSL_ARDUINO_H
-#define WOLFSSL_ARDUINO_H
-
-/* Declare a helper function to be used in wolfssl/wolfcrypt/logging.c */
-int wolfSSL_Arduino_Serial_Print(const char* const s);
-
-#endif /* WOLFSSL_ARDUINO_H */
+int wolfSSL_Arduino_Serial_Print(const char *const s)
+{
+    /* See wolfssl/wolfcrypt/logging.c */
+    Serial.println(F(s));
+    return 0;
+};
--- a/IDE/AURIX/Cpu0_Main.c
+++ b/IDE/AURIX/Cpu0_Main.c
@@ -6,7 +6,7 @@
 *
 * wolfSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * wolfSSL is distributed in the hope that it will be useful,
--- a/IDE/AURIX/user_settings.h
+++ b/IDE/AURIX/user_settings.h
@@ -6,7 +6,7 @@
 *
 * wolfSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * wolfSSL is distributed in the hope that it will be useful,
--- a/IDE/AURIX/wolf_main.c
+++ b/IDE/AURIX/wolf_main.c
@@ -6,7 +6,7 @@
 *
 * wolfSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * wolfSSL is distributed in the hope that it will be useful,
--- a/IDE/Android/Android.bp
+++ b/IDE/Android/Android.bp
@@ -40,7 +40,7 @@ cc_library_shared {
        "./src/wolfio.c",
    ] + [
        "./wolfcrypt/src/aes.c",
-        "./wolfcrypt/src/arc4.c",
+        // ARC4 implementation has been removed
        "./wolfcrypt/src/asm.c",
        "./wolfcrypt/src/asn.c",
        "./wolfcrypt/src/blake2b.c",
--- a/IDE/CRYPTOCELL/main.c
+++ b/IDE/CRYPTOCELL/main.c
@@ -6,7 +6,7 @@
 *
 * wolfSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * wolfSSL is distributed in the hope that it will be useful,
--- a/IDE/CRYPTOCELL/user_settings.h
+++ b/IDE/CRYPTOCELL/user_settings.h
@@ -6,7 +6,7 @@
 *
 * wolfSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * wolfSSL is distributed in the hope that it will be useful,
--- a/IDE/ECLIPSE/DEOS/deos_malloc.c
+++ b/IDE/ECLIPSE/DEOS/deos_malloc.c
@@ -6,7 +6,7 @@
 *
 * wolfSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * wolfSSL is distributed in the hope that it will be useful,
--- a/IDE/ECLIPSE/DEOS/tls_wolfssl.c
+++ b/IDE/ECLIPSE/DEOS/tls_wolfssl.c
@@ -6,7 +6,7 @@
 *
 * wolfSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * wolfSSL is distributed in the hope that it will be useful,
--- a/Show More
+++ b/Show More