Change 'time:' to 'timestamp:' in TC

(not sure where I got 'time:' from, minisign uses 'timestamp:')

21 files changed, 54 insertions, 63 deletions

diff --git a/test_data/dummy/generate.sh b/test_data/dummy/generate.sh
index 38bbc89..2bed447 100755
--- a/test_data/dummy/generate.sh
+++ b/test_data/dummy/generate.sh
@@ -17,13 +17,13 @@ rm -f *.minisig *.blake2b
 #wait
 
 # Try to create pure signature with default Minisign (works with version < 0.10)
-echo | minisign -Sm server_list.json -x server_list.json.pure.minisig -t $'time:10\tfile:server_list.json' -s secret.key
+echo | minisign -Sm server_list.json -x server_list.json.pure.minisig -t $'timestamp:10\tfile:server_list.json' -s secret.key
 # Check if it is actually a prehashed signature
 if echo | minisign -VHm server_list.json -x server_list.json.pure.minisig -p public.key
 then
 	echo "minisign version is >0.9, trying minisign-0.9"
 	# If it is, try to sign with some minisign-0.9 program
-	if ! echo | minisign-0.9 -Sm server_list.json -x server_list.json.pure.minisig -t $'time:10\tfile:server_list.json' -s secret.key
+	if ! echo | minisign-0.9 -Sm server_list.json -x server_list.json.pure.minisig -t $'timestamp:10\tfile:server_list.json' -s secret.key
 	then
 		>&2 echo -e "\n\nTo produce a non-prehashed signature we need Minisign 0.9\n\n"
 	fi
@@ -31,29 +31,28 @@ fi
 
 # Rest works with Minisign 0.9 and 0.10 (and up, probably)
 
-echo | minisign -SHm server_list.json -t $'time:10\tfile:server_list.json\thashed' -s secret.key &
-echo | minisign -SHm server_list.json -x server_list.json.tc_timestamp.minisig -t $'timestamp:10\tfile:server_list.json\thashed' -s secret.key &
-echo | minisign -SHm server_list.json -x server_list.json.tc_nohashed.minisig -t $'time:10\tfile:server_list.json' -s secret.key &
-echo | minisign -SHm server_list.json -x server_list.json.tc_latertime.minisig -t $'time:20\tfile:server_list.json\t hashed' -s secret.key &
+echo | minisign -SHm server_list.json -t $'timestamp:10\tfile:server_list.json\thashed' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.tc_nohashed.minisig -t $'timestamp:10\tfile:server_list.json' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.tc_latertime.minisig -t $'timestamp:20\tfile:server_list.json\t hashed' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.tc_orglist.minisig -t $'timestamp:10\tfile:organization_list.json\thashed' -s secret.key &
 wait
-echo | minisign -SHm server_list.json -x server_list.json.tc_orglist.minisig -t $'time:10\tfile:organization_list.json\thashed' -s secret.key &
-echo | minisign -SHm server_list.json -x server_list.json.tc_otherfile.minisig -t $'time:10\tfile:otherfile\thashed' -s secret.key &
-echo | minisign -SHm server_list.json -x server_list.json.tc_nofile.minisig -t $'time:10\thashed' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.tc_otherfile.minisig -t $'timestamp:10\tfile:otherfile\thashed' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.tc_nofile.minisig -t $'timestamp:10\thashed' -s secret.key &
 echo | minisign -SHm server_list.json -x server_list.json.tc_notime.minisig -t $'file:server_list.json\thashed' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.tc_emptytime.minisig -t $'timestamp:\tfile:server_list.json\thashed' -s secret.key &
 wait
-echo | minisign -SHm server_list.json -x server_list.json.tc_emptytime.minisig -t $'time:\tfile:server_list.json\thashed' -s secret.key &
-echo | minisign -SHm server_list.json -x server_list.json.tc_emptyfile.minisig -t $'time:10\tfile:\thashed' -s secret.key &
-echo | minisign -SHm server_list.json -x server_list.json.tc_earliertime.minisig -t $'time:9\tfile:server_list.json\thashed' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.tc_emptyfile.minisig -t $'timestamp:10\tfile:\thashed' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.tc_earliertime.minisig -t $'timestamp:9\tfile:server_list.json\thashed' -s secret.key &
 echo | minisign -SHm server_list.json -x server_list.json.tc_random.minisig -t 'random stuff' -s secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.large_time.minisig -t $'timestamp:4300000000\tfile:server_list.json' -s secret.key &
 wait
