ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-11 04:05:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use crypto.ParseCertificate instead of duplciated code (#191)

Browse Source
This commit is contained in:
Jesse Peterson
2017-05-29 20:14:51 -07:00
committed by GitHub
parent 804276eeb2
commit 38b3a65e48
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
serve.go
View File

@@ -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