diff options
author | David Crawshaw <crawshaw@tailscale.com> | 2020-05-02 01:38:59 +1000 |
---|---|---|
committer | David Crawshaw <crawshaw@tailscale.com> | 2020-05-02 01:56:07 +1000 |
commit | 3636c2ec1261545768095a1e2b98e250d8ae0751 (patch) | |
tree | d278bd0a9ea001668b3cccda051fb803b222733a /wgcfg/key.go | |
parent | 682401a17792d2508aca967834acef4c2897b8e4 (diff) | |
download | wireguard-go-3636c2ec1261545768095a1e2b98e250d8ae0751.tar.gz wireguard-go-3636c2ec1261545768095a1e2b98e250d8ae0751.zip |
wgcfg: remove JSON marshal methods
Followup from earlier code review.
Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
Diffstat (limited to '')
-rw-r--r-- | wgcfg/key.go | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/wgcfg/key.go b/wgcfg/key.go index cfb59d3..d75f0d9 100644 --- a/wgcfg/key.go +++ b/wgcfg/key.go @@ -67,31 +67,6 @@ func (k PublicKey) IsZero() bool { return subtle.ConstantTimeCompare(zeros[:], k[:]) == 1 } -func (k *PublicKey) MarshalJSON() ([]byte, error) { - if k == nil { - return []byte("null"), nil - } - buf := new(bytes.Buffer) - fmt.Fprintf(buf, `"%x"`, k[:]) - return buf.Bytes(), nil -} - -func (k *PublicKey) UnmarshalJSON(b []byte) error { - if k == nil { - return errors.New("wgcfg.PublicKey: UnmarshalJSON on nil pointer") - } - if len(b) < 3 || b[0] != '"' || b[len(b)-1] != '"' { - return errors.New("wgcfg.PublicKey: UnmarshalJSON not given a string") - } - b = b[1 : len(b)-1] - key, err := ParseHexKey(string(b)) - if err != nil { - return fmt.Errorf("wgcfg.PublicKey: UnmarshalJSON: %v", err) - } - copy(k[:], key[:]) - return nil -} - // PrivateKey is curve25519 key. // It is used by WireGuard to represent private keys. type PrivateKey [KeySize]byte |