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
5149f71f
Commit
5149f71f
authored
Jun 15, 2021
by
Sietse Ringers
Browse files
refactor: rename some variables of keyshare secret methods
parent
c13ece86
Changes
1
Hide whitespace changes
Inline
Side-by-side
internal/keysharecore/usersecrets.go
View file @
5149f71f
...
...
@@ -75,13 +75,13 @@ func (s *unencryptedUserSecrets) setID(id [32]byte) {
}
func
(
c
*
Core
)
encryptUserSecrets
(
secrets
unencryptedUserSecrets
)
(
UserSecrets
,
error
)
{
var
resul
t
UserSecrets
var
encSecre
t
UserSecrets
// Store key id
binary
.
LittleEndian
.
PutUint32
(
resul
t
[
0
:
],
c
.
decryptionKeyID
)
binary
.
LittleEndian
.
PutUint32
(
encSecre
t
[
0
:
],
c
.
decryptionKeyID
)
// Generate and store nonce
_
,
err
:=
rand
.
Read
(
resul
t
[
4
:
16
])
_
,
err
:=
rand
.
Read
(
encSecre
t
[
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
(
result
[
:
16
],
resul
t
[
4
:
16
],
secrets
[
:
],
nil
)
gcm
.
Seal
(
encSecret
[
:
16
],
encSecre
t
[
4
:
16
],
secrets
[
:
],
nil
)
return
resul
t
,
nil
return
encSecre
t
,
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
resul
t
unencryptedUserSecrets
_
,
err
=
gcm
.
Open
(
resul
t
[
:
0
],
secrets
[
4
:
16
],
secrets
[
16
:
],
nil
)
var
unencSecre
t
unencryptedUserSecrets
_
,
err
=
gcm
.
Open
(
unencSecre
t
[
:
0
],
secrets
[
4
:
16
],
secrets
[
16
:
],
nil
)
if
err
!=
nil
{
return
unencryptedUserSecrets
{},
err
}
return
resul
t
,
nil
return
unencSecre
t
,
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