From 38b3a65e483259630bbf8c280567ac3dbbf6b0b0 Mon Sep 17 00:00:00 2001
From: Jesse Peterson <jessepeterson@users.noreply.github.com>
Date: Mon, 29 May 2017 20:14:51 -0700
Subject: [PATCH] Use crypto.ParseCertificate instead of duplciated code (#191)

---
 serve.go | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/serve.go b/serve.go
index 3b4d7a67..cb081a97 100644
--- a/serve.go
+++ b/serve.go
@@ -536,29 +536,19 @@ func (c *config) loadPushCerts() {
 		return
 	}
 
+	c.pushCert.Certificate, c.err = crypto.ReadPEMCertificateFile(c.APNSCertificatePath)
+	if c.err != nil {
+		return
+	}
+
 	var pemData []byte
-	pemData, c.err = ioutil.ReadFile(c.APNSCertificatePath)
-	if c.err != nil {
-		return
-	}
-
-	pemBlock, _ := pem.Decode(pemData)
-	if pemBlock == nil {
-		c.err = errors.New("invalid PEM data for cert")
-		return
-	}
-	c.pushCert.Certificate, c.err = x509.ParseCertificate(pemBlock.Bytes)
-	if c.err != nil {
-		return
-	}
-
 	pemData, c.err = ioutil.ReadFile(c.APNSPrivateKeyPath)
 	if c.err != nil {
 		return
 	}
 
 	pkeyBlock := new(bytes.Buffer)
-	pemBlock, _ = pem.Decode(pemData)
+	pemBlock, _ := pem.Decode(pemData)
 	if pemBlock == nil {
 		c.err = errors.New("invalid PEM data for privkey")
 		return