Skip to content

Commit e49da0f

Browse files
authored
Merge pull request #557 from dgarske/license_exception
GPLv2 license exception for Cisco Systems, Inc. use of wolfTPM in U-Boot only
2 parents 5a0350f + a85dcc8 commit e49da0f

6 files changed

Lines changed: 695 additions & 670 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ if(BUILD_WOLFTPM_LIB)
925925
--name wolftpm
926926
--version ${SBOM_VERSION}
927927
--supplier "wolfSSL Inc."
928-
--license-file ${CMAKE_SOURCE_DIR}/LICENSE
928+
--license-file ${CMAKE_SOURCE_DIR}/COPYING
929929
--options-h ${OPTION_FILE}
930930
--lib ${SBOM_LIB}
931931
--license-override ${SBOM_LICENSE_OVERRIDE}

COPYING

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

LICENSE

Lines changed: 16 additions & 666 deletions
Large diffs are not rendered by default.

Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ EXTRA_DIST+= .cyignore
5858
EXTRA_DIST+= README.md
5959
EXTRA_DIST+= ChangeLog.md
6060
EXTRA_DIST+= LICENSE
61+
EXTRA_DIST+= COPYING
6162
EXTRA_DIST+= autogen.sh
6263
EXTRA_DIST+= CMakeLists.txt
6364

@@ -138,7 +139,7 @@ cppcheck:
138139
# is (a libwolftpm library that links wolfSSL/wolfCrypt) and includes it.
139140
# WOLFSSL_DIR must point to a wolfssl source tree containing scripts/gen-sbom.
140141
SBOM_PKGNAME = wolftpm
141-
SBOM_LICENSE_FILE = $(srcdir)/LICENSE
142+
SBOM_LICENSE_FILE = $(srcdir)/COPYING
142143
SBOM_DEP_WOLFSSL = yes
143144

144145
# wolfTPM records its feature macros in its own generated options header, so

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ Output: `wolftpm-<version>.cdx.json`, `wolftpm-<version>.spdx.json`, `wolftpm-<v
11541154
Optional overrides:
11551155

11561156
- `SBOM_LICENSE_OVERRIDE` - SPDX expression to use instead of the licence
1157-
parsed from `LICENSE` (e.g. `LicenseRef-wolfSSL-Commercial` for commercial
1157+
parsed from `COPYING` (e.g. `LicenseRef-wolfSSL-Commercial` for commercial
11581158
licensees). Defaults to `GPL-3.0-or-later` (the per-file header licence).
11591159
- `SBOM_LICENSE_TEXT` - path to the licence text for any `LicenseRef-*` used in
11601160
`SBOM_LICENSE_OVERRIDE` (required by SPDX 2.3).

src/spdm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,4 +510,4 @@ standalone library.
510510

511511
## License
512512

513-
GPLv3 — see LICENSE file. Copyright (C) 2006-2026 wolfSSL Inc.
513+
GPLv3 — see COPYING file. Copyright (C) 2006-2026 wolfSSL Inc.

0 commit comments

Comments
 (0)