X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fidentity.go;h=81066bc715abbe961eb9225d60ee3dfd2b2b94b5;hb=bb60f10e8d825d49e635b840b5eb7512811256d9;hp=52d430d6c1807df2ca94025309e76cb46acb93d7;hpb=f1e762d1b56722e5ecaaa165e885231163dc6978;p=govpn.git diff --git a/src/cypherpunks.ru/govpn/identity.go b/src/cypherpunks.ru/govpn/identity.go index 52d430d..81066bc 100644 --- a/src/cypherpunks.ru/govpn/identity.go +++ b/src/cypherpunks.ru/govpn/identity.go @@ -141,15 +141,14 @@ func AddTimeSync(ts int, data []byte) { // as plaintext and last bytes as cyphertext. func (mc *MACCache) Find(data []byte) (*PeerID, error) { const minimumSize = 8 * 2 - lenData := len(data) fields := logrus.Fields{ "func": logFuncPrefix + "MACCache.Find", - "data": lenData, + "data": len(data), "size": mc.Length(), } logger.WithFields(fields).Debug("Starting") - if lenData < minimumSize { - return nil, errors.Errorf("MAC is too small %d, minimum %d", lenData, minimumSize) + if len(data) < minimumSize { + return nil, errors.Errorf("MAC is too small %d, minimum %d", len(data), minimumSize) } buf := make([]byte, 8) sum := make([]byte, 32) @@ -171,7 +170,7 @@ func (mc *MACCache) Find(data []byte) (*PeerID, error) { mt.mac.Sum(sum[:0]) mt.l.Unlock() - if subtle.ConstantTimeCompare(sum[len(sum)-8:], data[lenData-8:]) == 1 { + if subtle.ConstantTimeCompare(sum[len(sum)-8:], data[len(data)-8:]) == 1 { logger.WithFields(fields).WithFields(loopFields).Debug("Matching peer") ppid := PeerID(pid) return &ppid, nil