diff options
| -rw-r--r-- | .gitignore | 11 | ||||
| -rw-r--r-- | MPL-2.0 | 403 | ||||
| -rwxr-xr-x | build | 13 | ||||
| -rwxr-xr-x | certdata2pem.sh | 176 | ||||
| -rw-r--r-- | changelog | 5 | ||||
| -rw-r--r-- | control | 3 | ||||
| -rw-r--r-- | copyright | 31 | ||||
| -rw-r--r-- | format | 1 | ||||
| -rw-r--r-- | nss-certdata-server-auth.pkg/control | 8 | ||||
| -rw-r--r-- | nss-certdata-server-auth.pkg/docs | 1 | ||||
| -rwxr-xr-x | release | 13 | ||||
| -rw-r--r-- | source.mk | 10 |
12 files changed, 675 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bb18d64 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +# Swap and backup files +.*.sw* +.sw* +*~ +Session.vim + +# Sources +src/ + +# Work area +tmp/ @@ -0,0 +1,403 @@ +NSS is available under the Mozilla Public License, version 2, a copy of which +is below. + +Note on GPL Compatibility +------------------------- + +The MPL 2, section 3.3, permits you to combine NSS with code under the GNU +General Public License (GPL) version 2, or any later version of that +license, to make a Larger Work, and distribute the result under the GPL. +The only condition is that you must also make NSS, and any changes you +have made to it, available to recipients under the terms of the MPL 2 also. + +Anyone who receives the combined code from you does not have to continue +to dual licence in this way, and may, if they wish, distribute under the +terms of either of the two licences - either the MPL alone or the GPL +alone. However, we discourage people from distributing copies of NSS under +the GPL alone, because it means that any improvements they make cannot be +reincorporated into the main version of NSS. There is never a need to do +this for license compatibility reasons. + +Note on LGPL Compatibility +-------------------------- + +The above also applies to combining MPLed code in a single library with +code under the GNU Lesser General Public License (LGPL) version 2.1, or +any later version of that license. If the LGPLed code and the MPLed code +are not in the same library, then the copyleft coverage of the two +licences does not overlap, so no issues arise. + + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +include ../source.mk + +build: + ../certdata2pem.sh src/certdata.txt SERVER_AUTH \ + src/certdata-server-auth.pem + touch $@ + +install: build + install -D -m 0644 src/certdata-server-auth.pem \ + nss-certdata-server-auth.data$$(: \ + )/usr/share/certs/nss-certdata-server-auth.pem diff --git a/certdata2pem.sh b/certdata2pem.sh new file mode 100755 index 0000000..e12fc67 --- /dev/null +++ b/certdata2pem.sh @@ -0,0 +1,176 @@ +#!/bin/sh +# +# Converts NSS certdata objects text into a concatenated PEM bundle. +# +# Copyright (C) 2020 Patrick McDermott +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +set -eu + +error() +{ + local fmt="${1}" + shift 1 + + printf "Error: ${fmt}\n" "${@}" 1>&2 +} + +parse() +{ + local txt_input="${1}" + local trust_type="${2}" + local pem_output="${3}" + shift 3 + local attr= + local type= + local val= + local class= + local label= + local value= + local trust= + local trusted= + + if [ x"${txt_input}" != x'-' ]; then + exec 0<"${txt_input}" + fi + if [ x"${pem_output}" != x'-' ]; then + exec 1>"${pem_output}" + fi + + while read -r attr && [ x"${attr}" != x'BEGINDATA' ]; do :; done + + while read -r attr type val; do + case "${attr}" in + '#'*) + continue + ;; + 'CKA_CLASS') + class="${val}" + ;; + 'CKA_LABEL') + val="${val#\"}" + val="${val%\"}" + label="$(printf '%s' "${val}" | \ + tr -C 'A-Za-z0-9_' '_')" + ;; + 'CKA_VALUE') + if [ x"${type}" != x'MULTILINE_OCTAL' ]; then + error 'Unsupported value type' + return 1 + fi + value= + while read -r val; do + case "${val}" in + 'END') + break + ;; + *[!0-7\\]*) + error "Invalid $(: \ + )multiline $(: \ + )octal value" + return 1 + ;; + *) + value="${value}$(printf\ + "${val}")" + ;; + esac + done + ;; + "CKA_TRUST_${trust_type}") + trust="${val}" + ;; + '') + if [ -z "${class}" ]; then + error 'Object missing class' + return 1 + fi + if [ -z "${label}" ]; then + error 'Object missing label' + return 1 + fi + if [ x"${class}" = x'CKO_CERTIFICATE' ]; then + if [ -z "${value}" ]; then + error 'Object missing value' + return 1 + fi + eval "certificate_${label}=\${value}" + elif [ x"${class}" = x'CKO_NSS_TRUST' ]; then + if [ -z "${trust}" ]; then + error 'Object missing trust' + return 1 + fi + if [ x"${trust}" = \ + x'CKT_NSS_TRUSTED_DELEGATOR' ] + then + trusted="${trusted} ${label}" + fi + elif [ x"${class}" = \ + x'CKO_NSS_BUILTIN_ROOT_LIST' ] + then + : + else + error 'Unknown class "%s"' "${val}" + return 1 + fi + class= + label= + value= + trust= + esac + done <<-EOF + $(cat) + + EOF + # Extra newline in input to trigger final empty line block in parser. + + for label in ${trusted}; do + printf '%s\n' '-----BEGIN CERTIFICATE-----' + eval "printf '%s' \"\${certificate_${label}}\"" | base64 - + printf '%s\n' '-----END CERTIFICATE-----' + done + + return 0 +} + +usage() +{ + printf 'Usage: %s <txt-input> <trust-type> <pem-output>\n' "${0}" + printf 'Example: %s certdata.txt SERVER_AUTH certdata.pem\n' "${0}" + + return 0 +} + +main() +{ + local txt_input= + local trust_type= + local pem_output= + + if [ ${#} -ne 3 ]; then + usage 1>&2 + return 1 + fi + txt_input="${1}" + trust_type="${2}" + pem_output="${3}" + shift 3 + + parse "${txt_input}" "${trust_type}" "${pem_output}" || return 1 + + return 0 +} + +main "${@}" diff --git a/changelog b/changelog new file mode 100644 index 0000000..f09694a --- /dev/null +++ b/changelog @@ -0,0 +1,5 @@ +nss-certdata (3.54-1) trunk + + * Initial release. + + -- Patrick McDermott <patrick.mcdermott@libiquity.com> Fri, 17 Jul 2020 18:13:00 -0400 @@ -0,0 +1,3 @@ +Maintainer: Patrick McDermott <patrick.mcdermott@libiquity.com> +Build-Depends: opkbuild (>= 4.2.0) +Homepage: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS diff --git a/copyright b/copyright new file mode 100644 index 0000000..d573ffb --- /dev/null +++ b/copyright @@ -0,0 +1,31 @@ +Upstream Source +=============== + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/. + +On this system, a copy of the Mozilla Public License Version 2.0 may be found at +<file:///usr/share/doc/nss-certdata/MPL-2.0>. + + +Distribution Packaging +====================== + +Copyright (C) 2020 Patrick McDermott + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. + +On this system, a copy of the GNU General Public License may be found at +<file:///usr/share/common-licenses/GPL-3>. @@ -0,0 +1 @@ +2.0 diff --git a/nss-certdata-server-auth.pkg/control b/nss-certdata-server-auth.pkg/control new file mode 100644 index 0000000..c5ea015 --- /dev/null +++ b/nss-certdata-server-auth.pkg/control @@ -0,0 +1,8 @@ +Architecture: all +Platform: all +Section: share +Description: CA certificates from Network Security Services - server auth trust + This package contains the certificate authority root certificates maintained by + Mozilla in the Network Security Services (NSS) libraries. + . + Certificates in this package are trusted for server authentication. diff --git a/nss-certdata-server-auth.pkg/docs b/nss-certdata-server-auth.pkg/docs new file mode 100644 index 0000000..fe5edb9 --- /dev/null +++ b/nss-certdata-server-auth.pkg/docs @@ -0,0 +1 @@ +../MPL-2.0 MPL-2.0 @@ -0,0 +1,13 @@ +#!/bin/sh + +set -eu + +read src ver <<-EOF + $(sed '1s/^\(.*\) (\(.*\)) .*$/\1 \2/; q;' changelog) + EOF + +sed '/^ -- .* /{ s/^\( -- .* \).*$/\1'"$(LC_ALL='POSIX' date \ + '+%a, %d %b %Y %H:%M:%S %z')"'/; :l; n; b l; };' changelog >changelog~ +mv changelog~ changelog +git commit -m "changelog: Release ${src} ${ver}" -- changelog +git tag "${src}/${ver}" HEAD diff --git a/source.mk b/source.mk new file mode 100644 index 0000000..7c163c2 --- /dev/null +++ b/source.mk @@ -0,0 +1,10 @@ +upstream_base = https://hg.mozilla.org/projects/nss/raw-file +upstream_tag = NSS_$$(printf '%s' '$(OPK_SOURCE_VERSION_UPSTREAM)' | \ + tr '.' '_')_RTM +upstream_path = lib/ckfw/builtins/certdata.txt +upstream_url = $(upstream_base)/$(upstream_tag)/$(upstream_path) + +../src/certdata.txt: + wget -O ../src/certdata.txt "$(upstream_url)" + +source: ../src/certdata.txt |