diff --git a/network/message/handler.go b/network/message/handler.go index 5610c0570aed6785dd4f2f168e1c84c25c53a689..ee0cc561a66641d2191a5c0552b04f42b203b94f 100644 --- a/network/message/handler.go +++ b/network/message/handler.go @@ -56,6 +56,7 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge //if it exists, check against all in the list has, forMe, _ := m.Session.GetEdge().Check(identity.Source, fingerprint[:], ecrMsg.GetContents()) if !has { + jww.INFO.Printf("checking backup %v", preimage.MakeDefault(identity.Source)) //if it doesnt exist, check against the default fingerprint for the identity forMe = fingerprint2.CheckIdentityFP(ecrMsg.GetIdentityFP(), ecrMsg.GetContents(), preimage.MakeDefault(identity.Source)) @@ -64,7 +65,7 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge if !forMe { if jww.GetLogThreshold() == jww.LevelTrace { expectedFP := fingerprint2.IdentityFP(ecrMsg.GetContents(), - identity.Source[:]) + preimage.MakeDefault(identity.Source)) jww.TRACE.Printf("Message for %d (%s) failed identity "+ "check: %v (expected-default) vs %v (received)", identity.EphId, identity.Source, expectedFP, ecrMsg.GetIdentityFP()) diff --git a/network/message/sendCmixUtils.go b/network/message/sendCmixUtils.go index 803b52089cc3165707811d28ddb7197777f6e600..79e8e1281b44eff933071e249c29371c4972caf4 100644 --- a/network/message/sendCmixUtils.go +++ b/network/message/sendCmixUtils.go @@ -145,8 +145,10 @@ func buildSlotMessage(msg format.Message, recipient *id.ID, target *id.ID, var preimage []byte if param.IdentityPreimage != nil { preimage = param.IdentityPreimage + jww.INFO.Printf("Sending to %s with override preimage %v", preimage) }else{ preimage = preimage2.MakeDefault(recipient) + jww.INFO.Printf("Sending to %s with default preimage %v", preimage) } // Set the identity fingerprint diff --git a/storage/edge/edge.go b/storage/edge/edge.go index 7e88d35eccbbe19752dccd4de63363e37e5a12f5..95f5dce8967df845d8247f6f8b04befd626103d2 100644 --- a/storage/edge/edge.go +++ b/storage/edge/edge.go @@ -177,6 +177,7 @@ func (s *Store) Check(identity *id.ID, identityFP []byte, messageContents []byte } for _, preimage := range preimages { + jww.INFO.Printf("checking %v", preimage) if fingerprint2.CheckIdentityFP(identityFP, messageContents, preimage.Data) { return true, true, preimage }