Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
df68880e
Commit
df68880e
authored
Jun 30, 2022
by
Jake Taylor
Browse files
Options
Downloads
Patches
Plain Diff
fix integration
parent
895cf02d
No related branches found
No related tags found
2 merge requests
!510
Release
,
!257
change structure of identities in api and bindings
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmd/root.go
+12
-4
12 additions, 4 deletions
cmd/root.go
xxdk/identity.go
+4
-0
4 additions, 0 deletions
xxdk/identity.go
with
16 additions
and
4 deletions
cmd/root.go
+
12
−
4
View file @
df68880e
...
@@ -682,7 +682,6 @@ func initE2e() *xxdk.E2e {
...
@@ -682,7 +682,6 @@ func initE2e() *xxdk.E2e {
// load the client
// load the client
baseClient
,
err
:=
xxdk
.
LoadCmix
(
storeDir
,
pass
,
params
)
baseClient
,
err
:=
xxdk
.
LoadCmix
(
storeDir
,
pass
,
params
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
FATAL
.
Panicf
(
"%+v"
,
err
)
jww
.
FATAL
.
Panicf
(
"%+v"
,
err
)
}
}
...
@@ -690,10 +689,19 @@ func initE2e() *xxdk.E2e {
...
@@ -690,10 +689,19 @@ func initE2e() *xxdk.E2e {
authCbs
=
makeAuthCallbacks
(
authCbs
=
makeAuthCallbacks
(
viper
.
GetBool
(
"unsafe-channel-creation"
))
viper
.
GetBool
(
"unsafe-channel-creation"
))
client
,
err
:=
xxdk
.
Login
(
baseClient
,
authCbs
,
receptionIdentity
)
// Force LoginLegacy for precanned senderID
var
client
*
xxdk
.
E2e
if
isPrecanned
:=
viper
.
GetUint
(
"sendid"
)
!=
0
;
isPrecanned
{
client
,
err
=
xxdk
.
LoginLegacy
(
baseClient
,
authCbs
)
if
err
!=
nil
{
jww
.
FATAL
.
Panicf
(
"%+v"
,
err
)
}
}
else
{
client
,
err
=
xxdk
.
Login
(
baseClient
,
authCbs
,
receptionIdentity
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
FATAL
.
Panicf
(
"%+v"
,
err
)
jww
.
FATAL
.
Panicf
(
"%+v"
,
err
)
}
}
}
if
protoUser
:=
viper
.
GetString
(
"protoUserOut"
);
protoUser
!=
""
{
if
protoUser
:=
viper
.
GetString
(
"protoUserOut"
);
protoUser
!=
""
{
...
...
This diff is collapsed.
Click to expand it.
xxdk/identity.go
+
4
−
0
View file @
df68880e
...
@@ -141,11 +141,15 @@ func (r ReceptionIdentity) DeepCopy() ReceptionIdentity {
...
@@ -141,11 +141,15 @@ func (r ReceptionIdentity) DeepCopy() ReceptionIdentity {
dhKeyCopy
:=
make
([]
byte
,
len
(
r
.
DHKeyPrivate
))
dhKeyCopy
:=
make
([]
byte
,
len
(
r
.
DHKeyPrivate
))
copy
(
dhKeyCopy
,
r
.
DHKeyPrivate
)
copy
(
dhKeyCopy
,
r
.
DHKeyPrivate
)
grpCopy
:=
make
([]
byte
,
len
(
r
.
E2eGrp
))
copy
(
grpCopy
,
r
.
E2eGrp
)
return
ReceptionIdentity
{
return
ReceptionIdentity
{
ID
:
r
.
ID
.
DeepCopy
(),
ID
:
r
.
ID
.
DeepCopy
(),
RSAPrivatePem
:
r
.
RSAPrivatePem
,
RSAPrivatePem
:
r
.
RSAPrivatePem
,
Salt
:
saltCopy
,
Salt
:
saltCopy
,
DHKeyPrivate
:
dhKeyCopy
,
DHKeyPrivate
:
dhKeyCopy
,
E2eGrp
:
grpCopy
,
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment