diff --git a/xxdk/e2e.go b/xxdk/e2e.go index 8811994fd3e1b5032d6b5821c4d34e798cb41fdd..98d9f37d008f415c8d483f933ffa1bebdf0fc7ce 100644 --- a/xxdk/e2e.go +++ b/xxdk/e2e.go @@ -178,8 +178,9 @@ func LoginWithProtoClient(storageDir string, password []byte, return nil, err } - userInfo := c.GetStorage().PortableUserInfo() - receptionIdentity, err := buildReceptionIdentity(userInfo, c.GetStorage().GetE2EGroup(), protoUser.E2eDhPrivateKey) + userInfo := user.NewUserFromProto(protoUser) + receptionIdentity, err := buildReceptionIdentity(userInfo, + c.GetStorage().GetE2EGroup(), protoUser.E2eDhPrivateKey) return Login(c, callbacks, receptionIdentity) } diff --git a/xxdk/identity.go b/xxdk/identity.go index 46caef778129618a8a07a2ebc5ba036fc5500718..97de124001ce2d090d80cf7c70b7f48a9bba5431 100644 --- a/xxdk/identity.go +++ b/xxdk/identity.go @@ -172,8 +172,8 @@ func (r ReceptionIdentity) GetContact() contact.Contact { // buildReceptionIdentity creates a new ReceptionIdentity // from the given user.Info func buildReceptionIdentity(userInfo user.Info, e2eGrp *cyclic.Group, dHPrivkey *cyclic.Int) (ReceptionIdentity, error) { - saltCopy := make([]byte, len(userInfo.TransmissionSalt)) - copy(saltCopy, userInfo.TransmissionSalt) + saltCopy := make([]byte, len(userInfo.ReceptionSalt)) + copy(saltCopy, userInfo.ReceptionSalt) grp, err := e2eGrp.MarshalJSON() if err != nil {