Skip to content

Commit 3c3b687

Browse files
committed
Rename TAP 3 metadata fields
`keys_for_delegations` --> `keys` (the keys field in root.json in reality also lists "keys for delegations", i.e. keys to delegate trust to other top-level roles, but is only called keys) `roleinfo` --> `roles` (keeping the name for delegated roles as it was before TAP3)
1 parent b46dc5e commit 3c3b687

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

tuf-spec.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ repo](https://github.com/theupdateframework/specification/issues).
790790
"version" : VERSION,
791791
"expires" : EXPIRES,
792792
"targets" : TARGETS,
793-
("keys_for_delegations" : {
793+
("keys" : {
794794
KEYID : KEY,
795795
... },
796796
"delegations" : [ DELEGATION, ... ])
@@ -825,10 +825,9 @@ repo](https://github.com/theupdateframework/specification/issues).
825825
TARGETPATH. The application may use this information to guide download
826826
decisions.
827827

828-
"keys_for_delegations" lists the public keys to verify signatures of
829-
delegated targets roles. Revocation and replacement of delegated targets
830-
roles keys is done by changing the keys in this field in the delegating
831-
role's metadata.
828+
"keys" lists the public keys to verify signatures of delegated targets
829+
roles. Revocation and replacement of delegated targets roles keys is done by
830+
changing the keys in this field in the delegating role's metadata.
832831

833832
"delegations" is a list of DELEGATION objects whose format is the following:
834833

@@ -838,7 +837,7 @@ repo](https://github.com/theupdateframework/specification/issues).
838837
"paths" : [ PATHPATTERN, ... ]),
839838
"terminating": TERMINATING,
840839
"min_roles_in_agreement" : NUM_ROLES,
841-
"roleinfo": [{
840+
"roles": [{
842841
"rolename": ROLENAME,
843842
"keyids": [ KEYID ],
844843
"threshold": THRESHOLD,
@@ -888,7 +887,7 @@ repo](https://github.com/theupdateframework/specification/issues).
888887

889888
NUM_ROLES is the minimum number of delegated targets roles that must be in
890889
agreement about targets hashes and lengths entrusted by the delegation. The
891-
delegated targets roles for a given delegation are listed in its "roleinfo"
890+
delegated targets roles for a given delegation are listed in its "roles"
892891
field.
893892

894893
ROLENAME is the name of the delegated targets role, e.g. "projects", KEYID
@@ -900,8 +899,8 @@ repo](https://github.com/theupdateframework/specification/issues).
900899
them in the order of their appearance in the "delegations" field. The
901900
first delegation is trusted over the second one, the second delegation is
902901
trusted over the third one, and so on. Likewise, in a multi-role delegation,
903-
if NUM_ROLES is less than or equal to half the number of roles in
904-
"roleinfo", different groups of roles may have different agreements
902+
if NUM_ROLES is less than or equal to half the number of roles in the
903+
"roles" field, different groups of roles may have different agreements
905904
on targets hashes or lengths. Such conflicts must be
906905
resolved by priorizing the first role in the list, that specifies target
907906
metadata agreed to by at least NUM_ROLES.
@@ -923,7 +922,7 @@ repo](https://github.com/theupdateframework/specification/issues).
923922
"signed": {
924923
"_type": "targets",
925924
"spec_version": "1.0.0",
926-
"keys_for_delegations": {
925+
"keys": {
927926
"f761033eb880143c52358d941d987ca5577675090e2215e856ba0099bc0ce4f6": {
928927
"keytype": "ed25519",
929928
"scheme": "ed25519",
@@ -940,7 +939,7 @@ repo](https://github.com/theupdateframework/specification/issues).
940939
],
941940
"terminating": true,
942941
"min_roles_in_agreement" : 1,
943-
"roleinfo": [
942+
"roles": [
944943
{
945944
"name": "project",
946945
"keyids": [
@@ -1259,9 +1258,9 @@ non-volatile storage as FILENAME.EXT.
12591258
of appearance.
12601259

12611260
* **4.5.2.1**. If the current delegation is a multi-role delegation,
1262-
recursively visit each role, and check that a defined threshold of
1263-
roles has signed exactly the same non-custom metadata (i.e., length and
1264-
hashes) about the target (or the lack of any such metadata).
1261+
recursively visit each role, and check that a defined minimum number of
1262+
roles agrees about non-custom metadata, i.e. length and hashes of the
1263+
target (or the lack of any such metadata).
12651264

12661265
* **4.5.2.2**. If the current delegation is a terminating delegation,
12671266
then jump to step 5.

0 commit comments

Comments
 (0)