From ab2eca4bf8591cdd650f265ea148c9dd57987eb1 Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Fri, 9 Jan 2026 07:28:56 -0500 Subject: [PATCH] Bump the FFI version for 3.11 --- doc/api_ref/ffi.rst | 1 + src/lib/ffi/ffi.cpp | 5 +++++ src/lib/ffi/ffi.h | 2 +- src/lib/ffi/info.txt | 6 +++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/api_ref/ffi.rst b/doc/api_ref/ffi.rst index 19cfbdb2b2b..b7a025ff985 100644 --- a/doc/api_ref/ffi.rst +++ b/doc/api_ref/ffi.rst @@ -249,6 +249,7 @@ supported it. ============== =================== FFI Version Supported Starting ============== =================== +20260203 3.11.0 20250829 3.10.0 20250506 3.8.0 20240408 3.4.0 diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp index a975344b39b..b45c270c233 100644 --- a/src/lib/ffi/ffi.cpp +++ b/src/lib/ffi/ffi.cpp @@ -219,6 +219,11 @@ uint32_t botan_ffi_api_version() { } int botan_ffi_supports_api(uint32_t api_version) { + // This is the API introduced in 3.11 + if(api_version == 20260203) { + return BOTAN_FFI_SUCCESS; + } + // This is the API introduced in 3.10 if(api_version == 20250829) { return BOTAN_FFI_SUCCESS; diff --git a/src/lib/ffi/ffi.h b/src/lib/ffi/ffi.h index 1bcd006bf86..a30d6c330bd 100644 --- a/src/lib/ffi/ffi.h +++ b/src/lib/ffi/ffi.h @@ -69,7 +69,7 @@ API follows a few simple rules: * that declaration is not visible here since this header is intentionally * free-standing, depending only on a few C standard library headers. */ -#define BOTAN_FFI_API_VERSION 20250829 +#define BOTAN_FFI_API_VERSION 20260203 /** * BOTAN_FFI_EXPORT indicates public FFI functions. diff --git a/src/lib/ffi/info.txt b/src/lib/ffi/info.txt index a10f8727187..c696a238abf 100644 --- a/src/lib/ffi/info.txt +++ b/src/lib/ffi/info.txt @@ -1,5 +1,9 @@ -FFI -> 20250829 +# When bumping remember to also update +# - BOTAN_FFI_API_VERSION in ffi.h +# - botan_ffi_supports_api in ffi.cpp +# - The table of versions in ffi.rst +FFI -> 20260203