Skip to content

GitLab

Commit 0b89b56f authored by Sietse Ringers's avatar Sietse Ringers
Browse files

Remove copying of irma_configuration in update process 

This feature can no longer work because the scheme managers in the
irma_configuration of the old Android app are not signed, so they
would be rejected anyway.
parent 60a4da31
Hide whitespace changes
Inline Side-by-side
irmaclient/irmaclient_test.go
View file @ 0b89b56f
......@@ -136,9 +136,6 @@ func verifyKeyshareIsUnmarshaled(t *testing.T, client *Client) {
func verifyConfigurationIsLoaded(t *testing.T, conf *irma.Configuration, android bool) {
require.Contains(t, conf.SchemeManagers, irma.NewSchemeManagerIdentifier("irma-demo"))
require.Contains(t, conf.SchemeManagers, irma.NewSchemeManagerIdentifier("test"))
if android {
require.Contains(t, conf.SchemeManagers, irma.NewSchemeManagerIdentifier("test2"))
}
pk, err := conf.PublicKey(irma.NewIssuerIdentifier("irma-demo.RU"), 0)
require.NoError(t, err)
......
irmaclient/updates.go
View file @ 0b89b56f
......@@ -52,7 +52,7 @@ func (client *Client) update() error {
if err != nil {
str := err.Error()
u.Error = &str
}
} // TODO: err is only stored but not passed on!
client.updates = append(client.updates, u)
}
......@@ -166,10 +166,5 @@ func (client *Client) ParseAndroidStorage() (present bool, err error) {
if client.paillierKeyCache == nil {
client.paillierKey(false) // trigger calculating a new one
}
if err = client.Configuration.Copy(client.androidStoragePath+"/app_store/irma_configuration", false); err != nil {
return
}
// Copy from assets again to ensure we have the latest versions
return present, client.Configuration.Copy(client.irmaConfigurationPath, true)
return
}
testdata/oldstorage/app_store/irma_configuration/test/description.xml deleted 100644 → 0
View file @ 60a4da31
<InvalidSchemeManager>
An invalid scheme manager. This should raise no error, since it should
never be parsed, since it should be overwritten by the corresponding file
testdata/irma_configuration/test/description.xml from the 'assets' folder.
</InvalidSchemeManager>
\ No newline at end of file
testdata/oldstorage/app_store/irma_configuration/test2/description.xml deleted 100644 → 0
View file @ 60a4da31
<SchemeManager version="7">
<Id>test2</Id>
<Url>https://privacybydesign.foundation</Url>
<Name>
<en>Test Scheme Manager</en>
<nl>Test scheme manager</nl>
</Name>
<Description>
<en>A test scheme manager with a scheme manager.</en>
<nl>Een test-scheme manager met een keyshare server.</nl>
</Description>
<KeyshareServer></KeyshareServer>
<KeyshareWebsite></KeyshareWebsite>
<KeyshareAttribute></KeyshareAttribute>
<Contact>https://privacybydesign.foundation/</Contact>
</SchemeManager>
testdata/oldstorage/app_store/irma_configuration/test2/test/Issues/mijnirma/description.xml deleted 100644 → 0
View file @ 60a4da31
<IssueSpecification version="4">
<Name>
<en>MyIRMA login</en>
<nl>MijnIRMA login</nl>
</Name>
<ShortName>
<en>MyIRMA</en>
<nl>MijnIRMA</nl>
</ShortName>
<SchemeManager>test2</SchemeManager>
<IssuerID>test</IssuerID>
<CredentialID>mijnirma</CredentialID>
<Description>
<en>Your MyIRMA login credential</en>
<nl>Uw MijnIRMA login credential</nl>
</Description>
<ShouldBeSingleton>true</ShouldBeSingleton>
<Attributes>
<Attribute id="email">
<Name>
<en>Email address</en>
<nl>E-mailadres</nl>
</Name>
<Description>
<en>Your verified email address</en>
<nl>Uw geverifiëerde e-mailadres</nl>
</Description>
</Attribute>
</Attributes>
</IssueSpecification>
testdata/oldstorage/app_store/irma_configuration/test2/test/PrivateKeys/0.xml deleted 100644 → 0
View file @ 60a4da31
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<IssuerPrivateKey xmlns="http://www.zurich.ibm.com/security/idemix" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.zurich.ibm.com/security/idemix IssuerPrivateKey.xsd">
<Counter>0</Counter>
<ExpiryDate>1491436800</ExpiryDate>
<References>
<IssuerPublicKey>http://www.irmacard.org/credentials/phase1/MijnOverheid/ipk.xml</IssuerPublicKey>
</References>
<Elements>
<n>96063359353814070257464989369098573470645843347358957127875426328487326540633303185702306359400766259130239226832166456957259123554826741975265634464478609571816663003684533868318795865194004795637221226902067194633407757767792795252414073029114153019362701793292862118990912516058858923030408920700061749321</n>
<p>10436034022637868273483137633548989700482895839559909621411910579140541345632481969613724849214412062500244238926015929148144084368427474551770487566048119</p>
<pPrime>5218017011318934136741568816774494850241447919779954810705955289570270672816240984806862424607206031250122119463007964574072042184213737275885243783024059</pPrime>
<q>9204968012315139729618449685392284928468933831570080795536662422367142181432679739143882888540883909887054345986640656981843559062844656131133512640733759</q>
<qPrime>4602484006157569864809224842696142464234466915785040397768331211183571090716339869571941444270441954943527172993320328490921779531422328065566756320366879</qPrime>
</Elements>
</IssuerPrivateKey>
testdata/oldstorage/app_store/irma_configuration/test2/test/PublicKeys/0.xml deleted 100644 → 0
View file @ 60a4da31
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<IssuerPublicKey xmlns="http://www.zurich.ibm.com/security/idemix" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.zurich.ibm.com/security/idemix IssuerPublicKey.xsd">
<Counter>0</Counter>
<ExpiryDate>1491436800</ExpiryDate>
<References>
<GroupParameters>http://www.irmacard.org/credentials/phase1/MijnOverheid/gp.xml</GroupParameters>
</References>
<Elements>
<S>68460510129747727135744503403370273952956360997532594630007762045745171031173231339034881007977792852962667675924510408558639859602742661846943843432940752427075903037429735029814040501385798095836297700111333573975220392538916785564158079116348699773855815825029476864341585033111676283214405517983188761136</S>
<Z>44579327840225837958738167571392618381868336415293109834301264408385784355849790902532728798897199236650711385876328647206143271336410651651791998475869027595051047904885044274040212624547595999947339956165755500019260290516022753290814461070607850420459840370288988976468437318992206695361417725670417150636</Z>
<n>96063359353814070257464989369098573470645843347358957127875426328487326540633303185702306359400766259130239226832166456957259123554826741975265634464478609571816663003684533868318795865194004795637221226902067194633407757767792795252414073029114153019362701793292862118990912516058858923030408920700061749321</n>
<Bases num="6">
<Base_0>75350858539899247205099195870657569095662997908054835686827949842616918065279527697469302927032348256512990413925385972530386004430200361722733856287145745926519366823425418198189091190950415327471076288381822950611094023093577973125683837586451857056904547886289627214081538422503416179373023552964235386251</Base_0>
<Base_1>16493273636283143082718769278943934592373185321248797185217530224336539646051357956879850630049668377952487166494198481474513387080523771033539152347804895674103957881435528189990601782516572803731501616717599698546778915053348741763191226960285553875185038507959763576845070849066881303186850782357485430766</Base_1>
<Base_2>13291821743359694134120958420057403279203178581231329375341327975072292378295782785938004910295078955941500173834360776477803543971319031484244018438746973179992753654070994560440903251579649890648424366061116003693414594252721504213975050604848134539324290387019471337306533127861703270017452296444985692840</Base_2>
<Base_3>86332479314886130384736453625287798589955409703988059270766965934046079318379171635950761546707334446554224830120982622431968575935564538920183267389540869023066259053290969633312602549379541830869908306681500988364676409365226731817777230916908909465129739617379202974851959354453994729819170838277127986187</Base_3>
<Base_4>68324072803453545276056785581824677993048307928855083683600441649711633245772441948750253858697288489650767258385115035336890900077233825843691912005645623751469455288422721175655533702255940160761555155932357171848703103682096382578327888079229101354304202688749783292577993444026613580092677609916964914513</Base_4>
<Base_5>65082646756773276491139955747051924146096222587013375084161255582716233287172212541454173762000144048198663356249316446342046266181487801411025319914616581971563024493732489885161913779988624732795125008562587549337253757085766106881836850538709151996387829026336509064994632876911986826959512297657067426387</Base_5>
</Bases>
</Elements>
<Features>
<Epoch length="432000"/>
</Features>
</IssuerPublicKey>
testdata/oldstorage/app_store/irma_configuration/test2/test/description.xml deleted 100644 → 0
View file @ 60a4da31
<Issuer version="4">
<ID>test</ID>
<ShortName>
<en>PbD.f</en>
<nl>PbD.f</nl>
</ShortName>
<Name>
<en>Privacy by Design Foundation</en>
<nl>Stichting Privacy by Design</nl>
</Name>
<SchemeManager>test2</SchemeManager>
<ContactAddress></ContactAddress>
<ContactEMail>info@privacybydesign.foundation</ContactEMail>
<baseURL></baseURL>
</Issuer>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment