Skip to content

Commit 82f1929

Browse files
toby-jntoby-jn
authored
fix: Fix JSON canonicalisation (#247)
* fix JSON canonicalisation (see #246)
1 parent 5b81b7e commit 82f1929

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1148
-1143
lines changed

‎client/testdata/go-tuf/consistent-snapshot-false/0/repository/1.root.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,53 @@
11
{
2-
"signatures": [
3-
{
4-
"keyid": "ce72db3f938914205461a415c9b7b91267a2079df991fd6283aa8461988c1add",
5-
"sig": "afab8b34f93c99e200505cc6f0d6a9c4e757a7229f96bd31ab618f8bc4c3abe491b372bfec9d231136de46c1e183df194d372360ee9d32652f8c04d7574e2608"
6-
}
7-
],
82
"signed": {
93
"_type": "root",
10-
"consistent_snapshot": false,
4+
"spec_version": "1.0",
5+
"version": 1,
116
"expires": "2100-01-01T00:00:00Z",
127
"keys": {
138
"289e5a9e71afd7909326aa4caea92f7557ee0e2283d8c31f0c3401ce67248a45": {
9+
"keytype": "ed25519",
10+
"scheme": "ed25519",
1411
"keyid_hash_algorithms": [
1512
"sha256",
1613
"sha512"
1714
],
18-
"keytype": "ed25519",
1915
"keyval": {
2016
"public": "d482fa4805a50870aa1356ace6b764f7ab47ed4dc38f49b1a189afa25f179e94"
21-
},
22-
"scheme": "ed25519"
17+
}
2318
},
2419
"808aa256a8172bb0cb961767c6768e55ccf732c99afccc6145752d7a328b7937": {
20+
"keytype": "ed25519",
21+
"scheme": "ed25519",
2522
"keyid_hash_algorithms": [
2623
"sha256",
2724
"sha512"
2825
],
29-
"keytype": "ed25519",
3026
"keyval": {
3127
"public": "62f71f99c788f16bcdc8bb252455e3a690350e4ddea5a6aab1f9a3aaabcf369a"
32-
},
33-
"scheme": "ed25519"
28+
}
3429
},
3530
"aa3255b4e8e17e566d2bdbea0e5842978f9fa1d2fa9ec76ae76b146164acbfc8": {
31+
"keytype": "ed25519",
32+
"scheme": "ed25519",
3633
"keyid_hash_algorithms": [
3734
"sha256",
3835
"sha512"
3936
],
40-
"keytype": "ed25519",
4137
"keyval": {
4238
"public": "8656ad20568cd3534c405e4d9a84b0c6e6163f7f66434df77416502835b9b160"
43-
},
44-
"scheme": "ed25519"
39+
}
4540
},
4641
"ce72db3f938914205461a415c9b7b91267a2079df991fd6283aa8461988c1add": {
42+
"keytype": "ed25519",
43+
"scheme": "ed25519",
4744
"keyid_hash_algorithms": [
4845
"sha256",
4946
"sha512"
5047
],
51-
"keytype": "ed25519",
5248
"keyval": {
5349
"public": "bca152214dbfd3e7a1b7a7b3e2cc179fb00520fd7212c8a60ba99f14dfc0e1ca"
54-
},
55-
"scheme": "ed25519"
50+
}
5651
}
5752
},
5853
"roles": {
@@ -81,7 +76,12 @@
8176
"threshold": 1
8277
}
8378
},
84-
"spec_version": "1.0",
85-
"version": 1
86-
}
79+
"consistent_snapshot": false
80+
},
81+
"signatures": [
82+
{
83+
"keyid": "ce72db3f938914205461a415c9b7b91267a2079df991fd6283aa8461988c1add",
84+
"sig": "afab8b34f93c99e200505cc6f0d6a9c4e757a7229f96bd31ab618f8bc4c3abe491b372bfec9d231136de46c1e183df194d372360ee9d32652f8c04d7574e2608"
85+
}
86+
]
8787
}

‎client/testdata/go-tuf/consistent-snapshot-false/0/repository/root.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,53 @@
11
{
2-
"signatures": [
3-
{
4-
"keyid": "ce72db3f938914205461a415c9b7b91267a2079df991fd6283aa8461988c1add",
5-
"sig": "afab8b34f93c99e200505cc6f0d6a9c4e757a7229f96bd31ab618f8bc4c3abe491b372bfec9d231136de46c1e183df194d372360ee9d32652f8c04d7574e2608"
6-
}
7-
],
82
"signed": {
93
"_type": "root",
10-
"consistent_snapshot": false,
4+
"spec_version": "1.0",
5+
"version": 1,
116
"expires": "2100-01-01T00:00:00Z",
127
"keys": {
138
"289e5a9e71afd7909326aa4caea92f7557ee0e2283d8c31f0c3401ce67248a45": {
9+
"keytype": "ed25519",
10+
"scheme": "ed25519",
1411
"keyid_hash_algorithms": [
1512
"sha256",
1613
"sha512"
1714
],
18-
"keytype": "ed25519",
1915
"keyval": {
2016
"public": "d482fa4805a50870aa1356ace6b764f7ab47ed4dc38f49b1a189afa25f179e94"
21-
},
22-
"scheme": "ed25519"
17+
}
2318
},
2419
"808aa256a8172bb0cb961767c6768e55ccf732c99afccc6145752d7a328b7937": {
20+
"keytype": "ed25519",
21+
"scheme": "ed25519",
2522
"keyid_hash_algorithms": [
2623
"sha256",
2724
"sha512"
2825
],
29-
"keytype": "ed25519",
3026
"keyval": {
3127
"public": "62f71f99c788f16bcdc8bb252455e3a690350e4ddea5a6aab1f9a3aaabcf369a"
32-
},
33-
"scheme": "ed25519"
28+
}
3429
},
3530
"aa3255b4e8e17e566d2bdbea0e5842978f9fa1d2fa9ec76ae76b146164acbfc8": {
31+
"keytype": "ed25519",
32+
"scheme": "ed25519",
3633
"keyid_hash_algorithms": [
3734
"sha256",
3835
"sha512"
3936
],
40-
"keytype": "ed25519",
4137
"keyval": {
4238
"public": "8656ad20568cd3534c405e4d9a84b0c6e6163f7f66434df77416502835b9b160"
43-
},
44-
"scheme": "ed25519"
39+
}
4540
},
4641
"ce72db3f938914205461a415c9b7b91267a2079df991fd6283aa8461988c1add": {
42+
"keytype": "ed25519",
43+
"scheme": "ed25519",
4744
"keyid_hash_algorithms": [
4845
"sha256",
4946
"sha512"
5047
],
51-
"keytype": "ed25519",
5248
"keyval": {
5349
"public": "bca152214dbfd3e7a1b7a7b3e2cc179fb00520fd7212c8a60ba99f14dfc0e1ca"
54-
},
55-
"scheme": "ed25519"
50+
}
5651
}
5752
},
5853
"roles": {
@@ -81,7 +76,12 @@
8176
"threshold": 1
8277
}
8378
},
84-
"spec_version": "1.0",
85-
"version": 1
86-
}
79+
"consistent_snapshot": false
80+
},
81+
"signatures": [
82+
{
83+
"keyid": "ce72db3f938914205461a415c9b7b91267a2079df991fd6283aa8461988c1add",
84+
"sig": "afab8b34f93c99e200505cc6f0d6a9c4e757a7229f96bd31ab618f8bc4c3abe491b372bfec9d231136de46c1e183df194d372360ee9d32652f8c04d7574e2608"
85+
}
86+
]
8787
}

‎client/testdata/go-tuf/consistent-snapshot-false/0/repository/snapshot.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"signatures": [
3-
{
4-
"keyid": "289e5a9e71afd7909326aa4caea92f7557ee0e2283d8c31f0c3401ce67248a45",
5-
"sig": "3f24a81d61a8f1fbe2bf310a9d8263c7b3a5fc87524b92e00a100ce6d8e0f742c0ef05b017234b0d08c9cf4da4591deb65e6f76340afad722b3db1b25d2e0203"
6-
}
7-
],
82
"signed": {
93
"_type": "snapshot",
4+
"spec_version": "1.0",
5+
"version": 1,
106
"expires": "2100-01-01T00:00:00Z",
117
"meta": {
128
"targets.json": {
9+
"length": 588,
1310
"hashes": {
14-
"sha512": "e0dd9a3833d117cd7bb6fdaae8923d5bda0661cb242be067813bfec3114d83943230b8bb7fcbf093a15d5840f1ecd969f44d3df13e2045d3fb7d22903fbc1bf5"
11+
"sha512": "2532c645262d3a15db2afc561d9ae75db96c3b42abe8bd994c173e45ea70177bc1b080e211d92b6f244d267dcb0a0bc2fbcd1c2b008881c19f950c5e8c0035ec"
1512
},
16-
"length": 588,
1713
"version": 1
1814
}
19-
},
20-
"spec_version": "1.0",
21-
"version": 1
22-
}
15+
}
16+
},
17+
"signatures": [
18+
{
19+
"keyid": "289e5a9e71afd7909326aa4caea92f7557ee0e2283d8c31f0c3401ce67248a45",
20+
"sig": "6efc0efbc7a3b849a58e9cb394af10fe6d199d2ead18e6931932c85f44269d5d73e8f18808d0d9b66fbfd9926b0bda9d2d26a7508a960758c0b84eb8aa31ac0b"
21+
}
22+
]
2323
}

‎client/testdata/go-tuf/consistent-snapshot-false/0/repository/targets.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
2-
"signatures": [
3-
{
4-
"keyid": "808aa256a8172bb0cb961767c6768e55ccf732c99afccc6145752d7a328b7937",
5-
"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
6-
}
7-
],
82
"signed": {
93
"_type": "targets",
10-
"expires": "2100-01-01T00:00:00Z",
114
"spec_version": "1.0",
5+
"version": 1,
6+
"expires": "2100-01-01T00:00:00Z",
127
"targets": {
138
"0": {
9+
"length": 1,
1410
"hashes": {
1511
"sha512": "31bca02094eb78126a517b206a88c73cfa9ec6f704c7030d18212cace820f025f00bf0ea68dbf3f3a5436ca63b53bf7bf80ad8d5de7d8359d0b7fed9dbc3ab99"
16-
},
17-
"length": 1
12+
}
1813
}
19-
},
20-
"version": 1
21-
}
14+
}
15+
},
16+
"signatures": [
17+
{
18+
"keyid": "808aa256a8172bb0cb961767c6768e55ccf732c99afccc6145752d7a328b7937",
19+
"sig": "4d5c3a5da43f3792d077c1128fa28585982ff2957fae59be02a831fc920d0b91cbeaa99fd6c15066ec4da8bf12f993440a90d1624fd7b0a68070e5d60ed2500f"
20+
}
21+
]
2222
}

‎client/testdata/go-tuf/consistent-snapshot-false/0/repository/timestamp.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"signatures": [
3-
{
4-
"keyid": "aa3255b4e8e17e566d2bdbea0e5842978f9fa1d2fa9ec76ae76b146164acbfc8",
5-
"sig": "cc163b290f68c6d41fbc7ca01a30416a43a5ee7652d2f99aff3c6ef01e5c2fa9d5f2caf0e745abeee3baa277ddfe43ac636149963cf085686345addc9e000301"
6-
}
7-
],
82
"signed": {
93
"_type": "timestamp",
4+
"spec_version": "1.0",
5+
"version": 1,
106
"expires": "2100-01-01T00:00:00Z",
117
"meta": {
128
"snapshot.json": {
9+
"length": 617,
1310
"hashes": {
14-
"sha512": "973d23a7e47e1003cd4f8c0e431b080171408e488084fe736b664433d9be76e1f1048ea76607c1f485f1dcb23ce2b4980257431c39cee0fddcc53559997cd565"
11+
"sha512": "6fd318e2cc3bca35d2f597e504c095137263ffe3e72f5e5c64e6c7860bea1207448c8994066ffc1cf20898a9d1586cdf09be4e3ea06f69593ed5c7d772f8dfd1"
1512
},
16-
"length": 617,
1713
"version": 1
1814
}
19-
},
20-
"spec_version": "1.0",
21-
"version": 1
22-
}
15+
}
16+
},
17+
"signatures": [
18+
{
19+
"keyid": "aa3255b4e8e17e566d2bdbea0e5842978f9fa1d2fa9ec76ae76b146164acbfc8",
20+
"sig": "943b219ab6c651793da08d8cf38c7d25fb959c75161b5b86562983841433f9f38c237bb87cf6ecfbb3cb7c78113a3ed2651ee57d3515e7edfc3bebbf349f2809"
21+
}
22+
]
2323
}

