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

Updates from mr

parent 6f37dc4c
No related branches found
No related tags found
2 merge requests!510Release,!279Make naming more consistent
...@@ -57,7 +57,6 @@ func NewCmix(ndfJSON, storageDir string, password []byte, registrationCode strin ...@@ -57,7 +57,6 @@ func NewCmix(ndfJSON, storageDir string, password []byte, registrationCode strin
// memory and stored as securely as possible using the memguard library. // memory and stored as securely as possible using the memguard library.
// LoadCmix does not block on network connection, and instead loads and // LoadCmix does not block on network connection, and instead loads and
// starts subprocesses to perform network operations. // starts subprocesses to perform network operations.
// TODO: add in custom parameters instead of the default
func LoadCmix(storageDir string, password []byte, cmixParamsJSON []byte) (*Cmix, func LoadCmix(storageDir string, password []byte, cmixParamsJSON []byte) (*Cmix,
error) { error) {
if len(cmixParamsJSON) == 0 { if len(cmixParamsJSON) == 0 {
......
...@@ -78,7 +78,7 @@ func Login(cmixId int, callbacks AuthCallbacks, identity, ...@@ -78,7 +78,7 @@ func Login(cmixId int, callbacks AuthCallbacks, identity,
} }
// LoginEphemeral creates and returns a new ephemeral E2e object and adds it to the e2eTrackerSingleton // LoginEphemeral creates and returns a new ephemeral E2e object and adds it to the e2eTrackerSingleton
// identity should be created via MakeReceptionIdentity() and passed in here // identity should be created via MakeReceptionIdentity() or MakeLegacyReceptionIdentity() and passed in here
// If callbacks is left nil, a default auth.Callbacks will be used // If callbacks is left nil, a default auth.Callbacks will be used
func LoginEphemeral(cmixId int, callbacks AuthCallbacks, identity, func LoginEphemeral(cmixId int, callbacks AuthCallbacks, identity,
e2eParamsJSON []byte) (*E2e, error) { e2eParamsJSON []byte) (*E2e, error) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment