From 8f049f6dff3e5f73038869af9512c02605b4b138 Mon Sep 17 00:00:00 2001
From: Gustavo Monteiro <64990476+GustaMonteiro@users.noreply.github.com>
Date: Mon, 19 Jan 2026 04:56:02 -0300
Subject: [PATCH] [wolfssl] Add feature option to enable curve25519 support
 (#49490)

---
 ports/wolfssl/portfile.cmake | 7 +++++++
 ports/wolfssl/vcpkg.json     | 4 ++++
 versions/baseline.json       | 2 +-
 versions/w-/wolfssl.json     | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake
index 4205a64865..d43ed8acf7 100644
--- a/ports/wolfssl/portfile.cmake
+++ b/ports/wolfssl/portfile.cmake
@@ -25,6 +25,12 @@ else()
     set(ENABLE_QUIC no)
 endif()
 
+if ("curve25519" IN_LIST FEATURES)
+    set(ENABLE_CURVE25519 yes)
+else()
+    set(ENABLE_CURVE25519 no)
+endif()
+
 vcpkg_cmake_get_vars(cmake_vars_file)
 include("${cmake_vars_file}")
 
@@ -57,6 +63,7 @@ vcpkg_cmake_configure(
       -DWOLFSSL_DTLS_CID=${ENABLE_DTLS}
       -DWOLFSSL_QUIC=${ENABLE_QUIC}
       -DWOLFSSL_SESSION_TICKET=${ENABLE_QUIC}
+      -DWOLFSSL_CURVE25519=${ENABLE_CURVE25519}
     OPTIONS_RELEASE
       -DCMAKE_C_FLAGS=${VCPKG_COMBINED_C_FLAGS_RELEASE}
     OPTIONS_DEBUG
diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json
index 54f8f37b7c..6991cce827 100644
--- a/ports/wolfssl/vcpkg.json
+++ b/ports/wolfssl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "wolfssl",
   "version": "5.8.4",
+  "port-version": 1,
   "description": "TLS and Cryptographic library for many platforms",
   "homepage": "https://wolfssl.com",
   "license": "GPL-3.0-or-later",
@@ -23,6 +24,9 @@
     "asio": {
       "description": "Enable asio support"
     },
+    "curve25519": {
+      "description": "Enables Curve25519 support"
+    },
     "dtls": {
       "description": "DTLS support"
     },
diff --git a/versions/baseline.json b/versions/baseline.json
index 69567747ad..c814fdbee3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -10678,7 +10678,7 @@
     },
     "wolfssl": {
       "baseline": "5.8.4",
-      "port-version": 0
+      "port-version": 1
     },
     "wolftpm": {
       "baseline": "3.10.0",
diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json
index c7dd4d7a1b..da5786e6fc 100644
--- a/versions/w-/wolfssl.json
+++ b/versions/w-/wolfssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "20f0274c9dd43541ec99a3678ce958a7f1009841",
+      "version": "5.8.4",
+      "port-version": 1
+    },
     {
       "git-tree": "c671ed47b3bdefeaa595d9ec6a86d6dbbfbc2ff3",
       "version": "5.8.4",