gibheer
/
pki
0
0
Fork 0
Code

move certificate and certificate request to pemmer 

This makes them use the Pemmer interface and therefore doesn't require
any weird control code to handle these two special cases.
This commit is contained in:
Gibheer 2016-09-18 17:39:29 +02:00
parent f004403281
commit 2ad03c8f80
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
certificate.go
View File

@ -6,6 +6,7 @@ import (
"crypto/x509/pkix" "crypto/x509/pkix"
"encoding/pem" "encoding/pem"
"fmt" "fmt"
"io"
"math/big" "math/big"
"net" "net"
"time" "time"
@ -81,9 +82,9 @@ func LoadCertificateSignRequest(raw []byte) (*CertificateRequest, error) {
} }
// Return the certificate sign request as a pem block. // Return the certificate sign request as a pem block.
func (c *CertificateRequest) MarshalPem() (marshalledPemBlock, error) { func (c *CertificateRequest) MarshalPem() (io.WriterTo, error) {
block := &pem.Block{Type: PemLabelCertificateRequest, Bytes: c.Raw} block := &pem.Block{Type: PemLabelCertificateRequest, Bytes: c.Raw}
return pem.EncodeToMemory(block), nil return marshalledPemBlock(pem.EncodeToMemory(block)), nil
} }
// Convert the certificate sign request to a certificate using the private key // Convert the certificate sign request to a certificate using the private key
@ -152,7 +153,7 @@ func LoadCertificate(raw []byte) (*Certificate, error) {
// marshal the certificate to a pem block // marshal the certificate to a pem block
func (c *Certificate) MarshalPem() (marshalledPemBlock, error) { func (c *Certificate) MarshalPem() (marshalledPemBlock, error) {
block := &pem.Block{Type: PemLabelCertificate, Bytes: c.Raw} block := &pem.Block{Type: PemLabelCertificate, Bytes: c.Raw}
return pem.EncodeToMemory(block), nil return marshalledPemBlock(pem.EncodeToMemory(block)), nil
} }
// Check if the certificate options have the required fields set. // Check if the certificate options have the required fields set.