-
Notifications
You must be signed in to change notification settings - Fork 9.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pkg/tlsutil: Adjust cipher suites for go 1.12
Cherry-pick of 60e4428 from master branch does not work due to missing `tls.CipherSuites()` function. We work around by using go build tags for both the building and tests.
- Loading branch information
Showing
4 changed files
with
144 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
// +build go1.15 | ||
|
||
// Copyright 2018 The etcd Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package tlsutil | ||
|
||
import "crypto/tls" | ||
|
||
// GetCipherSuite returns the corresponding cipher suite, | ||
// and boolean value if it is supported. | ||
func GetCipherSuite(s string) (uint16, bool) { | ||
for _, c := range tls.CipherSuites() { | ||
if s == c.Name { | ||
return c.ID, true | ||
} | ||
} | ||
for _, c := range tls.InsecureCipherSuites() { | ||
if s == c.Name { | ||
return c.ID, true | ||
} | ||
} | ||
switch s { | ||
case "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305": | ||
return tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, true | ||
case "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305": | ||
return tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, true | ||
} | ||
return 0, false | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
// +build go1.15 | ||
|
||
// Copyright 2018 The etcd Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package tlsutil | ||
|
||
import ( | ||
"crypto/tls" | ||
"testing" | ||
) | ||
|
||
func TestGetCipherSuite_not_existing(t *testing.T) { | ||
_, ok := GetCipherSuite("not_existing") | ||
if ok { | ||
t.Fatal("Expected not ok") | ||
} | ||
} | ||
|
||
func CipherSuiteExpectedToExist(tb testing.TB, cipher string, expectedId uint16) { | ||
vid, ok := GetCipherSuite(cipher) | ||
if !ok { | ||
tb.Errorf("Expected %v cipher to exist", cipher) | ||
} | ||
if vid != expectedId { | ||
tb.Errorf("For %v expected=%v found=%v", cipher, expectedId, vid) | ||
} | ||
} | ||
|
||
func TestGetCipherSuite_success(t *testing.T) { | ||
CipherSuiteExpectedToExist(t, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) | ||
CipherSuiteExpectedToExist(t, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) | ||
|
||
// Explicit test for legacy names | ||
CipherSuiteExpectedToExist(t, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256) | ||
CipherSuiteExpectedToExist(t, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256) | ||
} | ||
|
||
func TestGetCipherSuite_insecure(t *testing.T) { | ||
CipherSuiteExpectedToExist(t, "TLS_ECDHE_RSA_WITH_RC4_128_SHA", tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters