From f8d9ac77a967f625318ffc61d5d623ba3dbd99d8 Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Fri, 11 Aug 2017 14:33:55 -0400 Subject: [PATCH 1/3] Add apache and mit licenses, and edit README --- LICENSE-APACHE.txt | 174 +++++++++++++++++++++++++++++++++ LICENSE.txt => LICENSE-MIT.txt | 0 README.rst | 8 +- 3 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 LICENSE-APACHE.txt rename LICENSE.txt => LICENSE-MIT.txt (100%) diff --git a/LICENSE-APACHE.txt b/LICENSE-APACHE.txt new file mode 100644 index 00000000..91e18a62 --- /dev/null +++ b/LICENSE-APACHE.txt @@ -0,0 +1,174 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/LICENSE.txt b/LICENSE-MIT.txt similarity index 100% rename from LICENSE.txt rename to LICENSE-MIT.txt diff --git a/README.rst b/README.rst index 25f88f77..f4b30d89 100644 --- a/README.rst +++ b/README.rst @@ -148,7 +148,7 @@ https://updateframework.com Mailing List ------------ -Please visit `https://groups.google.com/forum/?fromgroups#!forum/theupdateframework `_ if you would like to contact the TUF team. Questions, feedback, and suggestions are welcomed in this low-volume mailing list. +Please visit `https://groups.google.com/forum/?fromgroups#!forum/theupdateframework `_ if you would like to contact the TUF team. Questions, feedback, and suggestions are welcomed in this low-volume mailing list. A group feed is available at: https://groups.google.com/forum/feed/theupdateframework/msgs/atom.xml?num=50 @@ -252,6 +252,12 @@ we provide for this purpose. - `Creating a TUF Repository `_ +License +------- + +This work is [dual-licensed](https://en.wikipedia.org/wiki/Multi-licensing) and +distributed under the (1) MIT License and (2) Apache License, Version 2.0. +Please see LICENSE-MIT.txt and LICENSE-APACHE.txt. Acknowledgements From c59a8e166c09b46b5b9e46dec41bf4999c5d0dfc Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Fri, 11 Aug 2017 14:39:40 -0400 Subject: [PATCH 2/3] Fix links in README to License files --- README.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index f4b30d89..e316c9bc 100644 --- a/README.rst +++ b/README.rst @@ -255,9 +255,12 @@ we provide for this purpose. License ------- -This work is [dual-licensed](https://en.wikipedia.org/wiki/Multi-licensing) and -distributed under the (1) MIT License and (2) Apache License, Version 2.0. -Please see LICENSE-MIT.txt and LICENSE-APACHE.txt. +This work is `dual-licensed `_ +and distributed under the (1) MIT License and (2) Apache License, Version 2.0. +Please see `LICENSE-MIT.txt +`_ +and `LICENSE-APACHE.txt +`_. Acknowledgements From e4d2d5055826fe6b8b9882cd53a58b9849f28938 Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Wed, 23 Aug 2017 15:05:35 -0400 Subject: [PATCH 3/3] Update tuf-spec.md Incorporate TAP 9 changes. --- docs/tuf-spec.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/tuf-spec.md b/docs/tuf-spec.md index 4887f11d..046c6401 100644 --- a/docs/tuf-spec.md +++ b/docs/tuf-spec.md @@ -465,7 +465,6 @@ Version: **1.0 (Draft)** { "signed" : ROLE, "signatures" : [ { "keyid" : KEYID, - "method" : METHOD, "sig" : SIGNATURE } , ... ] } @@ -499,11 +498,14 @@ Version: **1.0 (Draft)** used to sign documents. The type determines the interpretation of KEYVAL. - We define two keytypes at present: 'rsa' and 'ed25519'. + We define two keytypes below: 'rsa' and 'ed25519'. However, TUF places no + restrictions on cryptographic keys. Adopters can use any particular keytype, + signing scheme, and cryptographic library. The 'rsa' format is: { "keytype" : "rsa", + "scheme" : "rsassa-pss-sha256", "keyval" : { "public" : PUBLIC} } @@ -513,6 +515,7 @@ Version: **1.0 (Draft)** The 'ed25519' format is: { "keytype" : "ed25519", + "scheme" : "ed25519", "keyval" : { "public" : PUBLIC} } @@ -600,24 +603,28 @@ Version: **1.0 (Draft)** "keys": { "1a2b4110927d4cba257262f614896179ff85ca1f1353a41b5224ac474ca71cb4": { "keytype": "ed25519", + "scheme": "ed25519", "keyval": { "public": "72378e5bc588793e58f81c8533da64a2e8f1565c1fcc7f253496394ffc52542c" } }, "93ec2c3dec7cc08922179320ccd8c346234bf7f21705268b93e990d5273a2a3b": { "keytype": "ed25519", + "scheme": "ed25519", "keyval": { "public": "68ead6e54a43f8f36f9717b10669d1ef0ebb38cee6b05317669341309f1069cb" } }, "f2d5020d08aea06a0a9192eb6a4f549e17032ebefa1aa9ac167c1e3e727930d6": { "keytype": "ed25519", + "scheme": "ed25519", "keyval": { "public": "66dd78c5c2a78abc6fc6b267ff1a8017ba0e8bfc853dd97af351949bba021275" } }, "fce9cf1cc86b0945d6a042f334026f31ed8e4ee1510218f198e8d3f191d15309": { "keytype": "ed25519", + "scheme": "ed25519", "keyval": { "public": "01c61f8dc7d77fcef973f4267927541e355e8ceda757e2c402818dad850f856e" } @@ -687,7 +694,6 @@ Version: **1.0 (Draft)** "signatures": [ { "keyid": "fce9cf1cc86b0945d6a042f334026f31ed8e4ee1510218f198e8d3f191d15309", - "method": "ed25519", "sig": "f7f03b13e3f4a78a23561419fc0dd741a637e49ee671251be9f8f3fceedfc112e4 4ee3aaff2278fad9164ab039118d4dc53f22f94900dae9a147aa4d35dcfc0f" } @@ -817,7 +823,6 @@ Version: **1.0 (Draft)** "signatures": [ { "keyid": "93ec2c3dec7cc08922179320ccd8c346234bf7f21705268b93e990d5273a2a3b", - "method": "ed25519", "sig": "e9fd40008fba263758a3ff1dc59f93e42a4910a282749af915fbbea1401178e5a0 12090c228f06db1deb75ad8ddd7e40635ac51d4b04301fce0fd720074e0209" } @@ -828,6 +833,7 @@ Version: **1.0 (Draft)** "keys": { "ce3e02e72980b09ca6f5efa68197130b381921e5d0675e2e0c8f3c47e0626bba": { "keytype": "ed25519", + "scheme": "ed25519", "keyval": { "public": "b6e40fb71a6041212a3d84331336ecaa1f48a0c523f80ccc762a034c727606fa" } @@ -893,7 +899,6 @@ Version: **1.0 (Draft)** "signatures": [ { "keyid": "1a2b4110927d4cba257262f614896179ff85ca1f1353a41b5224ac474ca71cb4", - "method": "ed25519", "sig": "90d2a06c7a6c2a6a93a9f5771eb2e5ce0c93dd580bebc2080d10894623cfd6eaed f4df84891d5aa37ace3ae3736a698e082e12c300dfe5aee92ea33a8f461f02" }