-echo | minisign -SHm server_list.json -x server_list.json.large_time.minisig -t $'time:4300000000\tfile:server_list.json' -s secret.key &
 
-echo | minisign -SHm organization_list.json -t $'time:10\tfile:organization_list.json\thashed' -s secret.key &
-echo | minisign -SHm organization_list.json -x organization_list.json.tc_servlist.minisig -t $'time:10\tfile:server_list.json\thashed' -s secret.key &
+echo | minisign -SHm organization_list.json -t $'timestamp:10\tfile:organization_list.json\thashed' -s secret.key &
+echo | minisign -SHm organization_list.json -x organization_list.json.tc_servlist.minisig -t $'timestamp:10\tfile:server_list.json\thashed' -s secret.key &
 
-echo | minisign -SHm other_list.json -t $'time:10\tfile:other_list.json\thashed' -s secret.key &
+echo | minisign -SHm other_list.json -t $'timestamp:10\tfile:other_list.json\thashed' -s secret.key &
 
-echo | minisign -SHm server_list.json -x server_list.json.wrong_key.minisig -t $'time:10\tfile:server_list.json\thashed' -s wrong_secret.key &
+echo | minisign -SHm server_list.json -x server_list.json.wrong_key.minisig -t $'timestamp:10\tfile:server_list.json\thashed' -s wrong_secret.key &
 wait
 
 ./generate_forged.py
diff --git a/test_data/dummy/organization_list.json.minisig b/test_data/dummy/organization_list.json.minisig
index c345db3..1fa546e 100644
--- a/test_data/dummy/organization_list.json.minisig
+++ b/test_data/dummy/organization_list.json.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH31cHjNvTEh+TCqDVCwUgFVZoRdgWYAaQDxH3L3UIsRi9Qb1O4vLI4V1CYPatKzXZnSodSJM/AZgl9v7l/5bfPQ0=
-trusted comment: time:10	file:organization_list.json	hashed
-8cINvI8MEdXjPHadX7Qk/8sTMyCjSZMR999a074xlSTwsmtMpsBi9blyeIKFaBL7SjA3w9IUTZucLeFi11MXBw==
+trusted comment: timestamp:10	file:organization_list.json	hashed
+21zZv1DviMpLCdv1NgzLBl6d+F1ZllSNyjAquYxhTHGcs2F64bDFpqY0I0xjCHIoXly6HKqJKIBXNgud12ijCQ==
diff --git a/test_data/dummy/organization_list.json.tc_servlist.minisig b/test_data/dummy/organization_list.json.tc_servlist.minisig
index 44e362b..a7fe41f 100644
--- a/test_data/dummy/organization_list.json.tc_servlist.minisig
+++ b/test_data/dummy/organization_list.json.tc_servlist.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH31cHjNvTEh+TCqDVCwUgFVZoRdgWYAaQDxH3L3UIsRi9Qb1O4vLI4V1CYPatKzXZnSodSJM/AZgl9v7l/5bfPQ0=
-trusted comment: time:10	file:server_list.json	hashed
-ujh/YTcmyY6Sy15I7qCXJA5sGmH0D2L50CwztFQk+cpQhsaQIu7rNapzx2xsQU0VBG/QVrwpZMqe47PofvVQBQ==
+trusted comment: timestamp:10	file:server_list.json	hashed
+R6hjM/oMS5LAvpYM4F6E7iUpnlPxqiY0QfuOnpum31CW0sUy/Ypy2PiomSwvZXKVR7keEZS/+lZjyra9TkrLDQ==
diff --git a/test_data/dummy/other_list.json.minisig b/test_data/dummy/other_list.json.minisig
index 9064f96..eaa2248 100644
--- a/test_data/dummy/other_list.json.minisig
+++ b/test_data/dummy/other_list.json.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH366C1RnYeUAgEeX/S5A1Z9qmkV2+GJaVj06FWGd4aMLc+HS7iFMhG69u3TVD4YmzMH12rk7hQrnyCC6ex8ypIQA=
-trusted comment: time:10	file:other_list.json	hashed
-ZRufdNNEvGrB6W35I7+w2o/YF1wjg3i3UdVlnp79L3g5SS+jNRVOZUGdZg8B7pHfb5LmfCgoeDSOK0nflDNmBw==
+trusted comment: timestamp:10	file:other_list.json	hashed
+26+608n+bjQF9lwNdXbIK6t5bP8dzhjNQ9hACeYJLiB2tr437Aec2GkmJh0jSiRv1QV4RYBcKJeHQBUcV2grCQ==
diff --git a/test_data/dummy/server_list.json.forged_keyid.minisig b/test_data/dummy/server_list.json.forged_keyid.minisig
index 7516453..efa349d 100644
--- a/test_data/dummy/server_list.json.forged_keyid.minisig
+++ b/test_data/dummy/server_list.json.forged_keyid.minisig
@@ -1,4 +1,4 @@
 untrusted comment: this signature was created with wrong_secret.key but has key ID changed to that of public.key
 RURMm6vfaPgH35aarz3NMq4gbv6JvzOnjG003bDe6USu+HT/JzuxHjQcQGE/KBPdyCF6BDDwwFu+NVmi5jotYCJHWOEqSBU70gE=
-trusted comment: time:10	file:server_list.json	hashed
-tKsH1t7JeYjOkVfWmpCaaZUJtCDa0WSuRFVYERkF5cMtVQqEZqC7dKYLssrqUtzCi7RLld9dGlkzCaV17jKhBg==
+trusted comment: timestamp:10	file:server_list.json	hashed
+3BWYJamM3t6ImuXQufTeO81UMZNyM7TujMu7SCmR+oapsSEBpmkazGOgzlJYR53HP9K9zrEA+4lV8gFFngooBA==
diff --git a/test_data/dummy/server_list.json.forged_pure.minisig b/test_data/dummy/server_list.json.forged_pure.minisig
index d8a2fe7..a362504 100644
--- a/test_data/dummy/server_list.json.forged_pure.minisig
+++ b/test_data/dummy/server_list.json.forged_pure.minisig
@@ -1,4 +1,4 @@
 untrusted comment: this signature has ED changed to Ed
 RWRMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:10	file:server_list.json	hashed
-NU05nB8NlklbSac5agwbfwjKYRMrK2g9vSwBSAIPXgiwQSvKvSduFG10ZksMzaJIxDENCbF7ADEzTU9SjbSXCw==
+trusted comment: timestamp:10	file:server_list.json	hashed
+oK41aX7rmpbO2ohF3v3+JGgSexQaVlfWvYPzaKEkDlJm8mVZtuK/h26SCRuL6PbTR92DLZU59rw8ckICUH/ADw==
diff --git a/test_data/dummy/server_list.json.large_time.minisig b/test_data/dummy/server_list.json.large_time.minisig
index 3392415..79a2a52 100644
--- a/test_data/dummy/server_list.json.large_time.minisig
+++ b/test_data/dummy/server_list.json.large_time.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:4300000000	file:server_list.json
-TtTWB1mfCPIchyH5IrdVJqSFWT4uFCZjODzuHiEpMd2i5xNNTjXRK9ZlUnLmjO292Re2WUcwH3hplahHCF8lAA==
+trusted comment: timestamp:4300000000	file:server_list.json
+L9C58LIq7bTLf4otqW4Eb+ASL0+FM7nRRjstCBuCPtuUerFIsOqNUpDp2AQJJ4pZJKE7SkgIq2tV8/IaVpzxBQ==
diff --git a/test_data/dummy/server_list.json.minisig b/test_data/dummy/server_list.json.minisig
index d4b7447..143585b 100644
--- a/test_data/dummy/server_list.json.minisig
+++ b/test_data/dummy/server_list.json.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:10	file:server_list.json	hashed
-NU05nB8NlklbSac5agwbfwjKYRMrK2g9vSwBSAIPXgiwQSvKvSduFG10ZksMzaJIxDENCbF7ADEzTU9SjbSXCw==
+trusted comment: timestamp:10	file:server_list.json	hashed
+oK41aX7rmpbO2ohF3v3+JGgSexQaVlfWvYPzaKEkDlJm8mVZtuK/h26SCRuL6PbTR92DLZU59rw8ckICUH/ADw==
diff --git a/test_data/dummy/server_list.json.pure.minisig b/test_data/dummy/server_list.json.pure.minisig
index e52b959..57dccfc 100644
--- a/test_data/dummy/server_list.json.pure.minisig
+++ b/test_data/dummy/server_list.json.pure.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RWRMm6vfaPgH3zQ/rcq2GMsNz1SYySz+olupm0I+nzNpOkPyUHTBwig3Pep4biOk/bH73bH+0sLNoZPcDk1f2Acn8JINc9MWMw4=
-trusted comment: time:10	file:server_list.json
-e8ylfwod0cRHyydeqPMhZwGCO6zItvSFaU3OgDFbop1wDgFc6keO4EV29psMv4QV6Zt+rD8UEWVJAxp76kmhAA==
+trusted comment: timestamp:10	file:server_list.json
+FZ0eA96SlADsMrSOUgStQJpmUnBGpPbRvNI/oaYhKrylu6jUcXOgsRu6571mmDxYdlruSuUSlQbdmG81Qbl4AA==
diff --git a/test_data/dummy/server_list.json.tc_earliertime.minisig b/test_data/dummy/server_list.json.tc_earliertime.minisig
index dd5ace6..03da710 100644
--- a/test_data/dummy/server_list.json.tc_earliertime.minisig
+++ b/test_data/dummy/server_list.json.tc_earliertime.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:9	file:server_list.json	hashed
-i30ktGatqQIOf0Q9w39OVpUNihHRxKC4WSJyZ/SLeS8yCQgPxaJhmq/hW0/bOT27yrqUCAta3gNgUHWxv/76CA==
+trusted comment: timestamp:9	file:server_list.json	hashed
+vw3wjLDNZWoV98/GnFv38REiaeh+wUPEZgmBUvY35CEq00jDdHiJcYRV/7zBoKv+n9TAYxZ8WKUOGWNOPonTBg==
diff --git a/test_data/dummy/server_list.json.tc_emptyfile.minisig b/test_data/dummy/server_list.json.tc_emptyfile.minisig
index e9d56ef..a7aa3ed 100644
--- a/test_data/dummy/server_list.json.tc_emptyfile.minisig
+++ b/test_data/dummy/server_list.json.tc_emptyfile.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:10	file:	hashed
-yeuMUAEVlZfbcQKhOvNMBDdOLyRd5PfO38q3NZZA8dkYTYs5o9Y3UsOkVvIByZqEeYdMErm022VzmZINyYBfDQ==
+trusted comment: timestamp:10	file:	hashed
+g4drZ91TcYXNLnIGbeH5ZIFzrs2wWB9JTXjV3Jwg9ehSC2D8lCTqw3u2Rg+PvLPRvYmXTHyuJoKNWelsSh64CA==
diff --git a/test_data/dummy/server_list.json.tc_emptytime.minisig b/test_data/dummy/server_list.json.tc_emptytime.minisig
index 7bce05a..d3ef01e 100644
--- a/test_data/dummy/server_list.json.tc_emptytime.minisig
+++ b/test_data/dummy/server_list.json.tc_emptytime.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:	file:server_list.json	hashed
-ufDlzH1c6IwWN07Ieb475NHSLVxN7dnsUq7LHYwW1rfJ1EUUzxl2xWN6p+y4R+vgDuClZpcCiI74mXGgfIBsDA==
+trusted comment: timestamp:	file:server_list.json	hashed
+lw5rnZsPi+TkZ4lOCy7bjsUgTXxG+jaGOGdHuNL95FSD2mmP9ZzEJPrJ2jnH7iYfkF3zDm0QvEUDxhEirlHBDA==
diff --git a/test_data/dummy/server_list.json.tc_latertime.minisig b/test_data/dummy/server_list.json.tc_latertime.minisig
index ba8502c..8237123 100644
--- a/test_data/dummy/server_list.json.tc_latertime.minisig
+++ b/test_data/dummy/server_list.json.tc_latertime.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:20	file:server_list.json	 hashed
-vCc6yqClkju2KcbExajjLH0YDK8U5k7v45jDS6yB7GhyA+6OrI6fMVfQqFlC4TDuUMBRqF8p7wIy5sAlkMKsBw==
+trusted comment: timestamp:20	file:server_list.json	 hashed
+rHcsHF2mmcZvDLreeuljVauuFULWiY8luCsxyBxxobcJkCedEDW3/RX5KeT+2NjHSFuQxkmrYOBWTY9+ECuUDQ==
diff --git a/test_data/dummy/server_list.json.tc_nofile.minisig b/test_data/dummy/server_list.json.tc_nofile.minisig
index 447ed9b..3c1dcbe 100644
--- a/test_data/dummy/server_list.json.tc_nofile.minisig
+++ b/test_data/dummy/server_list.json.tc_nofile.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:10	hashed
-2i+2JsAuMwNL3y6ILubgCiLTCub3oPVa2PJDOfiAzg89zGCJjxejHdmHxNxEAxte/2Ki8bYjuhMw5hx9Xr+jCw==
+trusted comment: timestamp:10	hashed
+NonaTZH7RDbsHXv85M7sL43YE7CTzs5qDRRoFYjajeqzHa+hdIuMGyemK85rAJ3prLGnMdWHkZhD4hsr3cZoDA==
diff --git a/test_data/dummy/server_list.json.tc_nohashed.minisig b/test_data/dummy/server_list.json.tc_nohashed.minisig
index 8d6d015..1d140c1 100644
--- a/test_data/dummy/server_list.json.tc_nohashed.minisig
+++ b/test_data/dummy/server_list.json.tc_nohashed.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:10	file:server_list.json
-o6t2i6Nm3F5/zcWhwc+rmFqYlmbJ8bBpQx4CYq4kK0Kl+mU+Gl4DbicxHoq0S001J848pmHHFdjnu6qviqKvCA==
+trusted comment: timestamp:10	file:server_list.json
+HaPGKT+Jqxjyw2Nt1GEKaPIZsAmVl/RI6p1mQ+S1LqzYicVgT5GxPs9NR6khdGGIFvo/xhVkXFceAWTRUCVQAg==
diff --git a/test_data/dummy/server_list.json.tc_orglist.minisig b/test_data/dummy/server_list.json.tc_orglist.minisig
index 20f5a84..7c2a3a8 100644
--- a/test_data/dummy/server_list.json.tc_orglist.minisig
+++ b/test_data/dummy/server_list.json.tc_orglist.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:10	file:organization_list.json	hashed
-WoL798ts/9cZuvFlq02mCgIE/0wJmK2uaPHLCKF+WF8LbbyL1/iOolIV/T5BeIxraeu1xopOF1cXcs0vwZBCDA==
+trusted comment: timestamp:10	file:organization_list.json	hashed
+NreDM4iGEjMWs5sfaJCGZBZ7D9QLqxBKJ/fVW2lvIDr249DSUNR4ZRca8UL73e3c9eTXgHnY/ojsjDtzxDScDw==
diff --git a/test_data/dummy/server_list.json.tc_otherfile.minisig b/test_data/dummy/server_list.json.tc_otherfile.minisig
index 9145d2c..58a29b2 100644
--- a/test_data/dummy/server_list.json.tc_otherfile.minisig
+++ b/test_data/dummy/server_list.json.tc_otherfile.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: time:10	file:otherfile	hashed
-cZmbKG0pnPMBdnOjTrBOCEML+4UhUKJ17SKIsZ9J9aLGzS/N06RL4z+cRuyu8XMZBkPIH+8Elco8zYbwhGN9DQ==
+trusted comment: timestamp:10	file:otherfile	hashed
+PfDEIMlt2aNFyOnqHb45S7xm4fIg0vfUUbqXENPxry9GEZFX14c5BGtgcL/krDg8WFJHcIA5bzYcX58kgBiZCA==
diff --git a/test_data/dummy/server_list.json.tc_timestamp.minisig b/test_data/dummy/server_list.json.tc_timestamp.minisig
deleted file mode 100644
index 143585b..0000000
--- a/test_data/dummy/server_list.json.tc_timestamp.minisig
+++ /dev/null
@@ -1,4 +0,0 @@
-untrusted comment: signature from minisign secret key
-RURMm6vfaPgH3997FX/cHwhXJpcluwbNiznrfYV83WS/Gsd3BeO/g10Mo7Z9N5rMSXcpGrmT2CagiEEm5zSw/MEnTqs4YWICdQs=
-trusted comment: timestamp:10	file:server_list.json	hashed
-oK41aX7rmpbO2ohF3v3+JGgSexQaVlfWvYPzaKEkDlJm8mVZtuK/h26SCRuL6PbTR92DLZU59rw8ckICUH/ADw==
diff --git a/test_data/dummy/server_list.json.wrong_key.minisig b/test_data/dummy/server_list.json.wrong_key.minisig
index 6ce87a8..5a83c0e 100644
--- a/test_data/dummy/server_list.json.wrong_key.minisig
+++ b/test_data/dummy/server_list.json.wrong_key.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
 RUTQvDHvQuYCCJaarz3NMq4gbv6JvzOnjG003bDe6USu+HT/JzuxHjQcQGE/KBPdyCF6BDDwwFu+NVmi5jotYCJHWOEqSBU70gE=
