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
451653a8
Commit
451653a8
authored
Oct 14, 2017
by
Tomas
Browse files
unenrolledKeyshareServers is actually of type SchemeManagerIdentifier
parent
d1aa53ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
manager.go
View file @
451653a8
...
...
@@ -46,11 +46,11 @@ type CredentialManager struct {
storage
storage
// Other state
ConfigurationStore
*
ConfigurationStore
Unenrolled
KeyshareServ
ers
[]
SchemeManagerIdentifier
irmaConfigurationPath
string
androidStoragePath
string
handler
ClientHandler
ConfigurationStore
*
ConfigurationStore
Unenrolled
SchemeManag
ers
[]
SchemeManagerIdentifier
irmaConfigurationPath
string
androidStoragePath
string
handler
ClientHandler
}
// KeyshareHandler is used for asking the user for his email address and PIN,
...
...
@@ -142,8 +142,8 @@ func NewCredentialManager(
cm
.
paillierKey
(
false
)
}
cm
.
Unenrolled
KeyshareServ
ers
=
cm
.
unenrolled
KeyshareServ
ers
()
if
len
(
cm
.
Unenrolled
KeyshareServ
ers
)
>
1
{
cm
.
Unenrolled
SchemeManag
ers
=
cm
.
unenrolled
SchemeManag
ers
()
if
len
(
cm
.
Unenrolled
SchemeManag
ers
)
>
1
{
return
nil
,
errors
.
New
(
"Too many keyshare servers"
)
}
...
...
@@ -592,7 +592,7 @@ func (cm *CredentialManager) paillierKeyWorker(wait bool, ch chan bool) {
}
}
func
(
cm
*
CredentialManager
)
unenrolled
KeyshareServ
ers
()
[]
SchemeManagerIdentifier
{
func
(
cm
*
CredentialManager
)
unenrolled
SchemeManag
ers
()
[]
SchemeManagerIdentifier
{
list
:=
[]
SchemeManagerIdentifier
{}
for
name
,
manager
:=
range
cm
.
ConfigurationStore
.
SchemeManagers
{
if
_
,
contains
:=
cm
.
keyshareServers
[
name
];
manager
.
Distributed
()
&&
!
contains
{
...
...
@@ -614,7 +614,7 @@ func (cm *CredentialManager) KeyshareEnroll(manager SchemeManagerIdentifier, ema
}()
err
:=
cm
.
keyshareEnrollWorker
(
manager
,
email
,
pin
)
cm
.
Unenrolled
KeyshareServ
ers
=
cm
.
unenrolled
KeyshareServ
ers
()
cm
.
Unenrolled
SchemeManag
ers
=
cm
.
unenrolled
SchemeManag
ers
()
if
err
!=
nil
{
cm
.
handler
.
EnrollmentError
(
manager
,
err
)
}
else
{
...
...
session.go
View file @
451653a8
...
...
@@ -380,7 +380,7 @@ func (session *session) managerSession() {
return
}
if
manager
.
Distributed
()
{
session
.
credManager
.
Unenrolled
KeyshareServ
ers
=
session
.
credManager
.
unenrolled
KeyshareServ
ers
()
session
.
credManager
.
Unenrolled
SchemeManag
ers
=
session
.
credManager
.
unenrolled
SchemeManag
ers
()
}
session
.
credManager
.
handler
.
UpdateConfigurationStore
(
&
IrmaIdentifierSet
{
...
...
updates.go
View file @
451653a8
...
...
@@ -156,7 +156,7 @@ func (cm *CredentialManager) ParseAndroidStorage() (present bool, err error) {
return
}
}
cm
.
Unenrolled
KeyshareServ
ers
=
cm
.
unenrolled
KeyshareServ
ers
()
cm
.
Unenrolled
SchemeManag
ers
=
cm
.
unenrolled
SchemeManag
ers
()
if
err
=
cm
.
storage
.
StorePaillierKeys
(
cm
.
paillierKeyCache
);
err
!=
nil
{
return
...
...
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