mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto/tls: allow P-521 in FIPS 140-3 mode and Go+BoringCrypto 

Partially reverts CL 587296, restoring the Go+BoringCrypto 1.23 behavior
in terms of supported curves.

Updates #71757

Change-Id: I6a6a465651a8407056fd0fae091d10a945b37997
Reviewed-on: https://go-review.googlesource.com/c/go/+/657095
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Daniel McCarney <daniel@binaryparadox.net>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Roland Shoemaker <roland@golang.org>
Auto-Submit: Filippo Valsorda <filippo@golang.org>
This commit is contained in:
Filippo Valsorda 2025-03-12 16:36:08 +01:00 committed by Gopher Robot
parent 12ea4f7785
commit fbdd994166
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/crypto/tls/defaults.go
View File

@ -92,7 +92,8 @@ var defaultCipherSuitesTLS13NoAES = []uint16{
} }
// The FIPS-only policies below match BoringSSL's // The FIPS-only policies below match BoringSSL's
// ssl_compliance_policy_fips_202205, which is based on NIST SP 800-52r2. // ssl_compliance_policy_fips_202205, which is based on NIST SP 800-52r2, with
// minor changes per https://go.dev/issue/71757.
// https://cs.opensource.google/boringssl/boringssl/+/master:ssl/ssl_lib.cc;l=3289;drc=ea7a88fa // https://cs.opensource.google/boringssl/boringssl/+/master:ssl/ssl_lib.cc;l=3289;drc=ea7a88fa
var defaultSupportedVersionsFIPS = []uint16{ var defaultSupportedVersionsFIPS = []uint16{
@ -102,7 +103,7 @@ var defaultSupportedVersionsFIPS = []uint16{
// defaultCurvePreferencesFIPS are the FIPS-allowed curves, // defaultCurvePreferencesFIPS are the FIPS-allowed curves,
// in preference order (most preferable first). // in preference order (most preferable first).
var defaultCurvePreferencesFIPS = []CurveID{CurveP256, CurveP384} var defaultCurvePreferencesFIPS = []CurveID{CurveP256, CurveP384, CurveP521}
// defaultSupportedSignatureAlgorithmsFIPS currently are a subset of // defaultSupportedSignatureAlgorithmsFIPS currently are a subset of
// defaultSupportedSignatureAlgorithms without Ed25519 and SHA-1. // defaultSupportedSignatureAlgorithms without Ed25519 and SHA-1.
@ -115,6 +116,7 @@ var defaultSupportedSignatureAlgorithmsFIPS = []SignatureScheme{
PKCS1WithSHA384, PKCS1WithSHA384,
ECDSAWithP384AndSHA384, ECDSAWithP384AndSHA384,
PKCS1WithSHA512, PKCS1WithSHA512,
ECDSAWithP521AndSHA512,
} }
// defaultCipherSuitesFIPS are the FIPS-allowed cipher suites. // defaultCipherSuitesFIPS are the FIPS-allowed cipher suites.

3
src/crypto/tls/fips_test.go
View File

@ -106,7 +106,7 @@ func isFIPSCipherSuite(id uint16) bool {
func isFIPSCurve(id CurveID) bool { func isFIPSCurve(id CurveID) bool {
switch id { switch id {
case CurveP256, CurveP384: case CurveP256, CurveP384, CurveP521:
return true return true
} }
return false return false
@ -130,6 +130,7 @@ func isFIPSSignatureScheme(alg SignatureScheme) bool {
PKCS1WithSHA384, PKCS1WithSHA384,
ECDSAWithP384AndSHA384, ECDSAWithP384AndSHA384,
PKCS1WithSHA512, PKCS1WithSHA512,
ECDSAWithP521AndSHA512,
PSSWithSHA256, PSSWithSHA256,
PSSWithSHA384, PSSWithSHA384,
PSSWithSHA512: PSSWithSHA512: