diff --git a/auth/confirm.go b/auth/confirm.go index 72d327cf12a63ed231dac32c9aa8fcf3bd87330f..d956580783d9f190c9255bd91f22dfb25921ba1a 100644 --- a/auth/confirm.go +++ b/auth/confirm.go @@ -98,8 +98,8 @@ func (s *state) confirm(partner contact.Contact, serviceTag string) ( baseFmt.SetPubKey(dhPub) jww.TRACE.Printf("SendConfirm PARTNERPUBKEY: %v", - partner.DhPubKey.Bytes()) - jww.TRACE.Printf("SendConfirm MYPUBKEY: %v", dhPub.Bytes()) + partner.DhPubKey.TextVerbose(16, 0)) + jww.TRACE.Printf("SendConfirm MYPUBKEY: %v", dhPub.TextVerbose(16, 0)) jww.TRACE.Printf("SendConfirm ECRPAYLOAD: %v", baseFmt.GetEcrPayload()) jww.TRACE.Printf("SendConfirm MAC: %v", mac) diff --git a/auth/receivedConfirm.go b/auth/receivedConfirm.go index dd06dbbf129223642a3c80affa70ca84364f658f..202085d34f8b2c36b945f0fdbd0ed34280e1fc86 100644 --- a/auth/receivedConfirm.go +++ b/auth/receivedConfirm.go @@ -36,9 +36,11 @@ func (rcs *receivedConfirmService) Process(msg format.Message, return } - jww.TRACE.Printf("processing confirm: \n\t MYPUBKEY: %s "+ - "\n\t PARTNERPUBKEY: %s \n\t ECRPAYLOAD: %s \n\t MAC: %s", + jww.TRACE.Printf("processing confirm: \n\t MYHISTORICALPUBKEY: %s\n\t"+ + "MYPUBKEY: %s\n\t PARTNERPUBKEY: %s \n\t "+ + "ECRPAYLOAD: %s \n\t MAC: %s", state.e2e.GetHistoricalDHPubkey().TextVerbose(16, 0), + rcs.SentRequest.GetMyPubKey().TextVerbose(16, 0), partnerPubKey.TextVerbose(16, 0), base64.StdEncoding.EncodeToString(baseFmt.data), base64.StdEncoding.EncodeToString(msg.GetMac())) @@ -79,7 +81,7 @@ func (rcs *receivedConfirmService) Process(msg format.Message, // check the ownership proof, this verifies the respondent owns the // initial identity - if !cAuth.VerifyOwnershipProof(state.e2e.GetHistoricalDHPrivkey(), + if !cAuth.VerifyOwnershipProof(rcs.SentRequest.GetMyPrivKey(), rcs.GetPartnerHistoricalPubKey(), state.e2e.GetGroup(), ecrFmt.GetOwnership()) { jww.WARN.Printf("Failed authenticate identity for auth "+ diff --git a/cmix/message/fingerprints.go b/cmix/message/fingerprints.go index 071425109681fce4774e91ec4821dd94e1fe3571..bf6235b9711e6fe9930785ae6f941ab6290c30a5 100644 --- a/cmix/message/fingerprints.go +++ b/cmix/message/fingerprints.go @@ -65,7 +65,7 @@ func (f *FingerprintsManager) pop(clientID *id.ID, // identity in the session func (f *FingerprintsManager) AddFingerprint(clientID *id.ID, fingerprint format.Fingerprint, mp Processor) error { - jww.INFO.Printf("AddFingerprint: %s", fingerprint) + jww.TRACE.Printf("AddFingerprint: %s", fingerprint) f.Lock() defer f.Unlock()