Small refactoring in cert building subroutines

Author: cmaglie

Diff for: flasher/nina.go

@@ -114,10 +114,11 @@ func (f *NinaFlasher) FlashCertificates(certificatePaths *paths.PathList, URLs [
 	for _, URL := range URLs {
 		logrus.Infof("Converting and flashing certificate from %s", URL)
 		flasherOut.Write([]byte(fmt.Sprintf("Converting and flashing certificate from %s\n", URL)))
-		data, err := f.certificateFromURL(URL)
+		rootCertificate, err := certificates.ScrapeRootCertificatesFromURL(URL)
 		if err != nil {
 			return err
 		}
+		data := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: rootCertificate.Raw})
 		certificatesData = append(certificatesData, data...)
 	}
 
@@ -143,14 +144,6 @@ func (f *NinaFlasher) FlashCertificates(certificatePaths *paths.PathList, URLs [
 	return nil
 }
 
-func (f *NinaFlasher) certificateFromURL(URL string) ([]byte, error) {
-	rootCertificate, err := certificates.ScrapeRootCertificatesFromURL(URL)
-	if err != nil {
-		return nil, err
-	}
-	return pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: rootCertificate.Raw}), nil
-}
-
 // Close the port used by this flasher
 func (f *NinaFlasher) Close() error {
 	return f.port.Close()

Diff for: flasher/winc.go

@@ -99,7 +99,11 @@ func (f *WincFlasher) FlashCertificates(certificatePaths *paths.PathList, URLs [
 	for _, URL := range URLs {
 		logrus.Infof("Converting and flashing certificate from %s", URL)
 		flasherOut.Write([]byte(fmt.Sprintf("Converting and flashing certificate from %s\n", URL)))
-		data, err := f.certificateFromURL(URL)
+		rootCertificate, err := certificates.ScrapeRootCertificatesFromURL(URL)
+		if err != nil {
+			return err
+		}
+		data, err := f.getCertificateData(rootCertificate)
 		if err != nil {
 			return err
 		}
@@ -116,14 +120,6 @@ func (f *WincFlasher) FlashCertificates(certificatePaths *paths.PathList, URLs [
 	return nil
 }
 
-func (f *WincFlasher) certificateFromURL(URL string) ([]byte, error) {
-	rootCertificate, err := certificates.ScrapeRootCertificatesFromURL(URL)
-	if err != nil {
-		return nil, err
-	}
-	return f.getCertificateData(rootCertificate)
-}
-
 func (f *WincFlasher) getCertificateData(cert *x509.Certificate) ([]byte, error) {
 	b := []byte{}
 	nameSHA1Bytes, err := calculateNameSha1(cert)