X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fidentity.go;h=d738c5563e091179bd1e1fa287fb1bbcbd6ef1d9;hp=4dc74eed0e330f4a3ec73570e0c9d73b2503baee;hb=8deaf99f98548064f51a3fe5a163456257c089bb;hpb=b97d37d9494cf064a50d30b4936393eeab32b0e1 diff --git a/src/cypherpunks.ru/govpn/identity.go b/src/cypherpunks.ru/govpn/identity.go index 4dc74ee..d738c55 100644 --- a/src/cypherpunks.ru/govpn/identity.go +++ b/src/cypherpunks.ru/govpn/identity.go @@ -1,6 +1,6 @@ /* GoVPN -- simple secure free software virtual private network daemon -Copyright (C) 2014-2016 Sergey Matveev +Copyright (C) 2014-2017 Sergey Matveev This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/dchest/blake2b" + "golang.org/x/crypto/blake2b" ) const ( @@ -73,8 +73,12 @@ func (mc *MACCache) Update(peers *map[PeerId]*PeerConf) { mc.cache[pid].ts = pc.TimeSync } else { log.Println("Adding key", pid) + mac, err := blake2b.New256(pid[:]) + if err != nil { + panic(err) + } mc.cache[pid] = &MACAndTimeSync{ - mac: blake2b.NewMAC(8, pid[:]), + mac: mac, ts: pc.TimeSync, } } @@ -109,9 +113,9 @@ func (mc *MACCache) Find(data []byte) *PeerId { mt.l.Lock() mt.mac.Reset() mt.mac.Write(buf) - mt.mac.Sum(buf[:0]) + sum := mt.mac.Sum(nil) mt.l.Unlock() - if subtle.ConstantTimeCompare(buf, data[len(data)-8:]) == 1 { + if subtle.ConstantTimeCompare(sum[len(sum)-8:], data[len(data)-8:]) == 1 { ppid := PeerId(pid) mc.l.RUnlock() return &ppid