mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

all: delete wgcfg.Key and wgcfg.PrivateKey

Browse Source 
For historical reasons, we ended up with two near-duplicate
copies of curve25519 key types, one in the wireguard-go module
(wgcfg) and one in the tailscale module (types/wgkey).
Then we moved wgcfg to the tailscale module.
We can now remove the wgcfg key type in favor of wgkey.

Signed-off-by: Josh Bleecher Snyder <josharian@gmail.com>
This commit is contained in:
Josh Bleecher Snyder
2021-04-29 13:52:20 -07:00
parent bf9ef1ca27
commit 7ee891f5fd
13 changed files with 29 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wgengine/wgcfg/parser.go
View File

@ -14,6 +14,7 @@ import (
"strings"
"inet.af/netaddr"
"tailscale.com/types/wgkey"
)
type ParseError struct {
@ -69,15 +70,15 @@ func parseEndpoint(s string) (host string, port uint16, err error) {
return host, uint16(uport), nil
}
func parseKeyHex(s string) (*Key, error) {
func parseKeyHex(s string) (*wgkey.Key, error) {
k, err := hex.DecodeString(s)
if err != nil {
return nil, &ParseError{"Invalid key: " + err.Error(), s}
}
if len(k) != KeySize {
if len(k) != wgkey.Size {
return nil, &ParseError{"Keys must decode to exactly 32 bytes", s}
}
var key Key
var key wgkey.Key
copy(key[:], k)
return &key, nil
}
@ -142,7 +143,7 @@ func (cfg *Config) handleDeviceLine(key, value string) error {
return err
}
// wireguard-go guarantees not to send zero value; private keys are already clamped.
cfg.PrivateKey = PrivateKey(*k)
cfg.PrivateKey = wgkey.Private(*k)
case "listen_port":
// ignore
case "fwmark":