Skip to content
Snippets Groups Projects
Commit 5ee8906f authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Fix auth switch renegotiation and fix issue on deletes of sent requests

parent 9d8b8868
No related branches found
No related tags found
2 merge requests!510Release,!207WIP: Client Restructure
......@@ -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))
......
......@@ -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()
......
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment