mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-08-27 17:41:13 +02:00
Code Issues Projects Releases Wiki Activity

Makes naming consistent with 'logical'

Browse Source
This commit is contained in:
Filipe Varela 2017-06-08 09:26:53 +01:00 committed by Oliver Beattie
parent a4b2c9aaab
commit e875ac38a3
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
physical/cassandra.go
View File

@ -160,24 +160,29 @@ func setupCassandraTLS(conf map[string]string, cluster *gocql.ClusterConfig) err
} }
} }
if insecureSkipVerifyStr, ok := conf["insecure_skip_verify"]; ok { if tlsSkipVerifyStr, ok := conf["tls_skip_verify"]; ok {
insecureSkipVerify, err := strconv.Atoi(insecureSkipVerifyStr) tlsSkipVerify, err := strconv.Atoi(tlsSkipVerifyStr)
if err != nil { if err != nil {
return fmt.Errorf("'insecure_tls_verify' must be an integer (0 or 1)") return fmt.Errorf("'tls_skip_verify' must be an integer (0 or 1)")
} }
if insecureSkipVerify == 0 { if tlsSkipVerify == 0 {
tlsConfig.InsecureSkipVerify = false tlsConfig.InsecureSkipVerify = false
} else { } else {
tlsConfig.InsecureSkipVerify = true tlsConfig.InsecureSkipVerify = true
} }
} }
if tlsMinVersionStr, ok := conf["tls_min_version"]; ok { if tlsMinVersion, ok := conf["tls_min_version"]; ok {
tlsMinVersion, err := strconv.Atoi(tlsMinVersionStr) switch tlsMinVersion {
if err != nil { case "tls10":
return fmt.Errorf("'tls_min_version' must be an integer") tlsConfig.MinVersion = tls.VersionTLS10
case "tls11":
tlsConfig.MinVersion = tls.VersionTLS11
case "tls12":
tlsConfig.MinVersion = tls.VersionTLS12
default:
return fmt.Errorf("'tls_min_version' must be one of `tls10`, `tls11` or `tls12`")
} }
tlsConfig.MinVersion = uint16(tlsMinVersion)
} }
cluster.SslOpts = &gocql.SslOptions{ cluster.SslOpts = &gocql.SslOptions{