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
26f224ff
Commit
26f224ff
authored
Feb 05, 2018
by
Sietse Ringers
Browse files
Don't export SchemeManager.index
parent
014ef89f
Changes
2
Hide whitespace changes
Inline
Side-by-side
descriptions.go
View file @
26f224ff
...
...
@@ -22,9 +22,10 @@ type SchemeManager struct {
XMLVersion
int
`xml:"version,attr"`
XMLName
xml
.
Name
`xml:"SchemeManager"`
Index
SchemeManagerIndex
`xml:"-"`
Status
SchemeManagerStatus
`xml:"-"`
Valid
bool
`xml:"-"`
// true iff Status == SchemeManagerStatusValid
index
SchemeManagerIndex
}
// Issuer describes an issuer.
...
...
irmaconfig.go
View file @
26f224ff
...
...
@@ -636,12 +636,12 @@ func (conf *Configuration) parseIndex(name string, manager *SchemeManager) error
if
err
!=
nil
{
return
err
}
manager
.
I
ndex
=
make
(
map
[
string
]
ConfigurationFileHash
)
return
manager
.
I
ndex
.
FromString
(
string
(
indexbts
))
manager
.
i
ndex
=
make
(
map
[
string
]
ConfigurationFileHash
)
return
manager
.
i
ndex
.
FromString
(
string
(
indexbts
))
}
func
(
conf
*
Configuration
)
VerifySchemeManager
(
manager
*
SchemeManager
)
error
{
for
file
:=
range
manager
.
I
ndex
{
for
file
:=
range
manager
.
i
ndex
{
exists
,
err
:=
fs
.
PathExists
(
filepath
.
Join
(
conf
.
path
,
file
))
if
err
!=
nil
{
return
err
...
...
@@ -662,7 +662,7 @@ func (conf *Configuration) VerifySchemeManager(manager *SchemeManager) error {
// and verifies its authenticity by checking that the file hash
// is present in the (signed) scheme manager index file.
func
(
conf
*
Configuration
)
ReadAuthenticatedFile
(
manager
*
SchemeManager
,
path
string
)
([]
byte
,
error
)
{
signedHash
,
ok
:=
manager
.
I
ndex
[
path
]
signedHash
,
ok
:=
manager
.
i
ndex
[
path
]
if
!
ok
{
return
nil
,
errors
.
Errorf
(
"File %s not present in scheme manager index"
,
path
)
}
...
...
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