From 33551a72527b6d912d91073aa6b6d2e7bb90c96c Mon Sep 17 00:00:00 2001
From: jbhusson <jonah@elixxir.io>
Date: Wed, 20 Apr 2022 13:07:57 -0400
Subject: [PATCH] Fixes for merge
---
go.mod | 4 ++--
go.sum | 4 ++++
single/interfaces.go | 1 +
single/listener.go | 1 +
single/request.go | 2 ++
ud/lookup.go | 2 +-
6 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index 417152e5e..477e7fe07 100644
--- a/go.mod
+++ b/go.mod
@@ -13,8 +13,8 @@ require (
github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
gitlab.com/elixxir/comms v0.0.4-0.20220323190139-9ed75f3a8b2c
- gitlab.com/elixxir/crypto v0.0.7-0.20220418163058-a76028e93dd3
- gitlab.com/elixxir/ekv v0.1.6
+ gitlab.com/elixxir/crypto v0.0.7-0.20220420170330-979607dcc6da
+ gitlab.com/elixxir/ekv v0.1.7
gitlab.com/elixxir/primitives v0.0.3-0.20220330212736-cce83b5f948f
gitlab.com/xx_network/comms v0.0.4-0.20220315161313-76acb14429ac
gitlab.com/xx_network/crypto v0.0.5-0.20220317171841-084640957d71
diff --git a/go.sum b/go.sum
index e763825e4..68096279f 100644
--- a/go.sum
+++ b/go.sum
@@ -297,8 +297,12 @@ gitlab.com/elixxir/crypto v0.0.7-0.20220331001626-1829e71edf56 h1:1HJHlRwh3dDbvw
gitlab.com/elixxir/crypto v0.0.7-0.20220331001626-1829e71edf56/go.mod h1:JkByWX/TXCjdu6pRJsx+jwttbBGvlAljYSJMImDmt+4=
gitlab.com/elixxir/crypto v0.0.7-0.20220406193349-d25222ea3c6e h1:P+E0+AdevTNWBdqf4+covcmTrRfe6rKPLtevFrjbKQA=
gitlab.com/elixxir/crypto v0.0.7-0.20220406193349-d25222ea3c6e/go.mod h1:JkByWX/TXCjdu6pRJsx+jwttbBGvlAljYSJMImDmt+4=
+gitlab.com/elixxir/crypto v0.0.7-0.20220415180223-ec8d560270a1 h1:stzHgpYxHQu3JgvQu5Vr0hr4nzJUk5CxspZEoNx26eQ=
+gitlab.com/elixxir/crypto v0.0.7-0.20220415180223-ec8d560270a1/go.mod h1:JkByWX/TXCjdu6pRJsx+jwttbBGvlAljYSJMImDmt+4=
gitlab.com/elixxir/crypto v0.0.7-0.20220418163058-a76028e93dd3 h1:tYr7CjBj3p4tmUmvEmsX5n0m0GsfG8eJOu1YLoBHE2g=
gitlab.com/elixxir/crypto v0.0.7-0.20220418163058-a76028e93dd3/go.mod h1:JkByWX/TXCjdu6pRJsx+jwttbBGvlAljYSJMImDmt+4=
+gitlab.com/elixxir/crypto v0.0.7-0.20220420170330-979607dcc6da h1:SZQTa7Gp2vPAwu3yQDhkiKPhFqQXCsiRi0s40e/em/Y=
+gitlab.com/elixxir/crypto v0.0.7-0.20220420170330-979607dcc6da/go.mod h1:JkByWX/TXCjdu6pRJsx+jwttbBGvlAljYSJMImDmt+4=
gitlab.com/elixxir/ekv v0.1.6 h1:M2hUSNhH/ChxDd+s8xBqSEKgoPtmE6hOEBqQ73KbN6A=
gitlab.com/elixxir/ekv v0.1.6/go.mod h1:e6WPUt97taFZe5PFLPb1Dupk7tqmDCTQu1kkstqJvw4=
gitlab.com/elixxir/ekv v0.1.7 h1:OW2z+N4QCqqMFzouAwFTWWMKz0Y/PDhyYReN7gQ5NiQ=
diff --git a/single/interfaces.go b/single/interfaces.go
index 3f53b3afa..8ee9bf002 100644
--- a/single/interfaces.go
+++ b/single/interfaces.go
@@ -28,4 +28,5 @@ type CMix interface {
DeleteService(clientID *id.ID, toDelete message.Service,
processor message.Processor)
GetInstance() *network.Instance
+ CheckInProgressMessages()
}
diff --git a/single/listener.go b/single/listener.go
index c41d5fde0..d9c363aa7 100644
--- a/single/listener.go
+++ b/single/listener.go
@@ -74,6 +74,7 @@ func (l *listener) Process(ecrMsg format.Message,
// Generate DH key and symmetric key
senderPubkey := requestMsg.GetPubKey(l.grp)
dhKey := l.grp.Exp(senderPubkey, l.myPrivKey, l.grp.NewInt(1))
+
key := singleUse.NewRequestKey(dhKey)
// Verify the MAC
diff --git a/single/request.go b/single/request.go
index 6198b1ffc..79017d8cd 100644
--- a/single/request.go
+++ b/single/request.go
@@ -2,6 +2,8 @@ package single
import (
"bytes"
+ "encoding/base64"
+ "fmt"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/cmix"
diff --git a/ud/lookup.go b/ud/lookup.go
index 7dd78c250..348256ade 100644
--- a/ud/lookup.go
+++ b/ud/lookup.go
@@ -68,7 +68,7 @@ func lookup(net CMix,
rng csprng.Source,
uid *id.ID, grp *cyclic.Group,
timeout time.Duration, udContact contact.Contact,
- callback lookupCallback) (id.Round,
+ callback lookupCallback) ([]id.Round,
receptionID.EphemeralIdentity, error) {
// Build the request and marshal it
request := &LookupSend{UserID: uid.Marshal()}
--
GitLab