From 273825891b38855cfc73d23b8f05c3bb5bb0feeb Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Sat, 15 Feb 2020 11:40:53 -0800 Subject: [PATCH] go mod vendor --- .../hashicorp/vault/sdk/helper/ldaputil/config.go | 8 ++++---- .../hashicorp/vault/sdk/helper/listenerutil/listener.go | 2 +- .../hashicorp/vault/sdk/helper/tlsutil/tlsutil.go | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/vendor/github.com/hashicorp/vault/sdk/helper/ldaputil/config.go b/vendor/github.com/hashicorp/vault/sdk/helper/ldaputil/config.go index 1ecceffc27..47f3c042e5 100644 --- a/vendor/github.com/hashicorp/vault/sdk/helper/ldaputil/config.go +++ b/vendor/github.com/hashicorp/vault/sdk/helper/ldaputil/config.go @@ -134,21 +134,21 @@ Default: cn`, "tls_min_version": { Type: framework.TypeString, Default: "tls12", - Description: "Minimum TLS version to use. Accepted values are 'tls10', 'tls11' or 'tls12'. Defaults to 'tls12'", + Description: "Minimum TLS version to use. Accepted values are 'tls10', 'tls11', 'tls12' or 'tls13'. Defaults to 'tls12'", DisplayAttrs: &framework.DisplayAttributes{ Name: "Minimum TLS Version", }, - AllowedValues: []interface{}{"tls10", "tls11", "tls12"}, + AllowedValues: []interface{}{"tls10", "tls11", "tls12", "tls13"}, }, "tls_max_version": { Type: framework.TypeString, Default: "tls12", - Description: "Maximum TLS version to use. Accepted values are 'tls10', 'tls11' or 'tls12'. Defaults to 'tls12'", + Description: "Maximum TLS version to use. Accepted values are 'tls10', 'tls11', 'tls12' or 'tls13'. Defaults to 'tls12'", DisplayAttrs: &framework.DisplayAttributes{ Name: "Maximum TLS Version", }, - AllowedValues: []interface{}{"tls10", "tls11", "tls12"}, + AllowedValues: []interface{}{"tls10", "tls11", "tls12", "tls13"}, }, "deny_null_bind": { diff --git a/vendor/github.com/hashicorp/vault/sdk/helper/listenerutil/listener.go b/vendor/github.com/hashicorp/vault/sdk/helper/listenerutil/listener.go index d21082b9f2..38c130c146 100644 --- a/vendor/github.com/hashicorp/vault/sdk/helper/listenerutil/listener.go +++ b/vendor/github.com/hashicorp/vault/sdk/helper/listenerutil/listener.go @@ -126,7 +126,7 @@ PASSPHRASECORRECT: tlsConf.NextProtos = []string{"h2", "http/1.1"} tlsConf.MinVersion, ok = tlsutil.TLSLookup[tlsvers] if !ok { - return nil, nil, nil, nil, fmt.Errorf("'tls_min_version' value %q not supported, please specify one of [tls10,tls11,tls12]", tlsvers) + return nil, nil, nil, nil, fmt.Errorf("'tls_min_version' value %q not supported, please specify one of [tls10,tls11,tls12,tls13]", tlsvers) } tlsConf.ClientAuth = tls.RequestClientCert diff --git a/vendor/github.com/hashicorp/vault/sdk/helper/tlsutil/tlsutil.go b/vendor/github.com/hashicorp/vault/sdk/helper/tlsutil/tlsutil.go index a17e10cda8..8adc0040a1 100644 --- a/vendor/github.com/hashicorp/vault/sdk/helper/tlsutil/tlsutil.go +++ b/vendor/github.com/hashicorp/vault/sdk/helper/tlsutil/tlsutil.go @@ -21,6 +21,7 @@ var TLSLookup = map[string]uint16{ "tls10": tls.VersionTLS10, "tls11": tls.VersionTLS11, "tls12": tls.VersionTLS12, + "tls13": tls.VersionTLS13, } // cipherMap maps the cipher suite names to the internal cipher suite code.