From 87a393a595f073dbda26b1bb756f004a5491e8f3 Mon Sep 17 00:00:00 2001 From: Loganaden Velvindron Date: Sun, 25 May 2025 17:53:36 +0400 Subject: [PATCH 1/3] update to go 1.24.0 --- config/configtls/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/configtls/go.mod b/config/configtls/go.mod index e62f31a8e7f..e42e6c69963 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configtls -go 1.23.0 +go 1.24.0 require ( github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e From d558a9cc3bd05b37f9a8cd67c347a1c848b947c3 Mon Sep 17 00:00:00 2001 From: Loganaden Velvindron Date: Sun, 25 May 2025 17:55:35 +0400 Subject: [PATCH 2/3] Allow X25519MLKEM768 in configtls --- config/configtls/configtls.go | 1 + 1 file changed, 1 insertion(+) diff --git a/config/configtls/configtls.go b/config/configtls/configtls.go index 841b302c45f..fcccd7d56f6 100644 --- a/config/configtls/configtls.go +++ b/config/configtls/configtls.go @@ -482,4 +482,5 @@ var tlsCurveTypes = map[string]tls.CurveID{ "P384": tls.CurveP384, "P521": tls.CurveP521, "X25519": tls.X25519, + "X25519MLKEM768": tls.X25519MLKEM768, } From 41b3f8936b94dc789344c8faa4fa09394f5b6cfd Mon Sep 17 00:00:00 2001 From: Loganaden Velvindron Date: Sun, 25 May 2025 17:58:03 +0400 Subject: [PATCH 3/3] Enable X25519MLKEM768 in test as well. --- config/configtls/configtls_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/configtls/configtls_test.go b/config/configtls/configtls_test.go index 57b0f920d54..b8e062525eb 100644 --- a/config/configtls/configtls_test.go +++ b/config/configtls/configtls_test.go @@ -881,6 +881,11 @@ func TestCurvePreferences(t *testing.T) { expectedCurveIDs []tls.CurveID expectedErr string }{ + { + name: "X25519MLKEM768", + preferences: []string{"X25519MLKEM768"}, + expectedCurveIDs: []tls.CurveID{tls.X25519MLKEM768}, + }, { name: "X25519", preferences: []string{"X25519"},