Skip to content

Commit

Permalink
webpki-roots/webpki-root-certs: fix LICENSE files
Browse files Browse the repository at this point in the history
These crates mistakenly had license files included for Apache and MIT
licenses. Both are derived works under an MPL 2.0 license.
  • Loading branch information
cpu committed Sep 18, 2024
1 parent a533475 commit cfa1c70
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 5 deletions.
21 changes: 21 additions & 0 deletions LICENSE-MPL
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
This packge contains a modified version of ca-bundle.crt:

ca-bundle.crt -- Bundle of CA Root Certificates

Certificate data from Mozilla as of: Thu Nov 3 19:04:19 2011#
This is a bundle of X.509 certificates of public Certificate Authorities
(CA). These were automatically extracted from Mozilla's root certificates
file (certdata.txt). This file can be found in the mozilla source tree:
http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1#
It contains the certificates in PEM format and therefore
can be directly used with curl / libcurl / php_curl, or with
an Apache+mod_ssl webserver for SSL client authentication.
Just configure this file as the SSLCACertificateFile.#

***** BEGIN LICENSE BLOCK *****
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/.

***** END LICENSE BLOCK *****
@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ and revocation data.
# License

The underlying data is MPL-licensed, and the data in `webpki-roots` and `webpki-root-certs`
is therefore a derived work.
is therefore a derived work. The tooling in `webpki-ccadb` is licensed under
both MIT and Apache licenses.
1 change: 1 addition & 0 deletions webpki-root-certs/LICENSE
1 change: 0 additions & 1 deletion webpki-root-certs/LICENSE-APACHE

This file was deleted.

1 change: 0 additions & 1 deletion webpki-root-certs/LICENSE-MIT

This file was deleted.

1 change: 1 addition & 0 deletions webpki-roots/LICENSE
1 change: 0 additions & 1 deletion webpki-roots/LICENSE-APACHE

This file was deleted.

1 change: 0 additions & 1 deletion webpki-roots/LICENSE-MIT

This file was deleted.

0 comments on commit cfa1c70

Please sign in to comment.