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
6b3112b6
Commit
6b3112b6
authored
Sep 28, 2017
by
Sietse Ringers
Browse files
Fix inconsistent serialization to storage
parent
8c780ff8
Changes
2
Hide whitespace changes
Inline
Side-by-side
manager.go
View file @
6b3112b6
...
...
@@ -119,7 +119,9 @@ func (cm *CredentialManager) credential(id CredentialTypeIdentifier, counter int
return
cm
.
credentials
[
id
][
counter
],
nil
}
func
(
cm
*
CredentialManager
)
addCredential
(
cred
*
credential
)
error
{
// addCredential adds the specified credential to the CredentialManager, saving its signature
// imediately, and optionally cm.attributes as well.
func
(
cm
*
CredentialManager
)
addCredential
(
cred
*
credential
,
storeAttributes
bool
)
(
err
error
)
{
attrs
,
err
:=
NewAttributeListFromInts
(
cred
.
Attributes
[
1
:
])
if
err
!=
nil
{
return
err
...
...
@@ -132,24 +134,13 @@ func (cm *CredentialManager) addCredential(cred *credential) error {
}
counter
:=
len
(
cm
.
attributes
[
id
])
-
1
cm
.
credentials
[
id
][
counter
]
=
cred
return
nil
}
// add adds the specified credential to the CredentialManager.
func
(
cm
*
CredentialManager
)
add
(
cred
*
credential
)
(
err
error
)
{
if
cred
.
CredentialType
()
==
nil
{
return
errors
.
New
(
"cannot add unknown credential type"
)
}
if
err
=
cm
.
addCredential
(
cred
);
err
!=
nil
{
return
}
counter
:=
len
(
cm
.
credentials
[
cred
.
CredentialType
()
.
Identifier
()])
-
1
if
err
=
cm
.
storeSignature
(
cred
,
counter
);
err
!=
nil
{
return
}
err
=
cm
.
storeAttributes
()
if
storeAttributes
{
err
=
cm
.
storeAttributes
()
}
return
}
...
...
@@ -333,7 +324,7 @@ func (cm *CredentialManager) ConstructCredentials(msg []*gabi.IssueSignatureMess
}
for
_
,
cred
:=
range
creds
{
cm
.
add
(
newCredential
(
cred
))
cm
.
add
Credential
(
newCredential
(
cred
)
,
true
)
}
return
nil
...
...
storage.go
View file @
6b3112b6
...
...
@@ -136,14 +136,13 @@ func (cm *CredentialManager) ParseAndroidStorage() (err error) {
for
_
,
list
:=
range
parsedjson
{
cm
.
secretkey
=
list
[
0
]
.
Attributes
[
0
]
for
i
,
gabicred
:=
range
list
{
for
_
,
gabicred
:=
range
list
{
cred
:=
newCredential
(
gabicred
)
if
cred
.
CredentialType
()
==
nil
{
return
errors
.
New
(
"cannot add unknown credential type"
)
}
cm
.
addCredential
(
cred
)
err
=
cm
.
storeSignature
(
cred
,
i
)
err
=
cm
.
addCredential
(
cred
,
false
)
if
err
!=
nil
{
return
err
}
...
...
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