clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-21 10:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "crypto/x509: reject serial numbers longer than 20 octets"

Browse Source 
This reverts commit 8524931a2c.

Reason for revert: It turns out, basically no one in private PKIs can
get this right. It causes way too much breakage, and every other impl
also ignores it, so we'll continue to be in good company.

Change-Id: I2da808b411ec12f72112c49079faf9f68ae465c9
Reviewed-on: https://go-review.googlesource.com/c/go/+/589615
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
Roland Shoemaker 2024-05-31 15:08:45 +00:00
parent 45446c867a
commit b691da9f78
5 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/godebug.md
View File

@ -185,11 +185,6 @@ Go 1.23 changed the behavior of
serial numbers that are negative. This change can be reverted with
the [`x509negativeserial` setting](/pkg/crypto/x509/#ParseCertificate).
Go 1.23 changed the behavior of
[crypto/x509.ParseCertificate](/pkg/crypto/x509/#ParseCertificate) to reject
serial numbers that are longer than 20 octets. This change can be reverted with
the [`x509seriallength` setting](/pkg/crypto/x509/#ParseCertificate).
Go 1.23 re-enabled support in html/template for ECMAScript 6 template literals by default.
The [`jstmpllitinterp` setting](/pkg/html/template#hdr-Security_Model) no longer has
any effect.

24
src/crypto/x509/parser.go
View File

@ -825,7 +825,6 @@ func processExtensions(out *Certificate) error {
}
var x509negativeserial = godebug.New("x509negativeserial")
var x509seriallength = godebug.New("x509seriallength")
func parseCertificate(der []byte) (*Certificate, error) {
cert := &Certificate{}
@ -866,27 +865,10 @@ func parseCertificate(der []byte) (*Certificate, error) {
return nil, errors.New("x509: invalid version")
}
var serialBytes cryptobyte.String
if !tbs.ReadASN1Element(&serialBytes, cryptobyte_asn1.INTEGER) {
return nil, errors.New("x509: malformed serial number")
}
// We add two bytes for the tag and length (if the length was multi-byte,
// which is possible, the length of the serial would be more than 256 bytes,
// so this condition would trigger anyway).
if len(serialBytes) > 20+2 {
if x509seriallength.Value() != "1" {
return nil, errors.New("x509: serial number too long (>20 octets)")
} else {
x509seriallength.IncNonDefault()
}
}
serial := new(big.Int)
if !serialBytes.ReadASN1Integer(serial) {
if !tbs.ReadASN1Integer(serial) {
return nil, errors.New("x509: malformed serial number")
}
// We do not reject zero serials, because they are unfortunately common
// in important root certificates which will not expire for a number of
// years.
if serial.Sign() == -1 {
if x509negativeserial.Value() != "1" {
return nil, errors.New("x509: negative serial number")
@ -1034,10 +1016,6 @@ func parseCertificate(der []byte) (*Certificate, error) {
// Before Go 1.23, ParseCertificate accepted certificates with negative serial
// numbers. This behavior can be restored by including "x509negativeserial=1" in
// the GODEBUG environment variable.
//
// Before Go 1.23, ParseCertificate accepted certificates with serial numbers
// longer than 20 octets. This behavior can be restored by including
// "x509seriallength=1" in the GODEBUG environment variable.
func ParseCertificate(der []byte) (*Certificate, error) {
cert, err := parseCertificate(der)
if err != nil {

23
src/crypto/x509/x509_test.go
View File

@ -4086,26 +4086,3 @@ func TestRejectCriticalSKI(t *testing.T) {
t.Fatalf("ParseCertificate() unexpected error: %v, want: %s", err, expectedErr)
}
}
func TestSerialTooLong(t *testing.T) {
template := Certificate{
Subject: pkix.Name{CommonName: "Cert"},
NotBefore: time.Unix(1000, 0),
NotAfter: time.Unix(100000, 0),
}
for _, serial := range []*big.Int{
big.NewInt(0).SetBytes(bytes.Repeat([]byte{5}, 21)),
big.NewInt(0).SetBytes(bytes.Repeat([]byte{255}, 20)),
} {
template.SerialNumber = serial
certDER, err := CreateCertificate(rand.Reader, &template, &template, rsaPrivateKey.Public(), rsaPrivateKey)
if err != nil {
t.Fatalf("CreateCertificate() unexpected error: %v", err)
}
expectedErr := "x509: serial number too long (>20 octets)"
_, err = ParseCertificate(certDER)
if err == nil || err.Error() != expectedErr {
t.Fatalf("ParseCertificate() unexpected error: %v, want: %s", err, expectedErr)
}
}
}

1
src/internal/godebugs/table.go
View File

@ -57,7 +57,6 @@ var All = []Info{
{Name: "winsymlink", Package: "os", Changed: 22, Old: "0"},
{Name: "x509keypairleaf", Package: "crypto/tls", Changed: 23, Old: "0"},
{Name: "x509negativeserial", Package: "crypto/x509", Changed: 23, Old: "1"},
{Name: "x509seriallength", Package: "crypto/x509", Changed: 23, Old: "1"},
{Name: "x509sha1", Package: "crypto/x509"},
{Name: "x509usefallbackroots", Package: "crypto/x509"},
{Name: "x509usepolicies", Package: "crypto/x509"},

5
src/runtime/metrics/doc.go
View File

@ -340,11 +340,6 @@ Below is the full list of supported metrics, ordered lexicographically.
package due to a non-default GODEBUG=x509negativeserial=...
setting.
/godebug/non-default-behavior/x509seriallength:events
The number of non-default behaviors executed by the crypto/x509
package due to a non-default GODEBUG=x509seriallength=...
setting.
/godebug/non-default-behavior/x509sha1:events
The number of non-default behaviors executed by the crypto/x509
package due to a non-default GODEBUG=x509sha1=... setting.