Move FillTemplate back before dist points replacement

rolandshoemaker · kisom · commit 50a1a698eaa4 · 2018-02-13T13:36:24.000-08:00
diff --git a/signer/local/local.go b/signer/local/local.go
@@ -327,13 +327,13 @@ func (s *Signer) Sign(req signer.SignRequest) (cert []byte, err error) {
 	}
 
 	var distPoints = safeTemplate.CRLDistributionPoints
-	if distPoints != nil && len(distPoints) > 0 {
-		safeTemplate.CRLDistributionPoints = distPoints
-	}
 	err = signer.FillTemplate(&safeTemplate, s.policy.Default, profile, req.NotBefore, req.NotAfter)
 	if err != nil {
 		return nil, err
 	}
+	if distPoints != nil && len(distPoints) > 0 {
+		safeTemplate.CRLDistributionPoints = distPoints
+	}
 
 	var certTBS = safeTemplate
 

Original file line number	Diff line number	Diff line change
`@@ -327,13 +327,13 @@ func (s *Signer) Sign(req signer.SignRequest) (cert []byte, err error) {`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`var distPoints = safeTemplate.CRLDistributionPoints`
`330`		`- if distPoints != nil && len(distPoints) > 0 {`
`331`		`- safeTemplate.CRLDistributionPoints = distPoints`
`332`		`- }`
`333`	`330`	`err = signer.FillTemplate(&safeTemplate, s.policy.Default, profile, req.NotBefore, req.NotAfter)`
`334`	`331`	`if err != nil {`
`335`	`332`	`return nil, err`
`336`	`333`	`}`
	`334`	`+ if distPoints != nil && len(distPoints) > 0 {`
	`335`	`+ safeTemplate.CRLDistributionPoints = distPoints`
	`336`	`+ }`
`337`	`337`
`338`	`338`	`var certTBS = safeTemplate`
`339`	`339`