Skip to content

Commit 1883786

Browse files
ericktlukpueh
authored andcommitted
Fix keyids in the 1.0 spec
It looks like the sample Key IDs in the 1.0 spec were not updated to the TUF 1.0 algorithm. For example: ``` >>> key_meta = { "keytype": "ed25519", "keyval": { "public": "72378e5bc588793e58f81c8533da64a2e8f1565c1fcc7f253496394ffc52542c" } } >>> key_update_data = securesystemslib.formats.encode_canonical(key_meta) >>> digest_object = securesystemslib.hash.digest("sha256") >>> digest_object.update(key_update_data.encode('utf-8')) >>> digest_object.hexdigest() '1a2b4110927d4cba257262f614896179ff85ca1f1353a41b5224ac474ca71cb4' >>> >>> key_meta = { "keytype": "ed25519", "scheme": "ed25519", "keyval": { "public": "72378e5bc588793e58f81c8533da64a2e8f1565c1fcc7f253496394ffc52542c" } } >>> key_update_data = securesystemslib.formats.encode_canonical(key_meta) >>> digest_object = securesystemslib.hash.digest("sha256") >>> digest_object.update(key_update_data.encode('utf-8')) >>> digest_object.hexdigest() '1bf1c6e3cdd3d3a8420b19199e27511999850f4b376c4547b2f32fba7e80fca3' ``` This updates the keys to be calculated with the new algorithm, which includes the `"method"` in the key metadata.
1 parent 6ba6352 commit 1883786

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

tuf-spec.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ repo](https://github.com/theupdateframework/specification/issues).
615615
{
616616
"signatures": [
617617
{
618-
"keyid": "f2d5020d08aea06a0a9192eb6a4f549e17032ebefa1aa9ac167c1e3e727930d6",
618+
"keyid": "cb3fbd83df4ba2471a736b065650878280964a98843ec13b457a99b2a21cc3b4",
619619
"sig": "a312b9c3cb4a1b693e8ebac5ee1ca9cc01f2661c14391917dcb111517f72370809
620620
f32c890c6b801e30158ac4efe0d4d87317223077784c7a378834249d048306"
621621
}
@@ -626,28 +626,28 @@ repo](https://github.com/theupdateframework/specification/issues).
626626
"consistent_snapshot": false,
627627
"expires": "2030-01-01T00:00:00Z",
628628
"keys": {
629-
"1a2b4110927d4cba257262f614896179ff85ca1f1353a41b5224ac474ca71cb4": {
629+
"1bf1c6e3cdd3d3a8420b19199e27511999850f4b376c4547b2f32fba7e80fca3": {
630630
"keytype": "ed25519",
631631
"scheme": "ed25519",
632632
"keyval": {
633633
"public": "72378e5bc588793e58f81c8533da64a2e8f1565c1fcc7f253496394ffc52542c"
634634
}
635635
},
636-
"93ec2c3dec7cc08922179320ccd8c346234bf7f21705268b93e990d5273a2a3b": {
636+
"135c2f50e57ff11e744d234a62cebad8c38daf399604a7655661cc9199c69164": {
637637
"keytype": "ed25519",
638638
"scheme": "ed25519",
639639
"keyval": {
640640
"public": "68ead6e54a43f8f36f9717b10669d1ef0ebb38cee6b05317669341309f1069cb"
641641
}
642642
},
643-
"f2d5020d08aea06a0a9192eb6a4f549e17032ebefa1aa9ac167c1e3e727930d6": {
643+
"cb3fbd83df4ba2471a736b065650878280964a98843ec13b457a99b2a21cc3b4": {
644644
"keytype": "ed25519",
645645
"scheme": "ed25519",
646646
"keyval": {
647647
"public": "66dd78c5c2a78abc6fc6b267ff1a8017ba0e8bfc853dd97af351949bba021275"
648648
}
649649
},
650-
"fce9cf1cc86b0945d6a042f334026f31ed8e4ee1510218f198e8d3f191d15309": {
650+
"66676daa73bdfb4804b56070c8927ae491e2a6c2314f05b854dea94de8ff6bfc": {
651651
"keytype": "ed25519",
652652
"scheme": "ed25519",
653653
"keyval": {
@@ -658,25 +658,25 @@ repo](https://github.com/theupdateframework/specification/issues).
658658
"roles": {
659659
"root": {
660660
"keyids": [
661-
"f2d5020d08aea06a0a9192eb6a4f549e17032ebefa1aa9ac167c1e3e727930d6"
661+
"cb3fbd83df4ba2471a736b065650878280964a98843ec13b457a99b2a21cc3b4"
662662
],
663663
"threshold": 1
664664
},
665665
"snapshot": {
666666
"keyids": [
667-
"fce9cf1cc86b0945d6a042f334026f31ed8e4ee1510218f198e8d3f191d15309"
667+
"66676daa73bdfb4804b56070c8927ae491e2a6c2314f05b854dea94de8ff6bfc"
668668
],
669669
"threshold": 1
670670
},
671671
"targets": {
672672
"keyids": [
673-
"93ec2c3dec7cc08922179320ccd8c346234bf7f21705268b93e990d5273a2a3b"
673+
"135c2f50e57ff11e744d234a62cebad8c38daf399604a7655661cc9199c69164"
674674
],
675675
"threshold": 1
676676
},
677677
"timestamp": {
678678
"keyids": [
679-
"1a2b4110927d4cba257262f614896179ff85ca1f1353a41b5224ac474ca71cb4"
679+
"1bf1c6e3cdd3d3a8420b19199e27511999850f4b376c4547b2f32fba7e80fca3"
680680
],
681681
"threshold": 1
682682
}
@@ -719,7 +719,7 @@ repo](https://github.com/theupdateframework/specification/issues).
719719
{
720720
"signatures": [
721721
{
722-
"keyid": "fce9cf1cc86b0945d6a042f334026f31ed8e4ee1510218f198e8d3f191d15309",
722+
"keyid": "66676daa73bdfb4804b56070c8927ae491e2a6c2314f05b854dea94de8ff6bfc",
723723
"sig": "f7f03b13e3f4a78a23561419fc0dd741a637e49ee671251be9f8f3fceedfc112e4
724724
4ee3aaff2278fad9164ab039118d4dc53f22f94900dae9a147aa4d35dcfc0f"
725725
}
@@ -850,7 +850,7 @@ repo](https://github.com/theupdateframework/specification/issues).
850850
{
851851
"signatures": [
852852
{
853-
"keyid": "93ec2c3dec7cc08922179320ccd8c346234bf7f21705268b93e990d5273a2a3b",
853+
"keyid": "135c2f50e57ff11e744d234a62cebad8c38daf399604a7655661cc9199c69164",
854854
"sig": "e9fd40008fba263758a3ff1dc59f93e42a4910a282749af915fbbea1401178e5a0
855855
12090c228f06db1deb75ad8ddd7e40635ac51d4b04301fce0fd720074e0209"
856856
}
@@ -860,7 +860,7 @@ repo](https://github.com/theupdateframework/specification/issues).
860860
"spec_version": "1",
861861
"delegations": {
862862
"keys": {
863-
"ce3e02e72980b09ca6f5efa68197130b381921e5d0675e2e0c8f3c47e0626bba": {
863+
"f761033eb880143c52358d941d987ca5577675090e2215e856ba0099bc0ce4f6": {
864864
"keytype": "ed25519",
865865
"scheme": "ed25519",
866866
"keyval": {
@@ -871,7 +871,7 @@ repo](https://github.com/theupdateframework/specification/issues).
871871
"roles": [
872872
{
873873
"keyids": [
874-
"ce3e02e72980b09ca6f5efa68197130b381921e5d0675e2e0c8f3c47e0626bba"
874+
"f761033eb880143c52358d941d987ca5577675090e2215e856ba0099bc0ce4f6"
875875
],
876876
"name": "project",
877877
"paths": [
@@ -928,7 +928,7 @@ repo](https://github.com/theupdateframework/specification/issues).
928928
{
929929
"signatures": [
930930
{
931-
"keyid": "1a2b4110927d4cba257262f614896179ff85ca1f1353a41b5224ac474ca71cb4",
931+
"keyid": "1bf1c6e3cdd3d3a8420b19199e27511999850f4b376c4547b2f32fba7e80fca3",
932932
"sig": "90d2a06c7a6c2a6a93a9f5771eb2e5ce0c93dd580bebc2080d10894623cfd6eaed
933933
f4df84891d5aa37ace3ae3736a698e082e12c300dfe5aee92ea33a8f461f02"
934934
}

0 commit comments

Comments
 (0)