Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
IRMA
Github mirrors
irmago
Commits
cee04f93
Commit
cee04f93
authored
Jun 18, 2021
by
Sietse Ringers
Browse files
refactor: use plural variable name for concistency
parent
531cec93
Changes
1
Hide whitespace changes
Inline
Side-by-side
internal/keysharecore/usersecrets.go
View file @
cee04f93
...
...
@@ -75,13 +75,13 @@ func (s *unencryptedUserSecrets) setID(id [32]byte) {
}
func
(
c
*
Core
)
encryptUserSecrets
(
secrets
unencryptedUserSecrets
)
(
UserSecrets
,
error
)
{
var
encSecret
UserSecrets
var
encSecret
s
UserSecrets
// Store key id
binary
.
LittleEndian
.
PutUint32
(
encSecret
[
0
:
],
c
.
decryptionKeyID
)
binary
.
LittleEndian
.
PutUint32
(
encSecret
s
[
0
:
],
c
.
decryptionKeyID
)
// Generate and store nonce
_
,
err
:=
rand
.
Read
(
encSecret
[
4
:
16
])
_
,
err
:=
rand
.
Read
(
encSecret
s
[
4
:
16
])
if
err
!=
nil
{
return
UserSecrets
{},
err
}
...
...
@@ -91,9 +91,9 @@ func (c *Core) encryptUserSecrets(secrets unencryptedUserSecrets) (UserSecrets,
if
err
!=
nil
{
return
UserSecrets
{},
err
}
gcm
.
Seal
(
encSecret
[
:
16
],
encSecret
[
4
:
16
],
secrets
[
:
],
nil
)
gcm
.
Seal
(
encSecret
s
[
:
16
],
encSecret
s
[
4
:
16
],
secrets
[
:
],
nil
)
return
encSecret
,
nil
return
encSecret
s
,
nil
}
func
(
c
*
Core
)
decryptUserSecrets
(
secrets
UserSecrets
)
(
unencryptedUserSecrets
,
error
)
{
...
...
@@ -111,12 +111,12 @@ func (c *Core) decryptUserSecrets(secrets UserSecrets) (unencryptedUserSecrets,
if
err
!=
nil
{
return
unencryptedUserSecrets
{},
err
}
var
unencSecret
unencryptedUserSecrets
_
,
err
=
gcm
.
Open
(
unencSecret
[
:
0
],
secrets
[
4
:
16
],
secrets
[
16
:
],
nil
)
var
unencSecret
s
unencryptedUserSecrets
_
,
err
=
gcm
.
Open
(
unencSecret
s
[
:
0
],
secrets
[
4
:
16
],
secrets
[
16
:
],
nil
)
if
err
!=
nil
{
return
unencryptedUserSecrets
{},
err
}
return
unencSecret
,
nil
return
unencSecret
s
,
nil
}
func
(
c
*
Core
)
decryptUserSecretsIfPinOK
(
secrets
UserSecrets
,
pin
string
)
(
unencryptedUserSecrets
,
error
)
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment