Testdata files updated and code style improvement

testdata/irma_configuration/irma-demo/description.xml

@@ -9,5 +9,6 @@
 		<en>Demo credentials within the IRMA domain</en>
 		<nl>Demo IRMA-credentials</nl>
 	</Description>
+	<TimestampServer>https://metrics.privacybydesign.foundation/atum</TimestampServer>
 	<Contact>https://privacybydesign.foundation/</Contact>
 </SchemeManager>

testdata/irma_configuration/irma-demo/index

@@ -14,5 +14,5 @@ dbd465d9cdb1c64206443e425fb1f8950605aee35e77f1e8bcf6cca8c34b8b65 irma-demo/RU/Pu
 89d44b89802a57d433e3fda6a448dc6af56d1cd0ef73ab653a06997ca202c865 irma-demo/RU/PublicKeys/2.xml
 a4f6cc35cace3e9dc9388b29a8756ea83e5884f799d75cadd4efa60e1a12d855 irma-demo/RU/description.xml
 35697bb7ffb19518a0ac6739ac3eef6b0272cd322c4619b075328b88c06ac43d irma-demo/RU/logo.png
-fb1a7b3ef863e87487ee21541d586e2ff4458afa0b87c81bdd9d97c2cb576d71 irma-demo/description.xml
-708a8bcac4a0cc908ae428bbce75112584879bc231aba992d07d765a4daaf3a8 irma-demo/timestamp
+75f412a2059f7c1d01f18d51486b1c59441306898e9deac2f39ecd3b1083b11f irma-demo/description.xml
+f42406f9640f11fd1d141614dfdce0abe65cdb6dc16fb8b19caf94aa73939f2a irma-demo/timestamp

testdata/irma_configuration/irma-demo/timestamp

-1553605087
+1562146729

testdata/irma_configuration/test/description.xml

@@ -12,5 +12,6 @@
 	<KeyshareServer>http://localhost:8080/irma_keyshare_server/api/v1</KeyshareServer>
 	<KeyshareWebsite>http://localhost:8080/irma_keyshare_server/mijnirma/</KeyshareWebsite>
 	<KeyshareAttribute>test.test.mijnirma.email</KeyshareAttribute>
+	<TimestampServer>https://metrics.privacybydesign.foundation/atum</TimestampServer>
 	<Contact>https://privacybydesign.foundation/</Contact>
 </SchemeManager>

testdata/irma_configuration/test/index

-684bf07929aa5227c65318ee3573e175c56ffe6c8dba817fadcbf3517952493a test/description.xml
+237c195474428dcc82345ab60c21a423f65e12e38215094eef6244e3581e1757 test/description.xml
 64b84af1784434e9cab367a208f8b750fffd8505c76084a296ec5eaaad0c47f2 test/kss-0.pem
 7fa61b0769fc6c356f17d9a25ee721e290729b9ae3eadd961467fee24145bb3c test/test/Issues/email/description.xml
 61a1fc7f161e43f8fc5b0c6ac2997cfe6bc0da7d27009b9914a04dca79ec6718 test/test/Issues/email/logo.png
@@ -10,4 +10,4 @@ db0fdbe65ee9519290b756198a0d10b47c2af417e37843a2e790f5cc0e82d282 test/test/Publi
 8379264daae866fa23858cd1992ce6c436ad806f1def88a4fd67a68886807662 test/test/PublicKeys/3.xml
 adc18a59954caeb907b999ab09b710c652665a0b150e5e4a7aff55199a4908dd test/test/description.xml
 48f04181af6874a2f63f97d0a1a79b95f274da3e4d0efd9e5936b0ec0858b1cc test/test/logo.png
-bbd4d6692f65a977ba130080b593a37c83126be421b3b7b00889111268f2f530 test/timestamp
+b5380e14a042065b6529fc3340719d4dfafa1084219eb77824951ebb589ff007 test/timestamp

testdata/irma_configuration/test/timestamp

-1553605122
+1562146739

testdata/irma_configuration_updated/irma-demo/description.xml

@@ -9,5 +9,6 @@
 		<en>Demo credentials within the IRMA domain</en>
 		<nl>Demo IRMA-credentials</nl>
 	</Description>
+	<TimestampServer>https://metrics.privacybydesign.foundation/atum</TimestampServer>
 	<Contact>https://privacybydesign.foundation/</Contact>
 </SchemeManager>

testdata/irma_configuration_updated/irma-demo/index

@@ -14,5 +14,5 @@ dbd465d9cdb1c64206443e425fb1f8950605aee35e77f1e8bcf6cca8c34b8b65 irma-demo/RU/Pu
 89d44b89802a57d433e3fda6a448dc6af56d1cd0ef73ab653a06997ca202c865 irma-demo/RU/PublicKeys/2.xml
 a4f6cc35cace3e9dc9388b29a8756ea83e5884f799d75cadd4efa60e1a12d855 irma-demo/RU/description.xml
 35697bb7ffb19518a0ac6739ac3eef6b0272cd322c4619b075328b88c06ac43d irma-demo/RU/logo.png
-fb1a7b3ef863e87487ee21541d586e2ff4458afa0b87c81bdd9d97c2cb576d71 irma-demo/description.xml
-5994ed906828992348e558ae2a0c6816539b83823df8620d51d476747b7f4f65 irma-demo/timestamp
+75f412a2059f7c1d01f18d51486b1c59441306898e9deac2f39ecd3b1083b11f irma-demo/description.xml
+56fc5f1ed6e3e86b6063670babfb1ecf782d34ae5ae51d825c046c726f3346ad irma-demo/timestamp

testdata/irma_configuration_updated/irma-demo/timestamp

-1553605496
+1562146802

timestamp.go

@@ -28,9 +28,10 @@ func GetTimestamp(message string, sigs []*big.Int, disclosed [][]*big.Int, conf
 
 // TimestampRequest computes the nonce to be signed by a timestamp server, given a message to be signed
 // in an attribute-based signature session along with the randomized signatures over the attributes
-// and the disclosed attributes.
+// and the disclosed attributes. The url of the timestamp server that should be used to validate the
+// request is returned as the second return value.
 func TimestampRequest(message string, sigs []*big.Int, disclosed [][]*big.Int, new bool, conf *Configuration) (
-	nonceToSign []byte, timestampServerUrl string, err error) {
+	[]byte, string, error) {
 	msgHash := sha256.Sum256([]byte(message))
 
 	// Convert the sigs and disclosed (double) slices to (double) slices of gobig.Int's for asn1
@@ -39,7 +40,7 @@ func TimestampRequest(message string, sigs []*big.Int, disclosed [][]*big.Int, n
 		sigsint[i] = k.Value()
 	}
 
-	timestampServerUrl = ""
+	timestampServerUrl := ""
 	disclosedint := make([][]*gobig.Int, len(disclosed))
 	dlreps := make([]*gobig.Int, len(disclosed))
 	var d interface{} = disclosedint