Skip to content

Commit

Permalink
configtls: TLS 1.2 is the new default min version (open-telemetry#4503)
Browse files Browse the repository at this point in the history
* configtls: TLS 1.2 is the new default min version

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

* Add changelog entry

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

Co-authored-by: Bogdan Drutu <[email protected]>
  • Loading branch information
jpkrohling and bogdandrutu authored Dec 2, 2021
1 parent 7402e94 commit 9309a1f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
## 🛑 Breaking changes 🛑

- Remove `config.NewConfigMapFrom[File|Buffer]`, add testonly version (#4502)
- `configtls`: TLS 1.2 is the new default mininum version (#4503)

## 🧰 Bug fixes 🧰

Expand Down
3 changes: 2 additions & 1 deletion config/configtls/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ won't use TLS at all.

Minimum and maximum TLS version can be set:

- `min_version` (default = "1.0"): Minimum acceptable TLS version.
- `min_version` (default = "1.2"): Minimum acceptable TLS version.
It's recommended to use at least 1.2 as the minimum version.

- `max_version` (default = "1.3"): Maximum acceptable TLS version.

Expand Down
2 changes: 1 addition & 1 deletion config/configtls/configtls.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (c TLSServerSetting) LoadTLSConfig() (*tls.Config, error) {

func convertVersion(v string) (uint16, error) {
if v == "" {
return 0, nil // default
return tls.VersionTLS12, nil // default
}
val, ok := tlsVersions[v]
if !ok {
Expand Down

0 comments on commit 9309a1f

Please sign in to comment.