Merge pull request #1960 from mnm678/spec-version

Jussi Kukkonen · web-flow · commit 3a7fad7854d8 · 2022-04-20T09:57:24.000+03:00
Update supported spec version
diff --git a/tests/generated_data/ed25519_metadata/root_with_ed25519.json b/tests/generated_data/ed25519_metadata/root_with_ed25519.json
@@ -2,7 +2,7 @@
  "signatures": [
   {
    "keyid": "5822582e7072996c1eef1cec24b61115d364987faa486659fe3d3dce8dae2aba",
-   "sig": "e2cfb42fe355843c5284ca0bd58acb742a232c2c7b93a87c34ed086cfe51c41a21f77bb8d4ed0c74f9fb3f76f48f7005488347450c28468d8bb288e5988ae201"
+   "sig": "9589295d2b23b2e4747eba36e782f5f5775af975cee67ae75be7e0170556788253ca6919be9ed36e52a6023c49314a7d2b65a06541db6c3d06f84eaee585480b"
   }
  ],
  "signed": {
@@ -65,7 +65,7 @@
     "threshold": 1
    }
   },
-  "spec_version": "1.0.28",
+  "spec_version": "1.0.29",
   "version": 1
  }
 }
diff --git a/tests/generated_data/ed25519_metadata/snapshot_with_ed25519.json b/tests/generated_data/ed25519_metadata/snapshot_with_ed25519.json
@@ -2,7 +2,7 @@
  "signatures": [
   {
    "keyid": "3458204ed467519c19a5316eb278b5608472a1bbf15850ebfb462d5315e4f86d",
-   "sig": "40853c2711d5ea49066c6b27a078f9e65419e0a4a3e298b75204e83713fe1d8ae9db91eccda5a8bfc14a5d71b3862c3ab27339db630056948ca0548a3e0edf03"
+   "sig": "259dc96079f9b49e811b69b79253914ac5a963333eb24e5ac2d779a2d5d9d305c96c745613da59c1c48ae92d6f01a619b25066e51fc028a6ec8b56d744387006"
   }
  ],
  "signed": {
@@ -13,7 +13,7 @@
     "version": 1
    }
   },
-  "spec_version": "1.0.28",
+  "spec_version": "1.0.29",
   "version": 1
  }
 }
diff --git a/tests/generated_data/ed25519_metadata/targets_with_ed25519.json b/tests/generated_data/ed25519_metadata/targets_with_ed25519.json
@@ -2,13 +2,13 @@
  "signatures": [
   {
    "keyid": "2be5c21e3614f9f178fb49c4a34d0c18ffac30abd14ced917c60a52c8d8094b7",
-   "sig": "2954a14e207e8de2e5a2f9c88cfe99c56d357b7c9fa4c5f4ad9496279a6a7e253cf80bcd109467bb2ff8b9691d240fef18aaf55ee24a22e8d2432338f6bbc40b"
+   "sig": "0a83294ac2930655def327a010be1c22f15b2b229d26792e63ff974eeb3c529f4ede60fafffabbcd5db5defae63e76067781e745164a4d00af09d5a3d4cc560c"
   }
  ],
  "signed": {
   "_type": "targets",
   "expires": "2050-01-01T00:00:00Z",
-  "spec_version": "1.0.28",
+  "spec_version": "1.0.29",
   "targets": {},
   "version": 1
  }
diff --git a/tests/generated_data/ed25519_metadata/timestamp_with_ed25519.json b/tests/generated_data/ed25519_metadata/timestamp_with_ed25519.json
@@ -2,7 +2,7 @@
  "signatures": [
   {
    "keyid": "09d440e3725cec247dcb8703b646a87dd2a4d75343e8095c036c32795eefe3b9",
-   "sig": "c9094d7b773277f7acf040949358b684bd09be53be1deaaa7e1c5513bb30ded125dca1dd9d0893c542d52d53f555c85dca960ab147852757c0f5f7399787a704"
+   "sig": "0f57e85b060f06d778c0e2bf131be3dc828beb39ffdf12776f60a9787cc5f02fdf126eb0875a5953b451bc1e88cea9b720cf180475ed0fd54615c1434de07503"
   }
  ],
  "signed": {
@@ -13,7 +13,7 @@
     "version": 1
    }
   },
-  "spec_version": "1.0.28",
+  "spec_version": "1.0.29",
   "version": 1
  }
 }
diff --git a/tuf/api/metadata.py b/tuf/api/metadata.py
@@ -75,7 +75,7 @@
 
 # We aim to support SPECIFICATION_VERSION and require the input metadata
 # files to have the same major version (the first number) as ours.
