Skip to content
Snippets Groups Projects
Commit fef75849 authored by Jake Taylor's avatar Jake Taylor
Browse files

fix compile

parent 5a6c0b04
No related branches found
No related tags found
3 merge requests!510Release,!267Make BuildReceptionIdentity public, and make backup restore function return a...,!263Hotfix/refactor cmd
...@@ -119,7 +119,7 @@ func New(baseDir, password string, u user.Info, ...@@ -119,7 +119,7 @@ func New(baseDir, password string, u user.Info,
} }
s.User, err = user.NewUser(s.kv, u.TransmissionID, u.ReceptionID, u.TransmissionSalt, s.User, err = user.NewUser(s.kv, u.TransmissionID, u.ReceptionID, u.TransmissionSalt,
u.ReceptionSalt, u.TransmissionRSA, u.ReceptionRSA, u.Precanned) u.ReceptionSalt, u.TransmissionRSA, u.ReceptionRSA, u.Precanned, u.E2eDhPublicKey, u.E2eDhPublicKey)
if err != nil { if err != nil {
return nil, errors.WithMessage(err, "Failed to create user") return nil, errors.WithMessage(err, "Failed to create user")
} }
...@@ -230,7 +230,7 @@ func InitTestingSession(i interface{}) Session { ...@@ -230,7 +230,7 @@ func InitTestingSession(i interface{}) Session {
kv := versioned.NewKV(ekv.MakeMemstore()) kv := versioned.NewKV(ekv.MakeMemstore())
s := &session{kv: kv} s := &session{kv: kv}
uid := id.NewIdFromString("zezima", id.User, i) uid := id.NewIdFromString("zezima", id.User, i)
u, err := user.NewUser(kv, uid, uid, []byte("salt"), []byte("salt"), privKey, privKey, false) u, err := user.NewUser(kv, uid, uid, []byte("salt"), []byte("salt"), privKey, privKey, false, nil, nil)
if err != nil { if err != nil {
jww.FATAL.Panicf("InitTestingSession failed to create dummy user: %+v", err) jww.FATAL.Panicf("InitTestingSession failed to create dummy user: %+v", err)
} }
......
...@@ -10,6 +10,7 @@ package user ...@@ -10,6 +10,7 @@ package user
import ( import (
"github.com/pkg/errors" "github.com/pkg/errors"
"gitlab.com/elixxir/client/storage/versioned" "gitlab.com/elixxir/client/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/crypto/signature/rsa"
"gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/id"
"sync" "sync"
...@@ -33,9 +34,11 @@ type User struct { ...@@ -33,9 +34,11 @@ type User struct {
// builds a new user. // builds a new user.
func NewUser(kv *versioned.KV, transmissionID, receptionID *id.ID, transmissionSalt, func NewUser(kv *versioned.KV, transmissionID, receptionID *id.ID, transmissionSalt,
receptionSalt []byte, transmissionRsa, receptionRsa *rsa.PrivateKey, isPrecanned bool) (*User, error) { receptionSalt []byte, transmissionRsa, receptionRsa *rsa.PrivateKey, isPrecanned bool,
e2eDhPrivateKey, e2eDhPublicKey *cyclic.Int) (*User, error) {
ci := newCryptographicIdentity(transmissionID, receptionID, transmissionSalt, receptionSalt, transmissionRsa, receptionRsa, isPrecanned, kv) ci := newCryptographicIdentity(transmissionID, receptionID, transmissionSalt,
receptionSalt, transmissionRsa, receptionRsa, isPrecanned, e2eDhPrivateKey, e2eDhPublicKey, kv)
return &User{CryptographicIdentity: ci, kv: kv}, nil return &User{CryptographicIdentity: ci, kv: kv}, nil
} }
......
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