From f47fff1e42f75b736e7067ec06c2e81394833d46 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Tue, 24 Jan 2017 22:19:52 +0300 Subject: [PATCH] go vet/lint --- src/cypherpunks.ru/govpn/aont/aont_test.go | 2 +- src/cypherpunks.ru/govpn/aont/oaep.go | 2 +- src/cypherpunks.ru/govpn/client/client.go | 2 +- src/cypherpunks.ru/govpn/client/tcp.go | 4 +- .../govpn/cmd/govpn-client/main.go | 2 +- .../govpn/cmd/govpn-server/common.go | 23 ++++---- .../govpn/cmd/govpn-server/conf.go | 10 ++-- .../govpn/cmd/govpn-server/main.go | 10 ++-- .../govpn/cmd/govpn-server/tcp.go | 38 +++++++------- .../govpn/cmd/govpn-server/udp.go | 52 +++++++++---------- .../govpn/cmd/govpn-verifier/main.go | 2 +- src/cypherpunks.ru/govpn/cnw/cnw_test.go | 2 +- src/cypherpunks.ru/govpn/conf.go | 2 +- src/cypherpunks.ru/govpn/egd.go | 2 +- src/cypherpunks.ru/govpn/encless_test.go | 2 +- src/cypherpunks.ru/govpn/handshake.go | 10 ++-- src/cypherpunks.ru/govpn/handshake_test.go | 6 +-- src/cypherpunks.ru/govpn/identity.go | 18 +++---- src/cypherpunks.ru/govpn/peer.go | 8 +-- src/cypherpunks.ru/govpn/peer_test.go | 6 +-- src/cypherpunks.ru/govpn/verifier.go | 14 ++--- 21 files changed, 111 insertions(+), 106 deletions(-) diff --git a/src/cypherpunks.ru/govpn/aont/aont_test.go b/src/cypherpunks.ru/govpn/aont/aont_test.go index c7bc6a6..b586775 100644 --- a/src/cypherpunks.ru/govpn/aont/aont_test.go +++ b/src/cypherpunks.ru/govpn/aont/aont_test.go @@ -27,7 +27,7 @@ import ( ) var ( - testKey *[16]byte = new([16]byte) + testKey = new([16]byte) ) func init() { diff --git a/src/cypherpunks.ru/govpn/aont/oaep.go b/src/cypherpunks.ru/govpn/aont/oaep.go index c035246..b648ccb 100644 --- a/src/cypherpunks.ru/govpn/aont/oaep.go +++ b/src/cypherpunks.ru/govpn/aont/oaep.go @@ -48,7 +48,7 @@ const ( ) var ( - dummyNonce *[16]byte = new([16]byte) + dummyNonce = new([16]byte) ) // Encode the data, produce AONT package. Data size will be larger than diff --git a/src/cypherpunks.ru/govpn/client/client.go b/src/cypherpunks.ru/govpn/client/client.go index 7e6ea35..8102cc6 100644 --- a/src/cypherpunks.ru/govpn/client/client.go +++ b/src/cypherpunks.ru/govpn/client/client.go @@ -154,7 +154,7 @@ func NewClient(conf Configuration, verifier *govpn.Verifier, termSignal chan os. termSignal: termSignal, Error: make(chan error, 1), } - confs := map[govpn.PeerId]*govpn.PeerConf{*verifier.Id: conf.Peer} + confs := map[govpn.PeerID]*govpn.PeerConf{*verifier.ID: conf.Peer} client.idsCache.Update(&confs) return &client } diff --git a/src/cypherpunks.ru/govpn/client/tcp.go b/src/cypherpunks.ru/govpn/client/tcp.go index c57b07a..40d81ca 100644 --- a/src/cypherpunks.ru/govpn/client/tcp.go +++ b/src/cypherpunks.ru/govpn/client/tcp.go @@ -76,8 +76,8 @@ HandshakeCycle: } prev += n - peerId := c.idsCache.Find(buf[:prev]) - if peerId == nil { + peerID := c.idsCache.Find(buf[:prev]) + if peerID == nil { continue } peer = hs.Client(buf[:prev]) diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go index ac4d647..8fcd988 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go @@ -108,7 +108,7 @@ func main() { conf := client.Configuration{ PrivateKey: priv, Peer: &govpn.PeerConf{ - Id: verifier.Id, + ID: verifier.ID, Iface: *ifaceName, MTU: *mtu, Timeout: time.Second * time.Duration(*timeoutP), diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go index f5c7e26..f18d34b 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go @@ -35,22 +35,27 @@ var ( handshakes map[string]*govpn.Handshake = make(map[string]*govpn.Handshake) hsLock sync.RWMutex - peers map[string]*PeerState = make(map[string]*PeerState) + peers = make(map[string]*PeerState) peersLock sync.RWMutex - peersById map[govpn.PeerId]string = make(map[govpn.PeerId]string) - peersByIdLock sync.RWMutex + peersByID = make(map[govpn.PeerID]string) + peersByIDLock sync.RWMutex knownPeers govpn.KnownPeers kpLock sync.RWMutex ) -func callUp(peerId *govpn.PeerId, remoteAddr string) (string, error) { - ifaceName := confs[*peerId].Iface - if confs[*peerId].Up != "" { - result, err := govpn.ScriptCall(confs[*peerId].Up, ifaceName, remoteAddr) +func callUp(peerID *govpn.PeerID, remoteAddr string) (string, error) { + ifaceName := confs[*peerID].Iface + if confs[*peerID].Up != "" { + result, err := govpn.ScriptCall(confs[*peerID].Up, ifaceName, remoteAddr) if err != nil { - govpn.Printf(`[script-failed bind="%s" path="%s" err="%s"]`, *bindAddr, confs[*peerId].Up, err) + govpn.Printf( + `[script-failed bind="%s" path="%s" err="%s"]`, + *bindAddr, + confs[*peerID].Up, + err, + ) return "", err } if ifaceName == "" { @@ -62,7 +67,7 @@ func callUp(peerId *govpn.PeerId, remoteAddr string) (string, error) { } } if ifaceName == "" { - govpn.Printf(`[tap-failed bind="%s" peer="%s"]`, *bindAddr, *peerId) + govpn.Printf(`[tap-failed bind="%s" peer="%s"]`, *bindAddr, *peerID) } return ifaceName, nil } diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go index e32a505..62eca02 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/conf.go @@ -34,11 +34,11 @@ const ( ) var ( - confs map[govpn.PeerId]*govpn.PeerConf + confs map[govpn.PeerID]*govpn.PeerConf idsCache *govpn.MACCache ) -func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) { +func confRead() (*map[govpn.PeerID]*govpn.PeerConf, error) { data, err := ioutil.ReadFile(*confPath) if err != nil { return nil, err @@ -49,7 +49,7 @@ func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) { return nil, err } - confs := make(map[govpn.PeerId]*govpn.PeerConf, len(*confsRaw)) + confs := make(map[govpn.PeerID]*govpn.PeerConf, len(*confsRaw)) for name, pc := range *confsRaw { verifier, err := govpn.VerifierFromString(pc.VerifierRaw) if err != nil { @@ -67,7 +67,7 @@ func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) { } conf := govpn.PeerConf{ Verifier: verifier, - Id: verifier.Id, + ID: verifier.ID, Name: name, Iface: pc.Iface, MTU: pc.MTU, @@ -82,7 +82,7 @@ func confRead() (*map[govpn.PeerId]*govpn.PeerConf, error) { pc.TimeoutInt = govpn.TimeoutDefault } conf.Timeout = time.Second * time.Duration(pc.TimeoutInt) - confs[*verifier.Id] = &conf + confs[*verifier.ID] = &conf } return &confs, nil } diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go index 639e37c..2beb396 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go @@ -108,7 +108,7 @@ MainCycle: govpn.BothPrintf(`[terminating bind="%s"]`, *bindAddr) for _, ps := range peers { govpn.ScriptCall( - confs[*ps.peer.Id].Down, + confs[*ps.peer.ID].Down, ps.tap.Name, ps.peer.Addr, ) @@ -125,7 +125,7 @@ MainCycle: } } peersLock.Lock() - peersByIdLock.Lock() + peersByIDLock.Lock() kpLock.Lock() for addr, ps := range peers { ps.peer.BusyR.Lock() @@ -135,9 +135,9 @@ MainCycle: govpn.Printf(`[peer-delete bind="%s" peer="%s"]`, *bindAddr, ps.peer) delete(peers, addr) delete(knownPeers, addr) - delete(peersById, *ps.peer.Id) + delete(peersByID, *ps.peer.ID) go govpn.ScriptCall( - confs[*ps.peer.Id].Down, + confs[*ps.peer.ID].Down, ps.tap.Name, ps.peer.Addr, ) @@ -146,7 +146,7 @@ MainCycle: } hsLock.Unlock() peersLock.Unlock() - peersByIdLock.Unlock() + peersByIDLock.Unlock() kpLock.Unlock() } } diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go index ad7bcc6..c36da3f 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go @@ -71,16 +71,16 @@ func handleTCP(conn net.Conn) { break } prev += n - peerId := idsCache.Find(buf[:prev]) - if peerId == nil { + peerID := idsCache.Find(buf[:prev]) + if peerID == nil { continue } if hs == nil { - conf = confs[*peerId] + conf = confs[*peerID] if conf == nil { govpn.Printf( `[conf-get-failed bind="%s" peer="%s"]`, - *bindAddr, peerId.String(), + *bindAddr, peerID.String(), ) break } @@ -94,11 +94,11 @@ func handleTCP(conn net.Conn) { hs.Zero() govpn.Printf( `[handshake-completed bind="%s" addr="%s" peer="%s"]`, - *bindAddr, addr, peerId.String(), + *bindAddr, addr, peerID.String(), ) - peersByIdLock.RLock() - addrPrev, exists := peersById[*peer.Id] - peersByIdLock.RUnlock() + peersByIDLock.RLock() + addrPrev, exists := peersByID[*peer.ID] + peersByIDLock.RUnlock() if exists { peersLock.Lock() peers[addrPrev].terminator <- struct{}{} @@ -109,22 +109,22 @@ func handleTCP(conn net.Conn) { terminator: make(chan struct{}), } go govpn.PeerTapProcessor(ps.peer, ps.tap, ps.terminator) - peersByIdLock.Lock() + peersByIDLock.Lock() kpLock.Lock() delete(peers, addrPrev) delete(knownPeers, addrPrev) peers[addr] = ps knownPeers[addr] = &peer - peersById[*peer.Id] = addr + peersByID[*peer.ID] = addr peersLock.Unlock() - peersByIdLock.Unlock() + peersByIDLock.Unlock() kpLock.Unlock() govpn.Printf( `[rehandshake-completed bind="%s" peer="%s"]`, - *bindAddr, peerId.String(), + *bindAddr, peerID.String(), ) } else { - ifaceName, err := callUp(peer.Id, peer.Addr) + ifaceName, err := callUp(peer.ID, peer.Addr) if err != nil { peer = nil break @@ -133,7 +133,7 @@ func handleTCP(conn net.Conn) { if err != nil { govpn.Printf( `[tap-failed bind="%s" peer="%s" err="%s"]`, - *bindAddr, peerId.String(), err, + *bindAddr, peerID.String(), err, ) peer = nil break @@ -145,15 +145,15 @@ func handleTCP(conn net.Conn) { } go govpn.PeerTapProcessor(ps.peer, ps.tap, ps.terminator) peersLock.Lock() - peersByIdLock.Lock() + peersByIDLock.Lock() kpLock.Lock() peers[addr] = ps - peersById[*peer.Id] = addr + peersByID[*peer.ID] = addr knownPeers[addr] = &peer peersLock.Unlock() - peersByIdLock.Unlock() + peersByIDLock.Unlock() kpLock.Unlock() - govpn.Printf(`[peer-created bind="%s" peer="%s"]`, *bindAddr, peerId.String()) + govpn.Printf(`[peer-created bind="%s" peer="%s"]`, *bindAddr, peerID.String()) } break } @@ -188,7 +188,7 @@ func handleTCP(conn net.Conn) { if !peer.PktProcess(buf[:i+govpn.NonceSize], tap, false) { govpn.Printf( `[packet-unauthenticated bind="%s" addr="%s" peer="%s"]`, - *bindAddr, addr, peer.Id.String(), + *bindAddr, addr, peer.ID.String(), ) break } diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go index 7e3bbc7..cdcfb56 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go @@ -36,7 +36,7 @@ func (c UDPSender) Write(data []byte) (int, error) { var ( // Buffers for UDP parallel processing - udpBufs chan []byte = make(chan []byte, 1<<8) + udpBufs = make(chan []byte, 1<<8) ) func startUDP() { @@ -61,7 +61,7 @@ func startUDP() { var hs *govpn.Handshake var addrPrev string var exists bool - var peerId *govpn.PeerId + var peerID *govpn.PeerID var conf *govpn.PeerConf for { buf = <-udpBufs @@ -87,17 +87,17 @@ func startUDP() { hs, exists = handshakes[addr] hsLock.RUnlock() if !exists { - peerId = idsCache.Find(buf[:n]) - if peerId == nil { + peerID = idsCache.Find(buf[:n]) + if peerID == nil { govpn.Printf(`[identity-unknown bind="%s" addr="%s"]`, *bindAddr, addr) udpBufs <- buf continue } - conf = confs[*peerId] + conf = confs[*peerID] if conf == nil { govpn.Printf( `[conf-get-failed bind="%s" peer="%s"]`, - *bindAddr, peerId.String(), + *bindAddr, peerID.String(), ) udpBufs <- buf continue @@ -122,7 +122,7 @@ func startUDP() { } govpn.Printf( `[handshake-completed bind="%s" addr="%s" peer="%s"]`, - *bindAddr, addr, peerId.String(), + *bindAddr, addr, peerID.String(), ) hs.Zero() hsLock.Lock() @@ -133,13 +133,13 @@ func startUDP() { udpBufs <- make([]byte, govpn.MTUMax) udpBufs <- make([]byte, govpn.MTUMax) }() - peersByIdLock.RLock() - addrPrev, exists = peersById[*peer.Id] - peersByIdLock.RUnlock() + peersByIDLock.RLock() + addrPrev, exists = peersByID[*peer.ID] + peersByIDLock.RUnlock() if exists { peersLock.Lock() peers[addrPrev].terminator <- struct{}{} - ps := &PeerState{ + psNew := &PeerState{ peer: peer, tap: peers[addrPrev].tap, terminator: make(chan struct{}), @@ -148,24 +148,24 @@ func startUDP() { govpn.PeerTapProcessor(peer, tap, terminator) <-udpBufs <-udpBufs - }(ps.peer, ps.tap, ps.terminator) - peersByIdLock.Lock() + }(psNew.peer, psNew.tap, psNew.terminator) + peersByIDLock.Lock() kpLock.Lock() delete(peers, addrPrev) delete(knownPeers, addrPrev) - peers[addr] = ps + peers[addr] = psNew knownPeers[addr] = &peer - peersById[*peer.Id] = addr + peersByID[*peer.ID] = addr peersLock.Unlock() - peersByIdLock.Unlock() + peersByIDLock.Unlock() kpLock.Unlock() govpn.Printf( `[rehandshake-completed bind="%s" peer="%s"]`, - *bindAddr, peer.Id.String(), + *bindAddr, peer.ID.String(), ) } else { go func(addr string, peer *govpn.Peer) { - ifaceName, err := callUp(peer.Id, peer.Addr) + ifaceName, err := callUp(peer.ID, peer.Addr) if err != nil { return } @@ -173,11 +173,11 @@ func startUDP() { if err != nil { govpn.Printf( `[tap-failed bind="%s" peer="%s" err="%s"]`, - *bindAddr, peer.Id.String(), err, + *bindAddr, peer.ID.String(), err, ) return } - ps := &PeerState{ + psNew := &PeerState{ peer: peer, tap: tap, terminator: make(chan struct{}), @@ -186,17 +186,17 @@ func startUDP() { govpn.PeerTapProcessor(peer, tap, terminator) <-udpBufs <-udpBufs - }(ps.peer, ps.tap, ps.terminator) + }(psNew.peer, psNew.tap, psNew.terminator) peersLock.Lock() - peersByIdLock.Lock() + peersByIDLock.Lock() kpLock.Lock() - peers[addr] = ps + peers[addr] = psNew knownPeers[addr] = &peer - peersById[*peer.Id] = addr + peersByID[*peer.ID] = addr peersLock.Unlock() - peersByIdLock.Unlock() + peersByIDLock.Unlock() kpLock.Unlock() - govpn.Printf(`[peer-created bind="%s" peer="%s"]`, *bindAddr, peer.Id.String()) + govpn.Printf(`[peer-created bind="%s" peer="%s"]`, *bindAddr, peer.ID.String()) }(addr, peer) } udpBufs <- buf diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go index 6efc7c0..aac36ba 100644 --- a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go +++ b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go @@ -62,7 +62,7 @@ func main() { if _, err = io.ReadFull(govpn.Rand, id[:]); err != nil { log.Fatalln(err) } - pid := govpn.PeerId(*id) + pid := govpn.PeerID(*id) v := govpn.VerifierNew(*sOpt, *tOpt, *pOpt, &pid) v.PasswordApply(key) fmt.Println(v.LongForm()) diff --git a/src/cypherpunks.ru/govpn/cnw/cnw_test.go b/src/cypherpunks.ru/govpn/cnw/cnw_test.go index aaea97e..29e408f 100644 --- a/src/cypherpunks.ru/govpn/cnw/cnw_test.go +++ b/src/cypherpunks.ru/govpn/cnw/cnw_test.go @@ -28,7 +28,7 @@ import ( ) var ( - testKey *[32]byte = new([32]byte) + testKey = new([32]byte) ) func init() { diff --git a/src/cypherpunks.ru/govpn/conf.go b/src/cypherpunks.ru/govpn/conf.go index f9ff48d..7a9c4b8 100644 --- a/src/cypherpunks.ru/govpn/conf.go +++ b/src/cypherpunks.ru/govpn/conf.go @@ -25,7 +25,7 @@ import ( ) type PeerConf struct { - Id *PeerId `yaml:"-"` + ID *PeerID `yaml:"-"` Name string `yaml:"name"` Iface string `yaml:"iface"` MTU int `yaml:"mtu"` diff --git a/src/cypherpunks.ru/govpn/egd.go b/src/cypherpunks.ru/govpn/egd.go index 5933a2a..f54c116 100644 --- a/src/cypherpunks.ru/govpn/egd.go +++ b/src/cypherpunks.ru/govpn/egd.go @@ -25,7 +25,7 @@ import ( ) var ( - Rand io.Reader = rand.Reader + Rand = rand.Reader ) type EGDRand string diff --git a/src/cypherpunks.ru/govpn/encless_test.go b/src/cypherpunks.ru/govpn/encless_test.go index e7a5ef5..e0c78c4 100644 --- a/src/cypherpunks.ru/govpn/encless_test.go +++ b/src/cypherpunks.ru/govpn/encless_test.go @@ -27,7 +27,7 @@ import ( ) var ( - testKey *[32]byte = new([32]byte) + testKey = new([32]byte) ) func init() { diff --git a/src/cypherpunks.ru/govpn/handshake.go b/src/cypherpunks.ru/govpn/handshake.go index 054c73e..a824ace 100644 --- a/src/cypherpunks.ru/govpn/handshake.go +++ b/src/cypherpunks.ru/govpn/handshake.go @@ -132,7 +132,7 @@ func NewHandshake(addr string, conn io.Writer, conf *PeerConf) *Handshake { } // Generate ID tag from client identification and data. -func idTag(id *PeerId, timeSync int, data []byte) []byte { +func idTag(id *PeerID, timeSync int, data []byte) []byte { enc := make([]byte, 8) copy(enc, data) AddTimeSync(timeSync, enc) @@ -174,7 +174,7 @@ func HandshakeStart(addr string, conn io.Writer, conf *PeerConf) *Handshake { chacha20.XORKeyStream(enc, enc, state.rNonce, state.dsaPubH) } data := append(state.rNonce[8:], enc...) - data = append(data, idTag(state.Conf.Id, state.Conf.TimeSync, state.rNonce[8:])...) + data = append(data, idTag(state.Conf.ID, state.Conf.TimeSync, state.rNonce[8:])...) state.conn.Write(data) return state } @@ -260,7 +260,7 @@ func (h *Handshake) Server(data []byte) *Peer { // Send that to client h.conn.Write(append(encPub, append( - encRs, idTag(h.Conf.Id, h.Conf.TimeSync, encPub)..., + encRs, idTag(h.Conf.ID, h.Conf.TimeSync, encPub)..., )...)) h.LastPing = time.Now() } else @@ -316,7 +316,7 @@ func (h *Handshake) Server(data []byte) *Peer { } else { chacha20.XORKeyStream(enc, enc, h.rNonceNext(2), h.key) } - h.conn.Write(append(enc, idTag(h.Conf.Id, h.Conf.TimeSync, enc)...)) + h.conn.Write(append(enc, idTag(h.Conf.ID, h.Conf.TimeSync, enc)...)) // Switch peer peer := newPeer( @@ -416,7 +416,7 @@ func (h *Handshake) Client(data []byte) *Peer { } // Send that to server - h.conn.Write(append(enc, idTag(h.Conf.Id, h.Conf.TimeSync, enc)...)) + h.conn.Write(append(enc, idTag(h.Conf.ID, h.Conf.TimeSync, enc)...)) h.LastPing = time.Now() } else // ENC(K, R+2, RC) + IDtag diff --git a/src/cypherpunks.ru/govpn/handshake_test.go b/src/cypherpunks.ru/govpn/handshake_test.go index 6f1c7c4..0771465 100644 --- a/src/cypherpunks.ru/govpn/handshake_test.go +++ b/src/cypherpunks.ru/govpn/handshake_test.go @@ -24,7 +24,7 @@ import ( func TestHandshakeSymmetric(t *testing.T) { // initial values are taken from peer_test.go's init() - v := VerifierNew(1<<10, 1<<4, 1, &testPeerId) + v := VerifierNew(1<<10, 1<<4, 1, &testPeerID) testConf.Verifier = v testConf.DSAPriv = v.PasswordApply("does not matter") hsS := NewHandshake("server", Dummy{&testCt}, testConf) @@ -41,7 +41,7 @@ func TestHandshakeSymmetric(t *testing.T) { func TestHandshakeNoiseSymmetric(t *testing.T) { // initial values are taken from peer_test.go's init() - v := VerifierNew(1<<10, 1<<4, 1, &testPeerId) + v := VerifierNew(1<<10, 1<<4, 1, &testPeerID) testConf.Verifier = v testConf.DSAPriv = v.PasswordApply("does not matter") testConf.Noise = true @@ -59,7 +59,7 @@ func TestHandshakeNoiseSymmetric(t *testing.T) { } func TestHandshakeEnclessSymmetric(t *testing.T) { // initial values are taken from peer_test.go's init() - v := VerifierNew(1<<10, 1<<4, 1, &testPeerId) + v := VerifierNew(1<<10, 1<<4, 1, &testPeerID) testConf.Verifier = v testConf.DSAPriv = v.PasswordApply("does not matter") testConf.Encless = true diff --git a/src/cypherpunks.ru/govpn/identity.go b/src/cypherpunks.ru/govpn/identity.go index 89b12ab..262bca6 100644 --- a/src/cypherpunks.ru/govpn/identity.go +++ b/src/cypherpunks.ru/govpn/identity.go @@ -34,13 +34,13 @@ const ( IDSize = 128 / 8 ) -type PeerId [IDSize]byte +type PeerID [IDSize]byte -func (id PeerId) String() string { +func (id PeerID) String() string { return base64.RawStdEncoding.EncodeToString(id[:]) } -func (id PeerId) MarshalJSON() ([]byte, error) { +func (id PeerID) MarshalJSON() ([]byte, error) { return []byte(`"` + id.String() + `"`), nil } @@ -51,18 +51,18 @@ type MACAndTimeSync struct { } type MACCache struct { - cache map[PeerId]*MACAndTimeSync + cache map[PeerID]*MACAndTimeSync l sync.RWMutex } func NewMACCache() *MACCache { - return &MACCache{cache: make(map[PeerId]*MACAndTimeSync)} + return &MACCache{cache: make(map[PeerID]*MACAndTimeSync)} } // Remove disappeared keys, add missing ones with initialized MACs. -func (mc *MACCache) Update(peers *map[PeerId]*PeerConf) { +func (mc *MACCache) Update(peers *map[PeerID]*PeerConf) { mc.l.Lock() - for pid, _ := range mc.cache { + for pid := range mc.cache { if _, exists := (*peers)[pid]; !exists { log.Println("Cleaning key:", pid) delete(mc.cache, pid) @@ -101,7 +101,7 @@ func AddTimeSync(ts int, data []byte) { // Try to find peer's identity (that equals to MAC) // by taking first blocksize sized bytes from data at the beginning // as plaintext and last bytes as cyphertext. -func (mc *MACCache) Find(data []byte) *PeerId { +func (mc *MACCache) Find(data []byte) *PeerID { if len(data) < 8*2 { return nil } @@ -117,7 +117,7 @@ func (mc *MACCache) Find(data []byte) *PeerId { mt.mac.Sum(sum[:0]) mt.l.Unlock() if subtle.ConstantTimeCompare(sum[len(sum)-8:], data[len(data)-8:]) == 1 { - ppid := PeerId(pid) + ppid := PeerID(pid) mc.l.RUnlock() return &ppid } diff --git a/src/cypherpunks.ru/govpn/peer.go b/src/cypherpunks.ru/govpn/peer.go index 7bb978c..e43dc9c 100644 --- a/src/cypherpunks.ru/govpn/peer.go +++ b/src/cypherpunks.ru/govpn/peer.go @@ -88,7 +88,7 @@ type Peer struct { // Basic Addr string - Id *PeerId + ID *PeerID Conn io.Writer `json:"-"` // Traffic behaviour @@ -98,7 +98,7 @@ type Peer struct { Encless bool MTU int - key *[SSize]byte `json:"-"` + key *[SSize]byte // Timers Timeout time.Duration `json:"-"` @@ -135,7 +135,7 @@ type Peer struct { } func (p *Peer) String() string { - return p.Id.String() + ":" + p.Addr + return p.ID.String() + ":" + p.Addr } // Zero peer's memory state. @@ -185,7 +185,7 @@ func newPeer(isClient bool, addr string, conn io.Writer, conf *PeerConf, key *[S peer := Peer{ Addr: addr, - Id: conf.Id, + ID: conf.ID, Conn: conn, NoiseEnable: noiseEnable, diff --git a/src/cypherpunks.ru/govpn/peer_test.go b/src/cypherpunks.ru/govpn/peer_test.go index 553d2c2..6c16469 100644 --- a/src/cypherpunks.ru/govpn/peer_test.go +++ b/src/cypherpunks.ru/govpn/peer_test.go @@ -28,7 +28,7 @@ var ( testPeer *Peer testPt []byte testCt []byte - testPeerId PeerId + testPeerID PeerID testConf *PeerConf ) @@ -45,9 +45,9 @@ func (d Dummy) Write(b []byte) (int, error) { func init() { id := new([IDSize]byte) - testPeerId = PeerId(*id) + testPeerID = PeerID(*id) testConf = &PeerConf{ - Id: &testPeerId, + ID: &testPeerID, MTU: MTUDefault, Timeout: time.Second * time.Duration(TimeoutDefault), } diff --git a/src/cypherpunks.ru/govpn/verifier.go b/src/cypherpunks.ru/govpn/verifier.go index fbc0da1..8be6ea7 100644 --- a/src/cypherpunks.ru/govpn/verifier.go +++ b/src/cypherpunks.ru/govpn/verifier.go @@ -45,14 +45,14 @@ type Verifier struct { S int T int P int - Id *PeerId + ID *PeerID Pub *[ed25519.PublicKeySize]byte } // Generate new verifier for given peer, with specified password and // hashing parameters. -func VerifierNew(s, t, p int, id *PeerId) *Verifier { - return &Verifier{S: s, T: t, P: p, Id: id} +func VerifierNew(s, t, p int, id *PeerID) *Verifier { + return &Verifier{S: s, T: t, P: p, ID: id} } func blake2bKeyless() hash.Hash { @@ -66,7 +66,7 @@ func blake2bKeyless() hash.Hash { // Apply the password: create Ed25519 keypair based on it, save public // key in verifier. func (v *Verifier) PasswordApply(password string) *[ed25519.PrivateKeySize]byte { - r := balloon.H(blake2bKeyless, []byte(password), v.Id[:], v.S, v.T, v.P) + r := balloon.H(blake2bKeyless, []byte(password), v.ID[:], v.S, v.T, v.P) defer SliceZero(r) src := bytes.NewBuffer(r) pub, prv, err := ed25519.GenerateKey(src) @@ -95,8 +95,8 @@ func VerifierFromString(input string) (*Verifier, error) { v := Verifier{S: s, T: t, P: p} id := new([IDSize]byte) copy(id[:], salt) - pid := PeerId(*id) - v.Id = &pid + pid := PeerID(*id) + v.ID = &pid if len(ss) == 5 { pub, err := base64.RawStdEncoding.DecodeString(ss[4]) if err != nil { @@ -113,7 +113,7 @@ func VerifierFromString(input string) (*Verifier, error) { func (v *Verifier) ShortForm() string { return fmt.Sprintf( "$balloon$s=%d,t=%d,p=%d$%s", - v.S, v.T, v.P, base64.RawStdEncoding.EncodeToString(v.Id[:]), + v.S, v.T, v.P, base64.RawStdEncoding.EncodeToString(v.ID[:]), ) } -- 2.44.0