Skip to content
Snippets Groups Projects
Commit 9b4754ec authored by Jonah Husson's avatar Jonah Husson
Browse files

Fix from merge

parent d5692991
No related branches found
No related tags found
2 merge requests!510Release,!249Increase bindings timeout in cmix params to 45 seconds
......@@ -164,8 +164,6 @@ func LoginWithProtoClient(storageDir string, password []byte,
return nil, err
}
c.network.AddIdentity(c.GetUser().ReceptionID, time.Time{}, true)
// FIXME: The callbacks need to be set, so I suppose we would need to
// either set them via a special type or add them
// to the login call?
......@@ -206,6 +204,8 @@ func login(client *Cmix, callbacks auth.Callbacks,
e2eIdentity: identity,
}
client.network.AddIdentity(identity.ID, time.Time{}, true)
//initialize the e2e storage
err = e2e.Init(kv, identity.ID, identity.DHKeyPrivate, e2eGrp,
rekey.GetDefaultEphemeralParams())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment