Skip to content

Commit

Permalink
adding LoadPrivateKeyFromDER
Browse files Browse the repository at this point in the history
  • Loading branch information
cmisare authored and jtolio committed Aug 10, 2016
1 parent ef69faf commit 2ffbf8f
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
35 changes: 35 additions & 0 deletions key.go
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,41 @@ func LoadPrivateKeyFromPEMWidthPassword(pem_block []byte, password string) (
return p, nil
}

// LoadPrivateKeyFromDER loads a private key from a DER-encoded block.
func LoadPrivateKeyFromDER(der_block []byte) (PrivateKey, error) {
if len(der_block) == 0 {
return nil, errors.New("empty der block")
}
bio := C.BIO_new_mem_buf(unsafe.Pointer(&der_block[0]),
C.int(len(der_block)))
if bio == nil {
return nil, errors.New("failed creating bio")
}
defer C.BIO_free(bio)

rsakey := C.d2i_RSAPrivateKey_bio(bio, nil)
if rsakey == nil {
return nil, errors.New("failed reading rsa key")
}
defer C.RSA_free(rsakey)

// convert to PKEY
key := C.EVP_PKEY_new()
if key == nil {
return nil, errors.New("failed converting to evp_pkey")
}
if C.EVP_PKEY_set1_RSA(key, (*C.struct_rsa_st)(rsakey)) != 1 {
C.EVP_PKEY_free(key)
return nil, errors.New("failed converting to evp_pkey")
}

p := &pKey{key: key}
runtime.SetFinalizer(p, func(p *pKey) {
C.EVP_PKEY_free(p.key)
})
return p, nil
}

// LoadPublicKeyFromPEM loads a public key from a PEM-encoded block.
func LoadPublicKeyFromPEM(pem_block []byte) (PublicKey, error) {
if len(pem_block) == 0 {
Expand Down
6 changes: 6 additions & 0 deletions key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ func TestMarshal(t *testing.T) {
t.Fatal(err)
}

privateBlock, _ := pem_pkg.Decode(keyBytes)
key, err = LoadPrivateKeyFromDER(privateBlock.Bytes)
if err != nil {
t.Fatal(err)
}

pem, err := cert.MarshalPEM()
if err != nil {
t.Fatal(err)
Expand Down

0 comments on commit 2ffbf8f

Please sign in to comment.