-trusted comment: time:10	file:server_list.json	hashed
-tKsH1t7JeYjOkVfWmpCaaZUJtCDa0WSuRFVYERkF5cMtVQqEZqC7dKYLssrqUtzCi7RLld9dGlkzCaV17jKhBg==
+trusted comment: timestamp:10	file:server_list.json	hashed
+3BWYJamM3t6ImuXQufTeO81UMZNyM7TujMu7SCmR+oapsSEBpmkazGOgzlJYR53HP9K9zrEA+4lV8gFFngooBA==
diff --git a/verify.go b/verify.go
index a61731a..89a3d74 100644
--- a/verify.go
+++ b/verify.go
@@ -31,7 +31,7 @@ func Verify(signatureFileContent string, signedJson []byte, expectedFileName str
 // Verification is performed using a matching key in allowedPublicKeys.
 // The signature is checked to be a Blake2b-prehashed Ed25519 Minisign signature with a valid trusted comment.
 // The file type that is verified is indicated by expectedFileName, which must be one of server_list.json/organization_list.json.
-// The trusted comment is checked to be of the form "time<(stamp)>:<timestamp>\tfile:<expectedFileName>", optionally suffixed by something, e.g. "\thashed".
+// The trusted comment is checked to be of the form "timestamp:<timestamp>\tfile:<expectedFileName>", optionally suffixed by something, e.g. "\thashed".
 // The signature is checked to have a timestamp with a value of at least minSignTime, which is a UNIX timestamp without milliseconds;
 //
 // The return value will either be (true, nil) on success or (false, err) on failure.
@@ -71,13 +71,10 @@ func verifyWithKeys(signatureFileContent string, signedJson []byte, expectedFile
 		var signTime uint64
 		var sigFileName string
 		// sigFileName cannot have spaces
-		_, err = fmt.Sscanf(sig.TrustedComment, "trusted comment: time:%d\tfile:%s", &signTime, &sigFileName)
+		_, err = fmt.Sscanf(sig.TrustedComment, "trusted comment: timestamp:%d\tfile:%s", &signTime, &sigFileName)
 		if err != nil {
-			_, err = fmt.Sscanf(sig.TrustedComment, "trusted comment: timestamp:%d\tfile:%s", &signTime, &sigFileName)
-			if err != nil {
-				return false, VerifyError{ErrInvalidTrustedComment,
-					fmt.Sprintf("failed to interpret trusted comment (%q)", sig.TrustedComment), err}
-			}
+			return false, VerifyError{ErrInvalidTrustedComment,
+				fmt.Sprintf("failed to interpret trusted comment (%q)", sig.TrustedComment), err}
 		}
 
 		if sigFileName != expectedFileName {
diff --git a/verify_test.go b/verify_test.go
index 7547e29..3068c96 100644
--- a/verify_test.go
+++ b/verify_test.go
@@ -74,7 +74,6 @@ func Test_verifyWithKeys(t *testing.T) {
 		{ErrInvalidSignatureAlgorithm, "pure", "server_list.json.pure.minisig", "server_list.json", "server_list.json", 10, pk},
 
 		{ok, "valid server_list", "server_list.json.minisig", "server_list.json", "server_list.json", 10, pk},
-		{ok, "TC timestamp:", "server_list.json.tc_timestamp.minisig", "server_list.json", "server_list.json", 10, pk},
 		{ok, "TC no hashed", "server_list.json.tc_nohashed.minisig", "server_list.json", "server_list.json", 10, pk},
 		{ok, "TC later time", "server_list.json.tc_latertime.minisig", "server_list.json", "server_list.json", 10, pk},
 		{ErrWrongFileName, "server_list TC file:organization_list", "server_list.json.tc_orglist.minisig", "server_list.json", "server_list.json", 10, pk},