WIP: Timeserver key rotation

dev-requirements.txt

@@ -4,6 +4,6 @@ cryptography==2.3
 pynacl==1.2.1
 pyasn1==0.4.4
 pycrypto==2.6.1
---editable git://github.com/awwad/tuf.git@develop#egg=tuf
+--editable git://github.com/awwad/tuf.git@remove_outdated_expiration_checks#egg=tuf
 --editable .
 tox==3.1.2

samples/metadata_samples_long_expiry/initial_w_no_update/director_targets.json

@@ -3,7 +3,7 @@
   {
    "keyid": "630cf584f392430b2119a4395e39624e86f5e5c5374507a789be5cf35bf090d6",
    "method": "ed25519",
-   "sig": "263a6d873455bac478366d92edc04cac55cc0e545b5f4249cf696254263d58de6a225446ce96725bccb83ffdaab548fcd89cb790020039ef336fb422364c1800"
+   "sig": "ee8c2399a95889c3db401200f5607d85b510427ee0e3905fd9ee91c0159952f6786eb02ff6b46fb33373043ab2f0e5637277ea0406b229010b2d4ecb45da0508"
   }
  ],
  "signed": {
@@ -12,7 +12,7 @@
    "keys": {},
    "roles": []
   },
-  "expires": "2037-09-28T12:46:29Z",
+  "expires": "2038-01-18T03:14:19Z",
   "targets": {},
   "version": 1
  }

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/director/metadata/root.json

@@ -3,7 +3,7 @@
   {
    "keyid": "fdba7eaa358fa5a8113a789f60c4a6ce29c4478d8d8eff3e27d1d77416696ab2",
    "method": "ed25519",
-   "sig": "e9855e5171934d56a78033cead3dc217d6df3730f9c668742346a4e66f0d1141fe7283a21964e0c35163e76b6103e36a04d44f1b0799fe34af45c65f32f38b09"
+   "sig": "2ab82986eb585c970cd972cf647a7d98f0c8d44744f091d19821edf2dd746c3b56d0dc777b364d1b383503ff44bdbe33ce1443576117c816bb1c17b6f2240e00"
   }
  ],
  "signed": {
@@ -12,7 +12,7 @@
    "gz"
   ],
   "consistent_snapshot": false,
