diff --git a/auth/receivedRequest.go b/auth/receivedRequest.go index 22a94b0642cbdf2e60b19af8a1cbe8269c2333aa..d5be826d5cf6d6138d301e080d0948ce5d96cc0f 100644 --- a/auth/receivedRequest.go +++ b/auth/receivedRequest.go @@ -197,7 +197,7 @@ func (rrs *receivedRequestService) Process(message format.Message, if !cAuth.VerifyOwnershipProof(state.e2e.GetHistoricalDHPrivkey(), partnerPubKey, state.e2e.GetGroup(), ownershipProof) { jww.WARN.Printf("Invalid ownership proof from %s to %s "+ - "received, discarding msdDigest: %s, fp: %s", + "received, discarding msgDigest: %s, fp: %s", partnerID, receptionID.Source, format.DigestContents(message.GetContents()), base64.StdEncoding.EncodeToString(fp)) diff --git a/auth/store/deletion.go b/auth/store/deletion.go index c02e39571a3447f543b823de496781e273c1f2af..d5fb746a72fa9f02466a9ebe7a73da3b86499616 100644 --- a/auth/store/deletion.go +++ b/auth/store/deletion.go @@ -89,7 +89,7 @@ func (s *Store) DeleteReceivedRequest(partner *id.ID) error { rr.mux.Lock() s.mux.Lock() - _, exist = s.receivedByID[*partner] + rr, exist = s.receivedByID[*partner] delete(s.receivedByID, *partner) rr.mux.Unlock() s.mux.Unlock() @@ -116,7 +116,7 @@ func (s *Store) DeleteSentRequest(partner *id.ID) error { s.mux.Lock() _, exist = s.sentByID[*partner] s.srh.Delete(sr) - delete(s.receivedByID, *partner) + delete(s.sentByID, *partner) s.mux.Unlock() sr.mux.Unlock() diff --git a/auth/store/store.go b/auth/store/store.go index d38510933c82093118a160f6f8afac7caacc14fa..e5496b2d7c88751b36250f814f397ba9ae97bcef 100644 --- a/auth/store/store.go +++ b/auth/store/store.go @@ -316,7 +316,7 @@ func (s *Store) HandleSentRequest(partner *id.ID, handler func(request *SentRequ return errors.WithMessage(handleErr, "Received error from handler") } - delete(s.receivedByID, *partner) + delete(s.sentByID, *partner) s.save() sr.delete()