Update TLS profiles to Mozilla guidelines v6.0

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: camilamacedo86

hack/tools/update-tls-profiles.sh

@@ -17,12 +17,23 @@ curl -L -s ${INPUT} > ${TMPFILE}
 
 version=$(${JQ} -r '.version' ${TMPFILE})
 
+# Check if old profile exists (used for both header note and profile generation)
+has_old_profile=false
+if ${JQ} -e '.configurations.old' ${TMPFILE} > /dev/null 2>&1; then
+    has_old_profile=true
+    old_profile_note=""
+else
+    old_profile_note="
+// NOTE: The \"old\" profile is preserved from Mozilla v5.8 for backwards compatibility,
+//       as it was removed from Mozilla guidelines v${version}."
+fi
+
 cat > ${OUTPUT} <<EOF
 package tlsprofiles
 
 // DO NOT EDIT, GENERATED BY ${0}
 // DATA SOURCE: ${INPUT}
-// DATA VERSION: ${version}
+// DATA VERSION: ${version}${old_profile_note}
 
 import (
 "crypto/tls"
@@ -38,7 +49,7 @@ cipherNums: []uint16{
 EOF
 
     ${JQ} -r ".configurations.$1.ciphersuites.[] | . |= \"tls.\" + . + \",\"" ${TMPFILE} >> ${OUTPUT}
-    ${JQ} -r ".configurations.$1.ciphers.go[] | . |= \"tls.\" + . + \",\"" ${TMPFILE} >> ${OUTPUT}
+    ${JQ} -r ".configurations.$1.ciphers.iana[] | . |= \"tls.\" + . + \",\"" ${TMPFILE} >> ${OUTPUT}
 
     cat >> ${OUTPUT} <<EOF
 },
@@ -63,7 +74,54 @@ EOF
 
 generate_profile "modern"
 generate_profile "intermediate"
-generate_profile "old"
+# Only generate old profile if it exists in the guidelines
+if [ "$has_old_profile" = true ]; then
+    generate_profile "old"
+else
+    # Old profile removed from Mozilla guidelines v6.0
+    # Preserving v5.8 definition for backwards compatibility
+    # Note: Some v5.8 ciphers (TLS_*_AES_256_CBC_SHA384, TLS_RSA_WITH_AES_256_CBC_SHA256)
+    # are not available in Go's crypto/tls package, so we use a curated subset
+    cat >> ${OUTPUT} <<'EOF'
+
+var oldTLSProfile = tlsProfile{
+	ciphers: cipherSlice{
+		cipherNums: []uint16{
+			tls.TLS_AES_128_GCM_SHA256,
+			tls.TLS_AES_256_GCM_SHA384,
+			tls.TLS_CHACHA20_POLY1305_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_RSA_WITH_AES_128_CBC_SHA256,
+			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+		},
+	},
+	curves: curveSlice{
+		curveNums: []tls.CurveID{
+			X25519MLKEM768,
+			X25519,
+			prime256v1,
+			secp384r1,
+		},
+	},
+	minTLSVersion: tls.VersionTLS10,
+}
+EOF
+fi
 
 # Make go happy
 go fmt ${OUTPUT}

internal/shared/util/tlsprofiles/mozilla_data.go

@@ -2,7 +2,9 @@ package tlsprofiles
 
 // DO NOT EDIT, GENERATED BY hack/tools/update-tls-profiles.sh
 // DATA SOURCE: https://ssl-config.mozilla.org/guidelines/latest.json
-// DATA VERSION: 5.7
+// DATA VERSION: 6
+// NOTE: The "old" profile is preserved from Mozilla v5.8 for backwards compatibility,
+//       as it was removed from Mozilla guidelines v6.
 
 import (
 	"crypto/tls"
@@ -18,6 +20,7 @@ var modernTLSProfile = tlsProfile{
 	},
 	curves: curveSlice{
 		curveNums: []tls.CurveID{
+			X25519MLKEM768,
 			X25519,
 			prime256v1,
 			secp384r1,
@@ -36,12 +39,13 @@ var intermediateTLSProfile = tlsProfile{
 			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
 			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
 			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
 		},
 	},
 	curves: curveSlice{
 		curveNums: []tls.CurveID{
+			X25519MLKEM768,
 			X25519,
 			prime256v1,
 			secp384r1,
@@ -60,8 +64,8 @@ var oldTLSProfile = tlsProfile{
 			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
 			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
 			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
 			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
 			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
 			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
@@ -78,6 +82,7 @@ var oldTLSProfile = tlsProfile{
 	},
 	curves: curveSlice{
 		curveNums: []tls.CurveID{
+			X25519MLKEM768,
 			X25519,
 			prime256v1,
 			secp384r1,

internal/shared/util/tlsprofiles/tlsprofiles.go

@@ -69,17 +69,19 @@ func cipherSuiteId(name string) uint16 {
 
 // This is primarily so that we don't have to rewrite curve values in mozilla_data.go
 const (
-	X25519     tls.CurveID = tls.X25519
-	prime256v1 tls.CurveID = tls.CurveP256
-	secp384r1  tls.CurveID = tls.CurveP384
-	secp521r1  tls.CurveID = tls.CurveP521
+	X25519MLKEM768 tls.CurveID = tls.X25519MLKEM768
+	X25519         tls.CurveID = tls.X25519
+	prime256v1     tls.CurveID = tls.CurveP256
+	secp384r1      tls.CurveID = tls.CurveP384
+	secp521r1      tls.CurveID = tls.CurveP521
 )
 
 var curves = map[string]tls.CurveID{
-	"X25519":     tls.X25519,
-	"prime256v1": tls.CurveP256,
-	"secp384r1":  tls.CurveP384,
-	"secp521r1":  tls.CurveP521,
+	"X25519MLKEM768": tls.X25519MLKEM768,
+	"X25519":         tls.X25519,
+	"prime256v1":     tls.CurveP256,
+	"secp384r1":      tls.CurveP384,
+	"secp521r1":      tls.CurveP521,
 }
 
 // Returns 0 for an invalid curve name

internal/shared/util/tlsprofiles/tlsprofiles_test.go

@@ -1,6 +1,7 @@
 package tlsprofiles
 
 import (
+	"crypto/tls"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -114,13 +115,15 @@ func TestSetCustomCurves(t *testing.T) {
 		name   string
 		result bool
 	}{
+		{"X25519MLKEM768", true},
 		{"X25519", true},
 		{"prime256v1", true},
 		{"secp384r1", true},
 		{"secp521r1", true},
 		{"unknown-cuve", false},
-		{"X448", false},             // Valid OpenSSL curve, not implemented
-		{"X25519,prime256v1", true}, // Multiple
+		{"X448", false},                            // Valid OpenSSL curve, not implemented
+		{"X25519,prime256v1", true},                // Multiple
+		{"X25519MLKEM768,X25519,prime256v1", true}, // Multiple with new curve
 	}
 
 	for _, test := range tests {
@@ -158,3 +161,34 @@ func TestSetCustomVersion(t *testing.T) {
 		}
 	}
 }
+
+func TestModernProfileContents(t *testing.T) {
+	// Verify modern profile contains X25519MLKEM768 (new in Mozilla v6.0)
+	require.Contains(t, modernTLSProfile.curves.curveNums, X25519MLKEM768, "modern profile should include X25519MLKEM768 curve")
+	require.Contains(t, modernTLSProfile.curves.curveNums, X25519, "modern profile should include X25519 curve")
+
+	// Verify modern profile ciphers
+	require.NotEmpty(t, modernTLSProfile.ciphers.cipherNums, "modern profile should have ciphers")
+	require.Contains(t, modernTLSProfile.ciphers.cipherNums, tls.TLS_AES_128_GCM_SHA256, "modern profile should include TLS_AES_128_GCM_SHA256")
+	require.Contains(t, modernTLSProfile.ciphers.cipherNums, tls.TLS_CHACHA20_POLY1305_SHA256, "modern profile should include TLS_CHACHA20_POLY1305_SHA256")
+}
+
+func TestIntermediateProfileContents(t *testing.T) {
+	// Verify intermediate profile contains X25519MLKEM768 (new in Mozilla v6.0)
+	require.Contains(t, intermediateTLSProfile.curves.curveNums, X25519MLKEM768, "intermediate profile should include X25519MLKEM768 curve")
+	require.Contains(t, intermediateTLSProfile.curves.curveNums, X25519, "intermediate profile should include X25519 curve")
+
+	// Verify intermediate profile has TLS 1.2 ciphers
+	require.NotEmpty(t, intermediateTLSProfile.ciphers.cipherNums, "intermediate profile should have ciphers")
+	require.Greater(t, len(intermediateTLSProfile.ciphers.cipherNums), len(modernTLSProfile.ciphers.cipherNums), "intermediate profile should have more ciphers than modern")
+}
+
+func TestOldProfileContents(t *testing.T) {
+	// Verify old profile is preserved from Mozilla v5.8
+	require.Contains(t, oldTLSProfile.curves.curveNums, X25519MLKEM768, "old profile should include X25519MLKEM768 (from v5.8)")
+	require.Contains(t, oldTLSProfile.curves.curveNums, X25519, "old profile should include X25519 curve")
+
+	// Verify old profile has legacy ciphers
+	require.NotEmpty(t, oldTLSProfile.ciphers.cipherNums, "old profile should have ciphers")
+	require.Greater(t, len(oldTLSProfile.ciphers.cipherNums), len(intermediateTLSProfile.ciphers.cipherNums), "old profile should have more ciphers than intermediate")
+}