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
9a398006
Commit
9a398006
authored
4 years ago
by
Richard T. Carback III
Browse files
Options
Downloads
Patches
Plain Diff
INFO->TRACE the new debugging lines
parent
2718e8fd
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!23
Release
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
auth/callback.go
+10
-10
10 additions, 10 deletions
auth/callback.go
auth/request.go
+5
-5
5 additions, 5 deletions
auth/request.go
with
15 additions
and
15 deletions
auth/callback.go
+
10
−
10
View file @
9a398006
...
@@ -87,13 +87,13 @@ func (m *Manager) handleRequest(cmixMsg format.Message,
...
@@ -87,13 +87,13 @@ func (m *Manager) handleRequest(cmixMsg format.Message,
myPubKey
:=
diffieHellman
.
GeneratePublicKey
(
myHistoricalPrivKey
,
grp
)
myPubKey
:=
diffieHellman
.
GeneratePublicKey
(
myHistoricalPrivKey
,
grp
)
jww
.
INFO
.
Printf
(
"handleRequest MYPUBKEY: %v"
,
myPubKey
.
Bytes
())
jww
.
TRACE
.
Printf
(
"handleRequest MYPUBKEY: %v"
,
myPubKey
.
Bytes
())
jww
.
INFO
.
Printf
(
"handleRequest PARTNERPUBKEY: %v"
,
partnerPubKey
.
Bytes
())
jww
.
TRACE
.
Printf
(
"handleRequest PARTNERPUBKEY: %v"
,
partnerPubKey
.
Bytes
())
//decrypt the message
//decrypt the message
jww
.
INFO
.
Printf
(
"handleRequest SALT: %v"
,
baseFmt
.
GetSalt
())
jww
.
TRACE
.
Printf
(
"handleRequest SALT: %v"
,
baseFmt
.
GetSalt
())
jww
.
INFO
.
Printf
(
"handleRequest ECRPAYLOAD: %v"
,
baseFmt
.
GetEcrPayload
())
jww
.
TRACE
.
Printf
(
"handleRequest ECRPAYLOAD: %v"
,
baseFmt
.
GetEcrPayload
())
jww
.
INFO
.
Printf
(
"handleRequest MAC: %v"
,
cmixMsg
.
GetMac
())
jww
.
TRACE
.
Printf
(
"handleRequest MAC: %v"
,
cmixMsg
.
GetMac
())
success
,
payload
:=
cAuth
.
Decrypt
(
myHistoricalPrivKey
,
success
,
payload
:=
cAuth
.
Decrypt
(
myHistoricalPrivKey
,
partnerPubKey
,
baseFmt
.
GetSalt
(),
baseFmt
.
GetEcrPayload
(),
partnerPubKey
,
baseFmt
.
GetSalt
(),
baseFmt
.
GetEcrPayload
(),
...
@@ -230,13 +230,13 @@ func (m *Manager) handleConfirm(cmixMsg format.Message, sr *auth.SentRequest,
...
@@ -230,13 +230,13 @@ func (m *Manager) handleConfirm(cmixMsg format.Message, sr *auth.SentRequest,
return
return
}
}
jww
.
INFO
.
Printf
(
"handleConfirm PARTNERPUBKEY: %v"
,
partnerPubKey
.
Bytes
())
jww
.
TRACE
.
Printf
(
"handleConfirm PARTNERPUBKEY: %v"
,
partnerPubKey
.
Bytes
())
jww
.
INFO
.
Printf
(
"handleConfirm SRMYPUBKEY: %v"
,
sr
.
GetMyPubKey
()
.
Bytes
())
jww
.
TRACE
.
Printf
(
"handleConfirm SRMYPUBKEY: %v"
,
sr
.
GetMyPubKey
()
.
Bytes
())
// decrypt the payload
// decrypt the payload
jww
.
INFO
.
Printf
(
"handleConfirm SALT: %v"
,
baseFmt
.
GetSalt
())
jww
.
TRACE
.
Printf
(
"handleConfirm SALT: %v"
,
baseFmt
.
GetSalt
())
jww
.
INFO
.
Printf
(
"handleConfirm ECRPAYLOAD: %v"
,
baseFmt
.
GetEcrPayload
())
jww
.
TRACE
.
Printf
(
"handleConfirm ECRPAYLOAD: %v"
,
baseFmt
.
GetEcrPayload
())
jww
.
INFO
.
Printf
(
"handleConfirm MAC: %v"
,
cmixMsg
.
GetMac
())
jww
.
TRACE
.
Printf
(
"handleConfirm MAC: %v"
,
cmixMsg
.
GetMac
())
success
,
payload
:=
cAuth
.
Decrypt
(
sr
.
GetMyPrivKey
(),
success
,
payload
:=
cAuth
.
Decrypt
(
sr
.
GetMyPrivKey
(),
partnerPubKey
,
baseFmt
.
GetSalt
(),
baseFmt
.
GetEcrPayload
(),
partnerPubKey
,
baseFmt
.
GetSalt
(),
baseFmt
.
GetEcrPayload
(),
cmixMsg
.
GetMac
(),
grp
)
cmixMsg
.
GetMac
(),
grp
)
...
...
This diff is collapsed.
Click to expand it.
auth/request.go
+
5
−
5
View file @
9a398006
...
@@ -119,8 +119,8 @@ func RequestAuth(partner, me contact.Contact, message string, rng io.Reader,
...
@@ -119,8 +119,8 @@ func RequestAuth(partner, me contact.Contact, message string, rng io.Reader,
ownership
:=
cAuth
.
MakeOwnershipProof
(
storage
.
E2e
()
.
GetDHPrivateKey
(),
ownership
:=
cAuth
.
MakeOwnershipProof
(
storage
.
E2e
()
.
GetDHPrivateKey
(),
partner
.
DhPubKey
,
storage
.
E2e
()
.
GetGroup
())
partner
.
DhPubKey
,
storage
.
E2e
()
.
GetGroup
())
jww
.
INFO
.
Printf
(
"RequestAuth MYPUBKEY: %v"
,
newPubKey
.
Bytes
())
jww
.
TRACE
.
Printf
(
"RequestAuth MYPUBKEY: %v"
,
newPubKey
.
Bytes
())
jww
.
INFO
.
Printf
(
"RequestAuth THEIRPUBKEY: %v"
,
partner
.
DhPubKey
.
Bytes
())
jww
.
TRACE
.
Printf
(
"RequestAuth THEIRPUBKEY: %v"
,
partner
.
DhPubKey
.
Bytes
())
/*encrypt payload*/
/*encrypt payload*/
requestFmt
.
SetID
(
storage
.
GetUser
()
.
ReceptionID
)
requestFmt
.
SetID
(
storage
.
GetUser
()
.
ReceptionID
)
...
@@ -140,9 +140,9 @@ func RequestAuth(partner, me contact.Contact, message string, rng io.Reader,
...
@@ -140,9 +140,9 @@ func RequestAuth(partner, me contact.Contact, message string, rng io.Reader,
cmixMsg
.
SetMac
(
mac
)
cmixMsg
.
SetMac
(
mac
)
cmixMsg
.
SetContents
(
baseFmt
.
Marshal
())
cmixMsg
.
SetContents
(
baseFmt
.
Marshal
())
jww
.
INFO
.
Printf
(
"RequestAuth SALT: %v"
,
salt
)
jww
.
TRACE
.
Printf
(
"RequestAuth SALT: %v"
,
salt
)
jww
.
INFO
.
Printf
(
"RequestAuth ECRPAYLOAD: %v"
,
baseFmt
.
GetEcrPayload
())
jww
.
TRACE
.
Printf
(
"RequestAuth ECRPAYLOAD: %v"
,
baseFmt
.
GetEcrPayload
())
jww
.
INFO
.
Printf
(
"RequestAuth MAC: %v"
,
mac
)
jww
.
TRACE
.
Printf
(
"RequestAuth MAC: %v"
,
mac
)
/*store state*/
/*store state*/
//fixme: channel is bricked if the first store succedes but the second fails
//fixme: channel is bricked if the first store succedes but the second fails
...
...
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