aboutsummaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorGravatar Sadie Powell2024-04-01 14:44:34 +0100
committerGravatar Sadie Powell2024-04-15 21:45:42 +0100
commite24ea1723ccbdcb8a50cdbb16ba963597077c39d (patch)
tree06bef40559e19b0ada0560b4bcd3386fbc2983f2 /win
parentMerge branch 'insp3' into master. (diff)
Move ssl_mbedtls to inspircd-contrib.
Closes #2088.
Diffstat (limited to 'win')
-rw-r--r--win/conanfile.txt3
-rw-r--r--win/modules/CMakeLists.txt1
2 files changed, 1 insertions, 3 deletions
diff --git a/win/conanfile.txt b/win/conanfile.txt
index b6a966b65..81d767a3f 100644
--- a/win/conanfile.txt
+++ b/win/conanfile.txt
@@ -1,6 +1,6 @@
# Last updated: 2024-03-01
#
-# Modules we can't legally ship: geo_maxmind, ssl_mbedtls, ssl_openssl
+# Modules we can't legally ship: geo_maxmind, ssl_openssl
# Modules which don't apply to Windows: sslrehashsignal
# Modules without packages: ssl_gnutls
@@ -10,7 +10,6 @@ argon2/20190702
libmysqlclient/8.1.0
libpq/15.4
libpsl/0.21.1
-## mbedtls/3.2.1 # unable to upgrade until mbedTLS issue #7087 is fixed
## openssl/3.2.1
pcre2/10.43
rapidjson/cci.20230929
diff --git a/win/modules/CMakeLists.txt b/win/modules/CMakeLists.txt
index 5483eaa5c..c002537e7 100644
--- a/win/modules/CMakeLists.txt
+++ b/win/modules/CMakeLists.txt
@@ -49,7 +49,6 @@ if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
enable_extra("regex_pcre" "PCRE2")
enable_extra("regex_posix" "PCRE2")
enable_extra("regex_re2" "RE2")
- enable_extra("ssl_mbedtls" "MBEDTLS")
enable_extra("ssl_openssl" "OPENSSL")
enable_extra("sqlite3" "SQLITE3")