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

Get both sides to the point where the ownership proof is verified and they are...

Get both sides to the point where the ownership proof is verified and they are adding fingerprints for each other. Callback is still not quite working
parent fd56cea5
Branches
Tags
3 merge requests!510Release,!207WIP: Client Restructure,!203Symmetric broadcast
...@@ -98,8 +98,8 @@ func (s *state) confirm(partner contact.Contact, serviceTag string) ( ...@@ -98,8 +98,8 @@ func (s *state) confirm(partner contact.Contact, serviceTag string) (
baseFmt.SetPubKey(dhPub) baseFmt.SetPubKey(dhPub)
jww.TRACE.Printf("SendConfirm PARTNERPUBKEY: %v", jww.TRACE.Printf("SendConfirm PARTNERPUBKEY: %v",
partner.DhPubKey.Bytes()) partner.DhPubKey.TextVerbose(16, 0))
jww.TRACE.Printf("SendConfirm MYPUBKEY: %v", dhPub.Bytes()) jww.TRACE.Printf("SendConfirm MYPUBKEY: %v", dhPub.TextVerbose(16, 0))
jww.TRACE.Printf("SendConfirm ECRPAYLOAD: %v", baseFmt.GetEcrPayload()) jww.TRACE.Printf("SendConfirm ECRPAYLOAD: %v", baseFmt.GetEcrPayload())
jww.TRACE.Printf("SendConfirm MAC: %v", mac) jww.TRACE.Printf("SendConfirm MAC: %v", mac)
......
...@@ -36,9 +36,11 @@ func (rcs *receivedConfirmService) Process(msg format.Message, ...@@ -36,9 +36,11 @@ func (rcs *receivedConfirmService) Process(msg format.Message,
return return
} }
jww.TRACE.Printf("processing confirm: \n\t MYPUBKEY: %s "+ jww.TRACE.Printf("processing confirm: \n\t MYHISTORICALPUBKEY: %s\n\t"+
"\n\t PARTNERPUBKEY: %s \n\t ECRPAYLOAD: %s \n\t MAC: %s", "MYPUBKEY: %s\n\t PARTNERPUBKEY: %s \n\t "+
"ECRPAYLOAD: %s \n\t MAC: %s",
state.e2e.GetHistoricalDHPubkey().TextVerbose(16, 0), state.e2e.GetHistoricalDHPubkey().TextVerbose(16, 0),
rcs.SentRequest.GetMyPubKey().TextVerbose(16, 0),
partnerPubKey.TextVerbose(16, 0), partnerPubKey.TextVerbose(16, 0),
base64.StdEncoding.EncodeToString(baseFmt.data), base64.StdEncoding.EncodeToString(baseFmt.data),
base64.StdEncoding.EncodeToString(msg.GetMac())) base64.StdEncoding.EncodeToString(msg.GetMac()))
...@@ -79,7 +81,7 @@ func (rcs *receivedConfirmService) Process(msg format.Message, ...@@ -79,7 +81,7 @@ func (rcs *receivedConfirmService) Process(msg format.Message,
// check the ownership proof, this verifies the respondent owns the // check the ownership proof, this verifies the respondent owns the
// initial identity // initial identity
if !cAuth.VerifyOwnershipProof(state.e2e.GetHistoricalDHPrivkey(), if !cAuth.VerifyOwnershipProof(rcs.SentRequest.GetMyPrivKey(),
rcs.GetPartnerHistoricalPubKey(), rcs.GetPartnerHistoricalPubKey(),
state.e2e.GetGroup(), ecrFmt.GetOwnership()) { state.e2e.GetGroup(), ecrFmt.GetOwnership()) {
jww.WARN.Printf("Failed authenticate identity for auth "+ jww.WARN.Printf("Failed authenticate identity for auth "+
......
...@@ -65,7 +65,7 @@ func (f *FingerprintsManager) pop(clientID *id.ID, ...@@ -65,7 +65,7 @@ func (f *FingerprintsManager) pop(clientID *id.ID,
// identity in the session // identity in the session
func (f *FingerprintsManager) AddFingerprint(clientID *id.ID, func (f *FingerprintsManager) AddFingerprint(clientID *id.ID,
fingerprint format.Fingerprint, mp Processor) error { fingerprint format.Fingerprint, mp Processor) error {
jww.INFO.Printf("AddFingerprint: %s", fingerprint) jww.TRACE.Printf("AddFingerprint: %s", fingerprint)
f.Lock() f.Lock()
defer f.Unlock() defer f.Unlock()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment