Ensure the second certificate is not a CA

matteosuppo · matteosuppo · commit c140d7a7f851 · 2015-12-18T16:08:58.000+01:00
diff --git a/certificates.go b/certificates.go
@@ -26,12 +26,10 @@ import (
 )
 
 var (
-	host       = "localhost"
-	validFrom  = ""
-	validFor   = 365 * 24 * time.Hour * 2 // 2 years
-	isCA       = true
-	rsaBits    = 2048
-	ecdsaCurve = ""
+	host      = "localhost"
+	validFrom = ""
+	validFor  = 365 * 24 * time.Hour * 2 // 2 years
+	rsaBits   = 2048
 )
 
 func publicKey(priv interface{}) interface{} {
@@ -123,7 +121,7 @@ func generateSingleCertificate(isCa bool) (*x509.Certificate, error) {
 		}
 	}
 
-	if isCA {
+	if isCa {
 		template.IsCA = true
 		template.KeyUsage |= x509.KeyUsageCertSign
 	}
@@ -197,7 +195,7 @@ func generateCertificates() {
 		os.Exit(1)
 	}
 
-	derBytes, err = x509.CreateCertificate(rand.Reader, template, caTemplate, publicKey(key), key)
+	derBytes, err = x509.CreateCertificate(rand.Reader, template, caTemplate, publicKey(key), caKey)
 
 	certOut, err = os.Create("cert.pem")
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,10 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`var (`
`29`		`- host = "localhost"`
`30`		`- validFrom = ""`
`31`		`- validFor = 365 * 24 * time.Hour * 2 // 2 years`
`32`		`- isCA = true`
`33`		`- rsaBits = 2048`
`34`		`- ecdsaCurve = ""`
	`29`	`+ host = "localhost"`
	`30`	`+ validFrom = ""`
	`31`	`+ validFor = 365 * 24 * time.Hour * 2 // 2 years`
	`32`	`+ rsaBits = 2048`
`35`	`33`	`)`
`36`	`34`
`37`	`35`	`func publicKey(priv interface{}) interface{} {`
`@@ -123,7 +121,7 @@ func generateSingleCertificate(isCa bool) (*x509.Certificate, error) {`
`123`	`121`	`}`
`124`	`122`	`}`
`125`	`123`
`126`		`- if isCA {`
	`124`	`+ if isCa {`
`127`	`125`	`template.IsCA = true`
`128`	`126`	`template.KeyUsage \|= x509.KeyUsageCertSign`
`129`	`127`	`}`
`@@ -197,7 +195,7 @@ func generateCertificates() {`
`197`	`195`	`os.Exit(1)`
`198`	`196`	`}`
`199`	`197`
`200`		`- derBytes, err = x509.CreateCertificate(rand.Reader, template, caTemplate, publicKey(key), key)`
	`198`	`+ derBytes, err = x509.CreateCertificate(rand.Reader, template, caTemplate, publicKey(key), caKey)`
`201`	`199`
`202`	`200`	`certOut, err = os.Create("cert.pem")`
`203`	`201`	`if err != nil {`