Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SBOM/SPDX Generation: Add in LicenseRef info for licenses which are not recognized by SPDX (OASIS-IPR) #104

Merged
merged 2 commits into from
Apr 2, 2024

Commits on Mar 29, 2024

  1. SBOM/SPDX Generation: Add in LicenseRef info for licenses which are n…

    …ot recognized by SPDX (OASIS-IPR)
    
    The sbom.spdx for corePKCS11 fails the SPDX validation check because OASIS-IPR is not a valid SPDX License
    
    This commit changes the following output to convert it to a LicenseRef and fix the validation check.
    
    $ diff -u sbom-original.spdx sbom-fixup.spdx
    --- sbom-original.spdx	2024-03-29 09:46:53.203092500 -0400
    +++ sbom-fixup.spdx	2024-03-29 09:48:03.900301885 -0400
    @@ -340,8 +340,8 @@
     SPDXID: SPDXRef-Package-pkcs11
     PackageVersion: v2.40_errata01
     PackageDownloadLocation: https://github.com/amazon-freertos/pkcs11.git
    -PackageLicenseDeclared: OASIS-IPR
    -PackageLicenseConcluded: OASIS-IPR
    +PackageLicenseDeclared: LicenseRef-OASIS-IPR
    +PackageLicenseConcluded: LicenseRef-OASIS-IPR
     PackageLicenseInfoFromFiles: NOASSERTION
     FilesAnalyzed: True
     PackageVerificationCode: 0c50b69c6789adbc08378264ec75fa6e6a616364
    @@ -1848,3 +1848,7 @@
    
     Relationship: SPDXRef-Package-corePKCS11 DEPENDS_ON SPDXRef-Package-pkcs11
     Relationship: SPDXRef-Package-corePKCS11 DEPENDS_ON SPDXRef-Package-mbedtls
    +
    +LicenseID: LicenseRef-OASIS-IPR
    +LicenseName: OASIS-IPR
    +ExtractedText: <text>OASIS-IPR</text>
    timesys-nathan committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    fcb9b31 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Configuration menu
    Copy the full SHA
    c851644 View commit details
    Browse the repository at this point in the history