upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-04 14:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Trim leading/trailing space around PEM bundles.

Browse source 
Fixes #1634
This commit is contained in:
Jeff Mitchell 2016-07-20 13:57:49 -04:00
parent 46ecb9a660
commit fda9473681
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
command/server/listener.go
View file

@ -75,7 +75,7 @@ func listenerWrapTLS(
tlsConf := &tls.Config{}
tlsConf.GetCertificate = cg.getCertificate
tlsConf.NextProtos = []string{"http/1.1"}
tlsConf.NextProtos = []string{"h2", "http/1.1"}
tlsConf.MinVersion, ok = tlsutil.TLSLookup[tlsvers]
if !ok {
return nil, nil, nil, fmt.Errorf("'tls_min_version' value %s not supported, please specify one of [tls10,tls11,tls12]", tlsvers)

2
helper/certutil/helpers.go
View file

@ -109,6 +109,8 @@ func ParsePEMBundle(pemBundle string) (*ParsedCertBundle, error) {
return nil, UserError{"empty pem bundle"}
}
pemBundle = strings.TrimSpace(pemBundle)
pemBytes := []byte(pemBundle)
var pemBlock *pem.Block
parsedBundle := &ParsedCertBundle{}

2
helper/certutil/types.go
View file

@ -437,7 +437,7 @@ func (p *ParsedCertBundle) GetTLSConfig(usage TLSUsage) (*tls.Config, error) {
}
tlsConfig := &tls.Config{
NextProtos: []string{"http/1.1"},
NextProtos: []string{"h2", "http/1.1"},
MinVersion: tls.VersionTLS12,
}