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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
5045e133
Commit
5045e133
authored
3 years ago
by
Jono Wenger
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused rng from newCmixMessage
parent
37646b0c
No related branches found
No related tags found
1 merge request
!231
Revert "Update store to print changes to the partners list"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
fileTransfer/receive_test.go
+3
-3
3 additions, 3 deletions
fileTransfer/receive_test.go
fileTransfer/send.go
+2
-2
2 additions, 2 deletions
fileTransfer/send.go
fileTransfer/send_test.go
+3
-3
3 additions, 3 deletions
fileTransfer/send_test.go
with
8 additions
and
8 deletions
fileTransfer/receive_test.go
+
3
−
3
View file @
5045e133
...
...
@@ -97,7 +97,7 @@ func TestManager_receive(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"Failed to get sent transfer %s: %+v"
,
stID
,
err
)
}
cMixMsg
,
err
:=
m1
.
newCmixMessage
(
st
,
0
,
prng
)
cMixMsg
,
err
:=
m1
.
newCmixMessage
(
st
,
0
)
if
err
!=
nil
{
t
.
Errorf
(
"Failed to create new cMix message: %+v"
,
err
)
}
...
...
@@ -203,7 +203,7 @@ func TestManager_receive_Stop(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"Failed to get sent transfer %s: %+v"
,
stID
,
err
)
}
cMixMsg
,
err
:=
m1
.
newCmixMessage
(
st
,
0
,
prng
)
cMixMsg
,
err
:=
m1
.
newCmixMessage
(
st
,
0
)
if
err
!=
nil
{
t
.
Errorf
(
"Failed to create new cMix message: %+v"
,
err
)
}
...
...
@@ -311,7 +311,7 @@ func TestManager_readMessage(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"Failed to get sent transfer %s: %+v"
,
stID
,
err
)
}
cMixMsg
,
err
:=
m1
.
newCmixMessage
(
st
,
0
,
prng
)
cMixMsg
,
err
:=
m1
.
newCmixMessage
(
st
,
0
)
if
err
!=
nil
{
t
.
Errorf
(
"Failed to create new cMix message: %+v"
,
err
)
}
...
...
This diff is collapsed.
Click to expand it.
fileTransfer/send.go
+
2
−
2
View file @
5045e133
...
...
@@ -324,7 +324,7 @@ func (m *Manager) buildMessages(partList []queuedPart) (
}
// Generate new cMix message with encrypted file part
cmixMsg
,
err
:=
m
.
newCmixMessage
(
st
,
part
.
partNum
,
rng
)
cmixMsg
,
err
:=
m
.
newCmixMessage
(
st
,
part
.
partNum
)
if
err
==
ftStorage
.
MaxRetriesErr
{
jww
.
DEBUG
.
Printf
(
"[FT] File transfer %s sent to %s ran out of "
+
"retries {parts: %d, numFps: %d/%d}"
,
...
...
@@ -361,7 +361,7 @@ func (m *Manager) buildMessages(partList []queuedPart) (
// newCmixMessage creates a new cMix message with an encrypted file part, its
// MAC, and fingerprint.
func
(
m
*
Manager
)
newCmixMessage
(
transfer
*
ftStorage
.
SentTransfer
,
partNum
uint16
,
rng
csprng
.
Source
)
(
format
.
Message
,
error
)
{
partNum
uint16
)
(
format
.
Message
,
error
)
{
// Create new empty cMix message
cmixMsg
:=
format
.
NewMessage
(
m
.
store
.
Cmix
()
.
GetGroup
()
.
GetP
()
.
ByteLen
())
...
...
This diff is collapsed.
Click to expand it.
fileTransfer/send_test.go
+
3
−
3
View file @
5045e133
...
...
@@ -650,7 +650,7 @@ func TestManager_newCmixMessage(t *testing.T) {
t
.
Errorf
(
"Failed to create a new SentTransfer: %+v"
,
err
)
}
cmixMsg
,
err
:=
m
.
newCmixMessage
(
transfer
,
0
,
prng
)
cmixMsg
,
err
:=
m
.
newCmixMessage
(
transfer
,
0
)
if
err
!=
nil
{
t
.
Errorf
(
"newCmixMessage returned an error: %+v"
,
err
)
}
...
...
@@ -663,7 +663,7 @@ func TestManager_newCmixMessage(t *testing.T) {
}
decrPart
,
err
:=
ftCrypto
.
DecryptPart
(
key
,
cmixMsg
.
GetContents
(),
cmixMsg
.
GetMac
(),
0
,
cmixMsg
.
GetKeyFP
())
cmixMsg
.
GetMac
(),
0
,
cmixMsg
.
GetKeyFP
())
if
err
!=
nil
{
t
.
Errorf
(
"Failed to decrypt file part: %+v"
,
err
)
}
...
...
@@ -1007,7 +1007,7 @@ func TestManager_getPartSize(t *testing.T) {
primeByteLen
:=
m
.
store
.
Cmix
()
.
GetGroup
()
.
GetP
()
.
ByteLen
()
cmixMsgUsedLen
:=
format
.
AssociatedDataSize
filePartMsgUsedLen
:=
ftStorage
.
FmMinSize
expected
:=
2
*
primeByteLen
-
cmixMsgUsedLen
-
filePartMsgUsedLen
-
1
expected
:=
2
*
primeByteLen
-
cmixMsgUsedLen
-
filePartMsgUsedLen
-
1
// Get the part size
partSize
,
err
:=
m
.
getPartSize
()
...
...
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