Skip to content

Commit ac29447

Browse files
committed
mbedtls: add 4.x versions
And also slightly changed the test so it works on both 3.x and 4.x versions
1 parent 5ce4e49 commit ac29447

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

packages/m/mbedtls/xmake.lua

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ package("mbedtls")
1515
end})
1616
add_urls("https://github.com/Mbed-TLS/mbedtls.git")
1717

18+
add_versions("v4.2.0", "2bed9d713b4668f76553b097e72b8aa30bc8f112a940d7ae228d524bbde6ffea")
19+
add_versions("v4.1.1", "3359a349e23db3d5536fcee032ae7b2ecbfc08972fab643089b5cbf2a375c98c")
20+
add_versions("v4.0.0", "2f3a47f7b3a541ddef450e4867eeecb7ce2ef7776093f3a11d6d43ead6bf2827")
1821
add_versions("v3.6.7", "a7e8bcbec0e6f761b4af24f25677626b35f762f68eef79c08677a363212d11f6")
1922
add_versions("v3.6.1", "fc8bef0991b43629b7e5319de6f34f13359011105e08e3e16eed3a9fe6ffd3a3")
2023
add_versions("v3.6.0", "3ecf94fcfdaacafb757786a01b7538a61750ebd85c4b024f56ff8ba1490fcd38")
@@ -29,7 +32,13 @@ package("mbedtls")
2932

3033
add_deps("cmake")
3134

32-
add_links("mbedtls", "mbedx509", "mbedcrypto")
35+
on_load(function (package)
36+
if package:version() and package:version():ge("4.0.0") then
37+
package:add("links", "mbedtls", "mbedx509", "tfpsacrypto")
38+
else
39+
package:add("links", "mbedtls", "mbedx509", "mbedcrypto")
40+
end
41+
end)
3342

3443
if is_plat("windows", "mingw") then
3544
add_syslinks("ws2_32", "advapi32", "bcrypt")
@@ -69,10 +78,8 @@ package("mbedtls")
6978
assert(package:has_cfuncs("mbedtls_ssl_init", {includes = "mbedtls/ssl.h"}))
7079
assert(package:check_cxxsnippets({test = [[
7180
void test() {
72-
mbedtls_aes_context ctx;
73-
74-
unsigned char key[32];
75-
mbedtls_aes_setkey_enc(&ctx, key, 256);
81+
psa_status_t status = psa_crypto_init();
82+
(void)status;
7683
}
77-
]]}, {includes = "mbedtls/aes.h"}))
84+
]]}, {includes = "psa/crypto.h"}))
7885
end)

0 commit comments

Comments
 (0)