‎client/testdata/go-tuf/consistent-snapshot-false/1/repository/2.root.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,53 @@
11
{
2-
"signatures": [
3-
{
4-
"keyid": "b2403f96ae9b1089d8cbc15bbc35e9acbacd7984571f951b43aab56aedcfa84f",
5-
"sig": "20e91b55c995989b270091b714347b15169285cb636ef05d68d49ed7b7a96ebfda13898e0d9ef928c382873b9dba90dca492dbf705d56a4b293adaaed574340f"
6-
},
7-
{
8-
"keyid": "ce72db3f938914205461a415c9b7b91267a2079df991fd6283aa8461988c1add",
9-
"sig": "65f63745aa8bd39132f827c427ea6d87f620ec805d9f376b6a8400dc3db7eb964e5423d31ed08867916d039661a70d6bf255bca552248021a4e78b5d357c2b0f"
10-
}
11-
],
122
"signed": {
133
"_type": "root",
14-
"consistent_snapshot": false,
4+
"spec_version": "1.0",
5+
"version": 2,
156
"expires": "2100-01-01T00:00:00Z",
167
"keys": {
178
"289e5a9e71afd7909326aa4caea92f7557ee0e2283d8c31f0c3401ce67248a45": {
9+
"keytype": "ed25519",
10+
"scheme": "ed25519",
1811
"keyid_hash_algorithms": [
1912
"sha256",
2013
"sha512"
2114
],
22-
"keytype": "ed25519",
2315
"keyval": {
2416
"public": "d482fa4805a50870aa1356ace6b764f7ab47ed4dc38f49b1a189afa25f179e94"
25-
},
26-
"scheme": "ed25519"
17+
}
2718
},
2819
"808aa256a8172bb0cb961767c6768e55ccf732c99afccc6145752d7a328b7937": {
20+
"keytype": "ed25519",
21+
"scheme": "ed25519",
2922
"keyid_hash_algorithms": [
3023
"sha256",
3124
"sha512"
3225
],
33-
"keytype": "ed25519",
3426
"keyval": {
3527
"public": "62f71f99c788f16bcdc8bb252455e3a690350e4ddea5a6aab1f9a3aaabcf369a"
36-
},
37-
"scheme": "ed25519"
28+
}
3829
},
3930
"aa3255b4e8e17e566d2bdbea0e5842978f9fa1d2fa9ec76ae76b146164acbfc8": {
31+
"keytype": "ed25519",
32+
"scheme": "ed25519",
4033
"keyid_hash_algorithms": [
4134
"sha256",
4235
"sha512"
4336
],
44-
"keytype": "ed25519",
4537
"keyval": {
4638
"public": "8656ad20568cd3534c405e4d9a84b0c6e6163f7f66434df77416502835b9b160"
47-
},
48-
"scheme": "ed25519"
39+
}
4940
},
5041
"b2403f96ae9b1089d8cbc15bbc35e9acbacd7984571f951b43aab56aedcfa84f": {
42+
"keytype": "ed25519",
43+
"scheme": "ed25519",
5144
"keyid_hash_algorithms": [
5245
"sha256",
5346
"sha512"
5447
],
55-
"keytype": "ed25519",
5648
"keyval": {
5749
"public": "153986a7370e002f377dd68797e7466c421180c1571e233de2f8ab41c8af4f54"
58-
},
59-
"scheme": "ed25519"
50+
}
6051
}
6152
},
6253
"roles": {
@@ -85,7 +76,16 @@
8576
"threshold": 1
8677
}
8778
},
88-
"spec_version": "1.0",
89-
"version": 2
90-
}
79+
"consistent_snapshot": false
80+
},
81+
"signatures": [
82+
{
83+
"keyid": "b2403f96ae9b1089d8cbc15bbc35e9acbacd7984571f951b43aab56aedcfa84f",
84+
"sig": "20e91b55c995989b270091b714347b15169285cb636ef05d68d49ed7b7a96ebfda13898e0d9ef928c382873b9dba90dca492dbf705d56a4b293adaaed574340f"
85+
},
86+
{
87+
"keyid": "ce72db3f938914205461a415c9b7b91267a2079df991fd6283aa8461988c1add",
88+
"sig": "65f63745aa8bd39132f827c427ea6d87f620ec805d9f376b6a8400dc3db7eb964e5423d31ed08867916d039661a70d6bf255bca552248021a4e78b5d357c2b0f"
89+
}
90+
]
9191
}

0 commit comments

Comments
 (0)