From e95929ed2641bf6548aada92d9d17a3441f19e2b Mon Sep 17 00:00:00 2001 From: Gibheer Date: Fri, 12 May 2017 22:19:25 +0200 Subject: Add ToPem() to public keys This was missing before from all public keys. --- ecdsa.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'ecdsa.go') diff --git a/ecdsa.go b/ecdsa.go index 8bf432d..4202bd6 100644 --- a/ecdsa.go +++ b/ecdsa.go @@ -108,15 +108,23 @@ func LoadPublicKeyEcdsa(raw []byte) (*EcdsaPublicKey, error) { return &EcdsaPublicKey{pub}, nil } +// ToPem returns the pem block of the public key. +func (pu *EcdsaPublicKey) ToPem() (pem.Block, error) { + asn1, err := x509.MarshalPKIXPublicKey(pu.public_key) + if err != nil { + return pem.Block{}, err + } + return pem.Block{Type: PemLabelPublic, Bytes: asn1}, nil +} + // This function implements the Pemmer interface to marshal the public key into // a pem block. func (pu *EcdsaPublicKey) MarshalPem() (io.WriterTo, error) { - asn1, err := x509.MarshalPKIXPublicKey(pu.public_key) - if err != nil { + if block, err := pu.ToPem(); err != nil { return nil, err + } else { + return marshalledPemBlock(pem.EncodeToMemory(&block)), nil } - pem_block := pem.Block{Type: PemLabelPublic, Bytes: asn1} - return marshalledPemBlock(pem.EncodeToMemory(&pem_block)), nil } // This function verifies a message using the public key, signature and hash -- cgit v1.2.3-70-g09d2