-SPECIFICATION_VERSION = ["1", "0", "28"]
+SPECIFICATION_VERSION = ["1", "0", "29"]
 TOP_LEVEL_ROLE_NAMES = {_ROOT, _TIMESTAMP, _SNAPSHOT, _TARGETS}
 
 # T is a Generic type constraint for Metadata.signed

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"signatures": [`
`3`	`3`	`{`
`4`	`4`	`"keyid": "5822582e7072996c1eef1cec24b61115d364987faa486659fe3d3dce8dae2aba",`
`5`		`- "sig": "e2cfb42fe355843c5284ca0bd58acb742a232c2c7b93a87c34ed086cfe51c41a21f77bb8d4ed0c74f9fb3f76f48f7005488347450c28468d8bb288e5988ae201"`
	`5`	`+ "sig": "9589295d2b23b2e4747eba36e782f5f5775af975cee67ae75be7e0170556788253ca6919be9ed36e52a6023c49314a7d2b65a06541db6c3d06f84eaee585480b"`
`6`	`6`	`}`
`7`	`7`	`],`
`8`	`8`	`"signed": {`
`@@ -65,7 +65,7 @@`
`65`	`65`	`"threshold": 1`
`66`	`66`	`}`
`67`	`67`	`},`
`68`		`- "spec_version": "1.0.28",`
	`68`	`+ "spec_version": "1.0.29",`
`69`	`69`	`"version": 1`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"signatures": [`
`3`	`3`	`{`
`4`	`4`	`"keyid": "3458204ed467519c19a5316eb278b5608472a1bbf15850ebfb462d5315e4f86d",`
`5`		`- "sig": "40853c2711d5ea49066c6b27a078f9e65419e0a4a3e298b75204e83713fe1d8ae9db91eccda5a8bfc14a5d71b3862c3ab27339db630056948ca0548a3e0edf03"`
	`5`	`+ "sig": "259dc96079f9b49e811b69b79253914ac5a963333eb24e5ac2d779a2d5d9d305c96c745613da59c1c48ae92d6f01a619b25066e51fc028a6ec8b56d744387006"`
`6`	`6`	`}`
`7`	`7`	`],`
`8`	`8`	`"signed": {`
`@@ -13,7 +13,7 @@`
`13`	`13`	`"version": 1`
`14`	`14`	`}`
`15`	`15`	`},`
`16`		`- "spec_version": "1.0.28",`
	`16`	`+ "spec_version": "1.0.29",`
`17`	`17`	`"version": 1`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@`
`2`	`2`	`"signatures": [`
`3`	`3`	`{`
`4`	`4`	`"keyid": "2be5c21e3614f9f178fb49c4a34d0c18ffac30abd14ced917c60a52c8d8094b7",`
`5`		`- "sig": "2954a14e207e8de2e5a2f9c88cfe99c56d357b7c9fa4c5f4ad9496279a6a7e253cf80bcd109467bb2ff8b9691d240fef18aaf55ee24a22e8d2432338f6bbc40b"`
	`5`	`+ "sig": "0a83294ac2930655def327a010be1c22f15b2b229d26792e63ff974eeb3c529f4ede60fafffabbcd5db5defae63e76067781e745164a4d00af09d5a3d4cc560c"`
`6`	`6`	`}`
`7`	`7`	`],`
`8`	`8`	`"signed": {`
`9`	`9`	`"_type": "targets",`
`10`	`10`	`"expires": "2050-01-01T00:00:00Z",`
`11`		`- "spec_version": "1.0.28",`
	`11`	`+ "spec_version": "1.0.29",`
`12`	`12`	`"targets": {},`
`13`	`13`	`"version": 1`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"signatures": [`
`3`	`3`	`{`
`4`	`4`	`"keyid": "09d440e3725cec247dcb8703b646a87dd2a4d75343e8095c036c32795eefe3b9",`
`5`		`- "sig": "c9094d7b773277f7acf040949358b684bd09be53be1deaaa7e1c5513bb30ded125dca1dd9d0893c542d52d53f555c85dca960ab147852757c0f5f7399787a704"`
	`5`	`+ "sig": "0f57e85b060f06d778c0e2bf131be3dc828beb39ffdf12776f60a9787cc5f02fdf126eb0875a5953b451bc1e88cea9b720cf180475ed0fd54615c1434de07503"`
`6`	`6`	`}`
`7`	`7`	`],`
`8`	`8`	`"signed": {`
`@@ -13,7 +13,7 @@`
`13`	`13`	`"version": 1`
`14`	`14`	`}`
`15`	`15`	`},`
`16`		`- "spec_version": "1.0.28",`
	`16`	`+ "spec_version": "1.0.29",`
`17`	`17`	`"version": 1`
`18`	`18`	`}`
`19`	`19`	`}`