crypto/x509: return err ans1.Marshal gives an error

Fixes #50663

Change-Id: I18754922bf139049443c0395eaa1606049df1331
GitHub-Last-Rev: 57ff5ddfe39c211ccff60aa74a30f97ddf7015fb
GitHub-Pull-Request: golang/go#50667
Reviewed-on: https://go-review.googlesource.com/c/go/+/379094
Reviewed-by: Katie Hockman <katie@golang.org>
Trust: Katie Hockman <katie@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/crypto/x509/x509.go b/src/crypto/x509/x509.go
index 47be77d994df9634ca0c4b2d77038c68e7d3524d..837c42a3db28fa562811e728b50c715c12ca9de7 100644 (file)
--- a/src/crypto/x509/x509.go
+++ b/src/crypto/x509/x509.go
@@ -1269,10 +1269,7 @@ func marshalKeyUsage(ku KeyUsage) (pkix.Extension, error) {
        bitString := a[:l]
        var err error
        ext.Value, err = asn1.Marshal(asn1.BitString{Bytes: bitString, BitLength: asn1BitLength(bitString)})
-       if err != nil {
-               return ext, err
-       }
-       return ext, nil
+       return ext, err
 }
 
 func marshalExtKeyUsage(extUsages []ExtKeyUsage, unknownUsages []asn1.ObjectIdentifier) (pkix.Extension, error) {
@@ -1291,10 +1288,7 @@ func marshalExtKeyUsage(extUsages []ExtKeyUsage, unknownUsages []asn1.ObjectIden
 
        var err error
        ext.Value, err = asn1.Marshal(oids)
-       if err != nil {
-               return ext, err
-       }
-       return ext, nil
+       return ext, err
 }
 
 func marshalBasicConstraints(isCA bool, maxPathLen int, maxPathLenZero bool) (pkix.Extension, error) {
@@ -1307,10 +1301,7 @@ func marshalBasicConstraints(isCA bool, maxPathLen int, maxPathLenZero bool) (pk
        }
        var err error
        ext.Value, err = asn1.Marshal(basicConstraints{isCA, maxPathLen})
-       if err != nil {
-               return ext, nil
-       }
-       return ext, nil
+       return ext, err
 }
 
 func marshalCertificatePolicies(policyIdentifiers []asn1.ObjectIdentifier) (pkix.Extension, error) {
@@ -1321,10 +1312,7 @@ func marshalCertificatePolicies(policyIdentifiers []asn1.ObjectIdentifier) (pkix
        }
        var err error
        ext.Value, err = asn1.Marshal(policies)
-       if err != nil {
-               return ext, err
-       }
-       return ext, nil
+       return ext, err
 }
 
 func buildCSRExtensions(template *CertificateRequest) ([]pkix.Extension, error) {