-  "expires": "2037-09-28T12:46:29Z",
+  "expires": "2038-01-18T03:14:19Z",
   "keys": {
    "630cf584f392430b2119a4395e39624e86f5e5c5374507a789be5cf35bf090d6": {
     "keyid_hash_algorithms": [
@@ -24,6 +24,16 @@
      "public": "99ef8790687ca252c4677a80a34e401efb7e17ccdf9b0fcb5f1bc3260c432cb9"
     }
    },
+   "79c796d7e87389d1ebad04edce49faef611d139ee41ea9fb1931732afbfaac2e": {
+    "keyid_hash_algorithms": [
+     "sha256",
+     "sha512"
+    ],
+    "keytype": "ed25519",
+    "keyval": {
+     "public": "5d7750b208dfc7ade8f6106b9c3fa25162d5a184f302161e429f19a79e66a908"
+    }
+   },
    "da9c65c96c5c4072f6984f7aa81216d776aca6664d49cb4dfafbc7119320d9cc": {
     "keyid_hash_algorithms": [
      "sha256",
@@ -56,6 +66,12 @@
    }
   },
   "roles": {
+   "Timeserver": {
+    "keyids": [
+     "79c796d7e87389d1ebad04edce49faef611d139ee41ea9fb1931732afbfaac2e"
+    ],
+    "threshold": 1
+   },
    "root": {
     "keyids": [
      "fdba7eaa358fa5a8113a789f60c4a6ce29c4478d8d8eff3e27d1d77416696ab2"

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/director/metadata/snapshot.der

@@ -1,4 +1,5 @@
-0�֠f�
�{'��

�X�V�

�0�targets.der�

�=�root.der�

�w�

�'0%
-

 k����8��}
-"��Lc~r�I9�A���9�

�i0g �<��=3_�6T�`Gࡍ�Y^��Sk���Vx��
-

@��*��E�d�5[���{��%����UYQ���)�'gH��\ǃL8�	
��s�|jz&�j���
+0�֠f�
�����

�X�V�

�0�targets.der�

�=�root.der�

�w�

�'0%
+

 ө�q����#
�Q;����r�J��ޕ�Rﻁ

�i0g �<��=3_�6T�`Gࡍ�Y^��Sk���Vx��
+

@(Ƅ�R�+�C�
++���O�c����tp�
+�jyD?���A�{���_c�NzR�0\

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/director/metadata/snapshot.json

@@ -3,18 +3,18 @@
   {
    "keyid": "f93cfcf33d335ff43654ec6047e0a18dd5595ee3de53136b94c9c756788a0f97",
    "method": "ed25519",
-   "sig": "7606de7a3cb4d899755d8fe085f8834a356ca81b65814e89aa5062faa78360ff12b9977825fa9e14baf3daf63c4da2c354ec0fe233a98d3aac63d5758caab60e"
+   "sig": "ac9265b8022216662d9041696260caa82a1b4a200b0ecd6f98a31a4a81bc883162462e9ea32ea30cd1ae332aff7f239414ca55923bb9a83a88402b028acf5700"
   }
  ],
  "signed": {
   "_type": "Snapshot",
-  "expires": "2037-09-28T12:46:29Z",
+  "expires": "2038-01-18T03:14:19Z",
   "meta": {
    "root.json": {
     "hashes": {
-     "sha256": "2a6db46564a0fbc905bf7a36eddc172f1ce3a52871f18f2594e5160b2321e62d"
+     "sha256": "7098bc863d8f04e1305ed28aa08b35d05be0f507e6b3d52a606cc6bf6e871006"
     },
-    "length": 2120,
+    "length": 2259,
     "version": 1
    },
    "targets.json": {

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/director/metadata/targets.json

@@ -3,7 +3,7 @@
   {
    "keyid": "630cf584f392430b2119a4395e39624e86f5e5c5374507a789be5cf35bf090d6",
    "method": "ed25519",
-   "sig": "263a6d873455bac478366d92edc04cac55cc0e545b5f4249cf696254263d58de6a225446ce96725bccb83ffdaab548fcd89cb790020039ef336fb422364c1800"
+   "sig": "ee8c2399a95889c3db401200f5607d85b510427ee0e3905fd9ee91c0159952f6786eb02ff6b46fb33373043ab2f0e5637277ea0406b229010b2d4ecb45da0508"
   }
  ],
  "signed": {
@@ -12,7 +12,7 @@
    "keys": {},
    "roles": []
   },
-  "expires": "2037-09-28T12:46:29Z",
+  "expires": "2038-01-18T03:14:19Z",
   "targets": {},
   "version": 1
  }

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/director/metadata/timestamp.json

@@ -3,16 +3,16 @@
   {
    "keyid": "da9c65c96c5c4072f6984f7aa81216d776aca6664d49cb4dfafbc7119320d9cc",
    "method": "ed25519",
-   "sig": "3500dd4af7002c2a7d36c1a4b546b87979805a5c31f6038b39ca19d5d61868b5d3cc8c96c93eb44c3ed862859f45739e926626b73b7beb2d37ceeb83b32c8b0c"
+   "sig": "dbe5e8c1075e68b888eaa0d85cba9f97610980cf634110e0dcc558eb325f28de5129fb92d807a59a18f94637250a22c4ff76e065f9863daaad818683e5122e0d"
   }
  ],
  "signed": {
   "_type": "Timestamp",
-  "expires": "2037-09-28T12:46:29Z",
+  "expires": "2038-01-18T03:14:19Z",
   "meta": {
    "snapshot.json": {
     "hashes": {
-     "sha256": "114817f21566942dbcdafe97e3d1aca1660db86d8920a872c65b76d9890409de"
+     "sha256": "d3bc22745f0ad4c6f12df987346a3f5a29f024d899c16d23f25adb401d618cfa"
     },
     "length": 594,
     "version": 1

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/imagerepo/metadata/root.json

@@ -1,9 +1,9 @@
 {
  "signatures": [
   {
-   "keyid": "94c836f0c45168f0a437eef0e487b910f58db4d462ae457b5730a4487130f290",
+   "keyid": "fdba7eaa358fa5a8113a789f60c4a6ce29c4478d8d8eff3e27d1d77416696ab2",
    "method": "ed25519",
-   "sig": "bdbbbfa6b75e98bbc5f04549f1b181e39cc7c8ad8bd86a41c061825e01ed5d2cf1a294cb45f7441cb15fe0302264a98c7813af699c12ba25ccee08878436c20b"
+   "sig": "e47bc67e9d4433ad91f7e3b22b09752c735ba7f84a7812f9a6be086cdad70cbd8b93d68cea3ed94beb514aa099740046c352486dade1c60f68a3a24ce427e900"
   }
  ],
  "signed": {
@@ -12,7 +12,7 @@
    "gz"
   ],
   "consistent_snapshot": false,
-  "expires": "2037-09-28T12:46:18Z",
+  "expires": "2038-01-18T03:14:07Z",
   "keys": {
    "6fcd9a928358ad8ca7e946325f57ec71d50cb5977a8d02c5ab0de6765fef040a": {
     "keyid_hash_algorithms": [

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/imagerepo/metadata/snapshot.json

@@ -3,18 +3,18 @@
   {
    "keyid": "aaf05f8d054f8068bf6cb46beed7c824e2560802df462fc8681677586582ca99",
    "method": "ed25519",
-   "sig": "8cb2bff8f52a5aed8979a9c1ebfa047fb4ee58b63830037593bd240ceaafbae274c80c9d59aa3b6fba2bdd6de3c535e3230de2a51509042ca2f7d61523065709"
+   "sig": "3fd1bdc6b6f70fca7063a39a063da63f13bd84388e374c566732faad4988cf1028cd8c02668acf08a22bc6c955a6e1467df9bea46328873e0b4cd8529746c108"
   }
  ],
  "signed": {
   "_type": "Snapshot",
-  "expires": "2037-09-28T12:46:18Z",
+  "expires": "2038-01-18T03:14:07Z",
   "meta": {
    "root.json": {
     "hashes": {
-     "sha256": "69385580f90dcd47d7d309070f65515188d392b41416d1efeb330978b77e4a96"
+     "sha256": "33f29c8ffce9b7ea3095a15000b9265d69e2498a9beb29f5cecc0fb3b7494a08"
     },
-    "length": 2120,
+    "length": 2259,
     "version": 1
    },
    "targets.json": {

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/imagerepo/metadata/targets.json

@@ -3,7 +3,7 @@
   {
    "keyid": "c24b457b2ca4b3c2f415efdbbebb914a0d05c5345b9889bda044362589d6f596",
    "method": "ed25519",
-   "sig": "aa5c4bd41dbb8bcf5fdc6fd44ec6b42998488fb1849cc9634e58e514dc5f00f7a59e75216db325f07bfdaba72558a9a4dcfe694f76c8e9af2980477a2893b208"
+   "sig": "6c300b24ffb94f9d1d3465e3e9a877a359c5e5316e3edfd86154eeee08503e111fa23c8b7ca8af2af74747e701272999e61b4930b98a15a41e4a6d20e781490f"
   }
  ],
  "signed": {
@@ -12,7 +12,7 @@
    "keys": {},
    "roles": []
   },
-  "expires": "2037-09-28T12:46:18Z",
+  "expires": "2038-01-18T03:14:07Z",
   "targets": {
    "/BCU1.0.txt": {
     "hashes": {

samples/metadata_samples_long_expiry/initial_w_no_update/full_metadata_archive/imagerepo/metadata/timestamp.json

@@ -3,16 +3,16 @@
   {
    "keyid": "6fcd9a928358ad8ca7e946325f57ec71d50cb5977a8d02c5ab0de6765fef040a",
    "method": "ed25519",
-   "sig": "8aa14b371d10f81a5f4232967d682ef254f5a92221b5cd224811e053d5a8bd99cc1298984c284580684a958eec2f40a6eaf0d8756bd950e5b3714736befda805"
+   "sig": "eb505991b63a7dddd153edd4e1a1ee00d46caefbfaf39ec85cf0b96c681f8f33b25666bb101b7f0e7a614dbd8c9eaa97986f5cb5e2873cc1213cafa2d1f59e0c"
   }
  ],
  "signed": {
   "_type": "Timestamp",
-  "expires": "2037-09-28T12:46:18Z",
+  "expires": "2038-01-18T03:14:07Z",
   "meta": {
    "snapshot.json": {
     "hashes": {
-     "sha256": "d37a3f9b41bd7ad4c87bc978f0341cbeb081bdee0891f087f33d34963c565e16"
+     "sha256": "d88bd443c813a54a029527f70e8dc8c7266c20a02c1a07d2d3227c51c7f5c669"
     },
     "length": 594,
     "version": 1

samples/metadata_samples_long_expiry/timeserver_key_rotated/director_targets.json

@@ -0,0 +1,19 @@
+{
+ "signatures": [
+  {
+   "keyid": "630cf584f392430b2119a4395e39624e86f5e5c5374507a789be5cf35bf090d6",
+   "method": "ed25519",
+   "sig": "ee8c2399a95889c3db401200f5607d85b510427ee0e3905fd9ee91c0159952f6786eb02ff6b46fb33373043ab2f0e5637277ea0406b229010b2d4ecb45da0508"
+  }
+ ],
+ "signed": {
+  "_type": "Targets",
+  "delegations": {
+   "keys": {},
+   "roles": []
+  },
+  "expires": "2038-01-18T03:14:19Z",
+  "targets": {},
+  "version": 1
+ }
+}

samples/metadata_samples_long_expiry/timeserver_key_rotated/full_metadata_archive/director/metadata/root.json

@@ -0,0 +1,92 @@
+{
+ "signatures": [
+  {
+   "keyid": "fdba7eaa358fa5a8113a789f60c4a6ce29c4478d8d8eff3e27d1d77416696ab2",
+   "method": "ed25519",
+   "sig": "b7812100db40cf8348cb7643786f5b4a77173f8586cca219baef5e6f4af4d459e3eb01b33636ecee51ec02c142d52be409b3ae1c372145a1341750f8ed4d730e"
+  }
+ ],
+ "signed": {
+  "_type": "Root",
+  "compression_algorithms": [
+   "gz"
+  ],
+  "consistent_snapshot": false,
+  "expires": "2038-01-18T03:14:19Z",
+  "keys": {
+   "630cf584f392430b2119a4395e39624e86f5e5c5374507a789be5cf35bf090d6": {
+    "keyid_hash_algorithms": [
+     "sha256",
+     "sha512"
+    ],
+    "keytype": "ed25519",
+    "keyval": {
+     "public": "99ef8790687ca252c4677a80a34e401efb7e17ccdf9b0fcb5f1bc3260c432cb9"
+    }
+   },
+   "da9c65c96c5c4072f6984f7aa81216d776aca6664d49cb4dfafbc7119320d9cc": {
+    "keyid_hash_algorithms": [
+     "sha256",
+     "sha512"
+    ],
+    "keytype": "ed25519",
+    "keyval": {
+     "public": "d1ab5126fd6f0e30944910e81c0448044dfe9d5a39f478212b2afa913bb7ca7c"
+    }
+   },
+   "f93cfcf33d335ff43654ec6047e0a18dd5595ee3de53136b94c9c756788a0f97": {
+    "keyid_hash_algorithms": [
+     "sha256",
+     "sha512"
+    ],
+    "keytype": "ed25519",
+    "keyval": {
+     "public": "228342cc8b78a65b8840ef5691a693d8c368e053a7e8e8f85faf7c83eff1e1d2"
+    }
+   },
+   "fdba7eaa358fa5a8113a789f60c4a6ce29c4478d8d8eff3e27d1d77416696ab2": {
+    "keyid_hash_algorithms": [
+     "sha256",
+     "sha512"
+    ],
+    "keytype": "ed25519",
+    "keyval": {
+     "public": "f3b4c231520580eca92e17ae1581a708f606f72d43cc200af493afeec22a5e79"
+    }
+   }
+  },
+  "roles": {
+   "Timeserver": {
+    "keyids": [
+     "da9c65c96c5c4072f6984f7aa81216d776aca6664d49cb4dfafbc7119320d9cc"
+    ],
+    "threshold": 1
+   },
+   "root": {
+    "keyids": [
+     "fdba7eaa358fa5a8113a789f60c4a6ce29c4478d8d8eff3e27d1d77416696ab2"
+    ],
+    "threshold": 1
+   },
+   "snapshot": {
+    "keyids": [
+     "f93cfcf33d335ff43654ec6047e0a18dd5595ee3de53136b94c9c756788a0f97"
+    ],
+    "threshold": 1
+   },
+   "targets": {
+    "keyids": [
+     "630cf584f392430b2119a4395e39624e86f5e5c5374507a789be5cf35bf090d6"
+    ],
+    "threshold": 1
+   },
+   "timestamp": {
+    "keyids": [
+     "da9c65c96c5c4072f6984f7aa81216d776aca6664d49cb4dfafbc7119320d9cc"
+    ],
+    "threshold": 1
+   }
+  },
+  "version": 2
+ }
+}

samples/metadata_samples_long_expiry/timeserver_key_rotated/full_metadata_archive/director/metadata/snapshot.json

@@ -0,0 +1,26 @@
+{
+ "signatures": [
+  {
+   "keyid": "f93cfcf33d335ff43654ec6047e0a18dd5595ee3de53136b94c9c756788a0f97",
+   "method": "ed25519",
+   "sig": "48264bae99b07b6c2cc3a9112264cd0f2d2e4cee94e1ab7a3160ca579c0aab13452b8a70b43b3b5a746d1d34723695aaace087e99c84d5ad35d2fd1d658e1902"
+  }
+ ],
+ "signed": {
+  "_type": "Snapshot",
+  "expires": "2038-01-18T03:14:19Z",
+  "meta": {
+   "root.json": {
+    "hashes": {
+     "sha256": "072863a1e81e4dc4b8d19b23cfecf742ee15a7d5afc06a03dd45f63fec81849c"
+    },
+    "length": 2259,
+    "version": 2
+   },
+   "targets.json": {
+    "version": 1
+   }
+  },
+  "version": 2
+ }
+}

samples/metadata_samples_long_expiry/timeserver_key_rotated/full_metadata_archive/director/metadata/targets.json

@@ -0,0 +1,19 @@
+{
+ "signatures": [
+  {
+   "keyid": "630cf584f392430b2119a4395e39624e86f5e5c5374507a789be5cf35bf090d6",
+   "method": "ed25519",
+   "sig": "ee8c2399a95889c3db401200f5607d85b510427ee0e3905fd9ee91c0159952f6786eb02ff6b46fb33373043ab2f0e5637277ea0406b229010b2d4ecb45da0508"
+  }
+ ],
+ "signed": {
+  "_type": "Targets",
+  "delegations": {
+   "keys": {},
+   "roles": []
+  },
+  "expires": "2038-01-18T03:14:19Z",
+  "targets": {},
+  "version": 1
+ }
+}