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

Fix timeout

parent a374127a
No related branches found
No related tags found
2 merge requests!117Release,!73Quantum secure xx messenger key negotiation
...@@ -682,16 +682,35 @@ func TestManager_newCmixMessage(t *testing.T) { ...@@ -682,16 +682,35 @@ func TestManager_newCmixMessage(t *testing.T) {
// Tests that Manager.makeRoundEventCallback returns a callback that calls the // Tests that Manager.makeRoundEventCallback returns a callback that calls the
// progress callback when a round succeeds. // progress callback when a round succeeds.
func TestManager_makeRoundEventCallback(t *testing.T) { func TestManager_makeRoundEventCallback(t *testing.T) {
sendE2eChan := make(chan message.Receive, 10) sendE2eChan := make(chan message.Receive, 100)
m := newTestManager(false, nil, sendE2eChan, nil, nil, t) m := newTestManager(false, nil, sendE2eChan, nil, nil, t)
callbackChan := make(chan sentProgressResults, 10) callbackChan := make(chan sentProgressResults, 100)
progressCB := func(completed bool, sent, arrived, total uint16, progressCB := func(completed bool, sent, arrived, total uint16,
tr interfaces.FilePartTracker, err error) { tr interfaces.FilePartTracker, err error) {
callbackChan <- sentProgressResults{ callbackChan <- sentProgressResults{
completed, sent, arrived, total, tr, err} completed, sent, arrived, total, tr, err}
} }
// Add recipient as partner
recipient := id.NewIdFromString("recipient", id.User, t)
grp := m.store.E2e().GetGroup()
dhKey := grp.NewInt(42)
pubKey := diffieHellman.GeneratePublicKey(dhKey, grp)
p := params.GetDefaultE2ESessionParams()
rng := csprng.NewSystemRNG()
_, mySidhPriv := util.GenerateSIDHKeyPair(sidh.KeyVariantSidhA,
rng)
theirSidhPub, _ := util.GenerateSIDHKeyPair(
sidh.KeyVariantSidhB, rng)
err := m.store.E2e().AddPartner(recipient, pubKey, dhKey, mySidhPriv,
theirSidhPub, p, p)
if err != nil {
t.Errorf("Failed to add partner %s: %+v", recipient, err)
}
done0, done1 := make(chan bool), make(chan bool) done0, done1 := make(chan bool), make(chan bool)
go func() { go func() {
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
...@@ -715,24 +734,6 @@ func TestManager_makeRoundEventCallback(t *testing.T) { ...@@ -715,24 +734,6 @@ func TestManager_makeRoundEventCallback(t *testing.T) {
} }
}() }()
// Add recipient as partner
recipient := id.NewIdFromString("recipient", id.User, t)
grp := m.store.E2e().GetGroup()
dhKey := grp.NewInt(42)
pubKey := diffieHellman.GeneratePublicKey(dhKey, grp)
p := params.GetDefaultE2ESessionParams()
rng := csprng.NewSystemRNG()
_, mySidhPriv := util.GenerateSIDHKeyPair(sidh.KeyVariantSidhA,
rng)
theirSidhPub, _ := util.GenerateSIDHKeyPair(
sidh.KeyVariantSidhB, rng)
err := m.store.E2e().AddPartner(recipient, pubKey, dhKey, mySidhPriv,
theirSidhPub, p, p)
if err != nil {
t.Errorf("Failed to add partner %s: %+v", recipient, err)
}
prng := NewPrng(42) prng := NewPrng(42)
key, _ := ftCrypto.NewTransferKey(prng) key, _ := ftCrypto.NewTransferKey(prng)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment