Skip to content
Snippets Groups Projects
Commit 4cd1cdce authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge branch 'master' of git.xx.network:elixxir/client into release

 Conflicts:
	auth/request.go
	e2e/rekey/trigger.go
parents 3860c92c 33f07f78
No related branches found
No related tags found
1 merge request!510Release
......@@ -82,6 +82,11 @@ func (s *state) request(partner contact.Contact, myfacts fact.FactList,
historicalDHPub := diffieHellman.GeneratePublicKey(historicalDHPriv,
dhGrp)
if !dhGrp.Inside(partner.DhPubKey.GetLargeInt()) {
return 0, errors.Errorf("partner's DH public key is not in the E2E "+
"group; E2E group fingerprint is %d and DH key has %d",
dhGrp.GetFingerprint(), partner.DhPubKey.GetGroupFingerprint())
}
ownership := cAuth.MakeOwnershipProof(historicalDHPriv,
partner.DhPubKey, dhGrp)
confirmFp := cAuth.MakeOwnershipProofFP(ownership)
......
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