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

This commit is contained in:
Emman 2022-03-21 10:13:40 +08:00
parent d79ab3d709
commit 0357a17c0a

View File

@ -1056,11 +1056,8 @@ 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
}
func marshalExtKeyUsage(extUsages []ExtKeyUsage, unknownUsages []asn1.ObjectIdentifier) (pkix.Extension, error) {
ext := pkix.Extension{Id: oidExtensionExtendedKeyUsage}
@ -1078,11 +1075,8 @@ 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
}
func marshalBasicConstraints(isCA bool, maxPathLen int, maxPathLenZero bool) (pkix.Extension, error) {
ext := pkix.Extension{Id: oidExtensionBasicConstraints, Critical: true}
@ -1094,10 +1088,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) {
@ -1108,11 +1099,8 @@ func marshalCertificatePolicies(policyIdentifiers []asn1.ObjectIdentifier) (pkix
}
var err error
ext.Value, err = asn1.Marshal(policies)
if err != nil {
return ext, err
}
return ext, nil
}
func buildCSRExtensions(template *x509.CertificateRequest) ([]pkix.Extension, error) {
var ret []pkix.Extension