From a902ab8cd7b5eba1f48a8238975dbaf0adfff8e4 Mon Sep 17 00:00:00 2001 From: immutability Date: Sun, 9 Dec 2018 10:46:02 -0500 Subject: [PATCH] fix encoding of public key for audience --- path_audience.go | 2 +- util.go | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/path_audience.go b/path_audience.go index 6d8c90e..a28d2f5 100644 --- a/path_audience.go +++ b/path_audience.go @@ -93,7 +93,7 @@ func (b *backend) pathAudiencesCreate(ctx context.Context, req *logical.Request, return nil, err } publicKeyBytes := crypto.FromECDSAPub(pubkey) - publicKey := hexutil.Encode(publicKeyBytes) + publicKey := hex.EncodeToString(publicKeyBytes) address := crypto.PubkeyToAddress(*pubkey) audienceJSON := &Audience{ diff --git a/util.go b/util.go index f539cac..58a5e31 100644 --- a/util.go +++ b/util.go @@ -18,9 +18,7 @@ import ( "bytes" "context" "crypto/ecdsa" - "crypto/x509" "encoding/json" - "encoding/pem" "errors" "fmt" "io/ioutil" @@ -194,20 +192,6 @@ func hashKeccak256(data string) []byte { return hash } -func encodePrivateKey(privateKey *ecdsa.PrivateKey) string { - x509Encoded, _ := x509.MarshalECPrivateKey(privateKey) - pemEncoded := pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: x509Encoded}) - - return string(pemEncoded) -} - -func encodePublicKey(publicKey *ecdsa.PublicKey) string { - x509EncodedPub, _ := x509.MarshalPKIXPublicKey(publicKey) - pemEncodedPub := pem.EncodeToMemory(&pem.Block{Type: "PUBLIC KEY", Bytes: x509EncodedPub}) - - return string(pemEncodedPub) -} - // ZeroKey removes the key from memory func ZeroKey(k *ecdsa.PrivateKey) { b := k.D.Bits()