Skip to content

Commit 1a1cab2

Browse files
update licensing info for this fork of the community edition (#1)
* update submodule url * update licensing info for this fork of the community edition * restore source files headers * Use the new VID:PID allocated to Librekeys by OpenMoko * doc cleanup
1 parent 370be2c commit 1a1cab2

9 files changed

Lines changed: 52 additions & 220 deletions

File tree

.github/FUNDING.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ By checking the box below, you confirm ALL of the following:
3333

3434
- You are the author of this contribution, or you have the right to contribute it.
3535
- You have read `CONTRIBUTING.md`.
36-
- You agree that this contribution may be merged, used, modified, and redistributed:
37-
- under the AGPLv3 Community Edition, **and**
38-
- under any proprietary / commercial / Enterprise editions of this project,
39-
now or in the future.
36+
- You agree that this contribution may be merged, used, modified, and redistributed under the AGPLv3
4037
- You understand that submitting this PR does not create any support obligation,
4138
SLA, or guarantee of merge.
4239

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "pico-keys-sdk"]
22
path = pico-keys-sdk
3-
url = https://github.com/polhenarejos/pico-keys-sdk
3+
url = ../pico-keys-sdk

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
cmake_minimum_required(VERSION 3.13)
1919

20-
set(USB_VID 0x2E8A)
21-
set(USB_PID 0x10FE)
20+
set(USB_VID 0x1D50)
21+
set(USB_PID 0x619B)
2222

2323
if(ESP_PLATFORM)
2424
set(DENABLE_POWER_ON_RESET 0)

CONTRIBUTING.md

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,17 @@
22

33
Thank you for your interest in contributing to this project.
44

5-
This repository is published in two forms:
6-
- a Community Edition released under AGPLv3, and
7-
- a proprietary / commercial / Enterprise Edition offered to organizations.
8-
9-
To keep that model legally clean, we need to be explicit about how contributions can be used.
5+
This repository is published under AGPLv3
106

117
By opening a pull request, you agree to all of the following:
128

139
1. **You have the right to contribute this code.**
1410
You are either the original author of the contribution, or you have obtained the necessary rights/permissions to contribute it under these terms.
1511

16-
2. **Dual licensing permission.**
12+
2. **Licensing.**
1713
You agree that your contribution may be:
1814
- merged into this repository, and
19-
- used, copied, modified, sublicensed, and redistributed
20-
- under the AGPLv3 Community Edition, and
21-
- under any proprietary / commercial / Enterprise editions of this project,
22-
now or in the future.
23-
24-
In other words: you are granting the project maintainer(s) the right to include
25-
your contribution in both the open-source (AGPLv3) codebase and in closed-source /
26-
commercially licensed builds, without any additional approval or payment.
15+
- used, copied, modified, sublicensed, and redistributed under the AGPLv3
2716

2817
3. **Attribution.**
2918
The maintainers may keep or add attribution lines such as
@@ -36,14 +25,6 @@ By opening a pull request, you agree to all of the following:
3625
service-level agreement, warranty, or guarantee that the contribution
3726
will be reviewed, merged, or maintained.
3827

39-
5. **Potential rejection for business reasons.**
40-
Features that fall under "Enterprise / Commercial" functionality
41-
(e.g. multi-tenant provisioning at scale, centralized audit trails,
42-
corporate policy enforcement, attestation/branding flows, key escrow / dual-control,
43-
etc.) may be declined for the public AGPLv3 tree even if technically valid.
44-
That is normal: some functionality is intentionally offered only
45-
under commercial terms.
46-
4728
If you are not comfortable with these terms, **do not open a pull request yet.**
4829
Instead, please open an Issue to start a discussion.
4930

@@ -76,9 +57,6 @@ Please keep PRs focused (one logical change per PR if possible).
7657
- impact on existing flows / security model
7758
- any new dependencies
7859

79-
This helps avoid doing a bunch of work on something that won't be accepted
80-
in the Community Edition.
81-
8260
### 4. Coding style / security posture
8361
- Aim for clarity and small, auditable changes. This code runs in places
8462
where secrets live.
@@ -91,7 +69,7 @@ in the Community Edition.
9169
- In the PR description, please include a short summary of what was changed and why.
9270
- At the bottom of the PR description, **copy/paste and confirm the licensing line below**:
9371

94-
> I confirm that I have read `CONTRIBUTING.md` and I agree that this contribution may be used under both the AGPLv3 Community Edition and any proprietary / commercial / Enterprise editions of this project, now or in the future.
72+
> I confirm that I have read `CONTRIBUTING.md` and I agree to its terms
9573
9674
A PR without that confirmation may be delayed or closed without merge.
9775

ENTERPRISE.md

Lines changed: 0 additions & 116 deletions
This file was deleted.

LICENSE

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
This project is licensed under the GNU Affero General Public License v3
2+
(AGPLv3). The full text of this license is reproduced at the bottom of
3+
this document.
4+
The copyright holders are indicated at the top of each file.
5+
6+
The project is using the following libraries, sdk or portions of code:
7+
- mdebtls, licensed under Apache-2.0 and GPL-2.0-or-later licenses,
8+
https://github.com/Mbed-TLS/mbedtls
9+
- tinyUSB, licensed under the MIT License,
10+
https://github.com/hathach/tinyusb
11+
- tinycbor, licensed under the MIT license,
12+
https://github.com/intel/tinycbor
13+
- mlkem-native, the Apache-2.0 license OR the ISC license OR the MIT
14+
license, https://github.com/pq-code-package/mlkem-native
15+
- USB CCID from Raspberry Pi (Trading) Ltd, licensed under the
16+
BSD-3-Clause license,
17+
- Raspberry Pi Pico SDK, licensed under BSD 3-Clause "New" or "Revised"
18+
License, https://github.com/raspberrypi/pico-sdk
19+
- Espressif IoT Development Framework (ESP-IDF), licensed under Apache
20+
License Version 2.0, https://github.com/espressif/esp-idf
21+
22+
________________________________________________________________________
23+
124
GNU AFFERO GENERAL PUBLIC LICENSE
225
Version 3, 19 November 2007
326

@@ -658,4 +681,4 @@ specific requirements.
658681
You should also get your employer (if you work as a programmer) or school,
659682
if any, to sign a "copyright disclaimer" for the program, if necessary.
660683
For more information on this, and how to apply and follow the GNU AGPL, see
661-
<https://www.gnu.org/licenses/>.
684+
<https://www.gnu.org/licenses/>.

0 commit comments

Comments
 (0)