Merge pull request moby#5413 from sgarcez/grpc-alpn-fix

tonistiigi · web-flow · commit 2534310fd4c5 · 2024-10-10T16:52:03.000-07:00
fix: set h2 protocol identifier to comply with TLS-ALPN
diff --git a/cmd/buildkitd/main.go b/cmd/buildkitd/main.go
@@ -740,6 +740,7 @@ func serverCredentials(cfg config.TLSConfig) (*tls.Config, error) {
 	}
 	tlsConf := &tls.Config{
 		Certificates: []tls.Certificate{certificate},
+		NextProtos:   []string{"h2"},
 	}
 	if caFile != "" {
 		certPool := x509.NewCertPool()

Original file line number	Diff line number	Diff line change
`@@ -740,6 +740,7 @@ func serverCredentials(cfg config.TLSConfig) (*tls.Config, error) {`
`740`	`740`	`}`
`741`	`741`	`tlsConf := &tls.Config{`
`742`	`742`	`Certificates: []tls.Certificate{certificate},`
	`743`	`+ NextProtos: []string{"h2"},`
`743`	`744`	`}`
`744`	`745`	`if caFile != "" {`
`745`	`746`	`certPool := x509.NewCertPool()`