Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cyclonedx/schema/_res/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ some schema for offline use as downloaded via [script](../../../tools/schema-dow
original sources: <https://github.com/CycloneDX/specification/tree/master/schema>

Currently using version
[b29bae660048e0ad2fbc5f2972927b442ce951c4](https://github.com/CycloneDX/specification/commit/b29bae660048e0ad2fbc5f2972927b442ce951c4)
[https://github.com/CycloneDX/specification/commit/349314a9d7671d7d2ca5b711a725f49a73979da6](https://github.com/CycloneDX/specification/commit/https://github.com/CycloneDX/specification/commit/349314a9d7671d7d2ca5b711a725f49a73979da6)

| file | note |
|------|------|
Expand Down
44 changes: 42 additions & 2 deletions cyclonedx/schema/_res/bom-1.7.SNAPSHOT.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ limitations under the License.
targetNamespace="http://cyclonedx.org/schema/bom/1.7"
vc:minVersion="1.0"
vc:maxVersion="1.1"
version="1.7.1">
version="1.7.2">

<xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="spdx.SNAPSHOT.xsd"/>

Expand Down Expand Up @@ -8295,8 +8295,48 @@ limitations under the License.
</xs:element>
<xs:element name="cryptoRef" type="bom:refType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>A protocol-related cryptographic assets</xs:documentation>
<xs:documentation>
DEPRECATED - DO NOT USE. This will be removed in a future version. Use `./relatedCryptographicAssets` instead.
A protocol-related cryptographic asset.
</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="relatedCryptographicAssets" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
A list of cryptographic assets related to this component.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="relatedCryptographicAsset" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
A cryptographic asset related to this component.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
Specifies the mechanism by which the cryptographic asset is secured by.
Examples: "publicKey", "privateKey", "algorithm"
</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ref" type="bom:refType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
The bom-ref to cryptographic asset.
</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
Expand Down
32 changes: 31 additions & 1 deletion cyclonedx/schema/_res/spdx.SNAPSHOT.schema.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "http://cyclonedx.org/schema/spdx.schema.json",
"$comment": "v1.1-3.28.0",
"$comment": "v1.1-3.29.0",
"type": "string",
"enum": [
"0BSD",
Expand Down Expand Up @@ -57,6 +57,7 @@
"Aspell-RU",
"ASWF-Digital-Assets-1.0",
"ASWF-Digital-Assets-1.1",
"atc-game",
"Baekmuk",
"Bahyph",
"Barr",
Expand All @@ -74,6 +75,7 @@
"Borceux",
"Brian-Gladman-2-Clause",
"Brian-Gladman-3-Clause",
"Brian-Gladman-3-Clause-no-conversion",
"BSD-1-Clause",
"BSD-2-Clause",
"BSD-2-Clause-Darwin",
Expand All @@ -82,6 +84,7 @@
"BSD-2-Clause-NetBSD",
"BSD-2-Clause-Patent",
"BSD-2-Clause-pkgconf-disclaimer",
"BSD-2-Clause-pos-unchanged",
"BSD-2-Clause-Views",
"BSD-3-Clause",
"BSD-3-Clause-acpica",
Expand All @@ -96,6 +99,7 @@
"BSD-3-Clause-No-Nuclear-License-2014",
"BSD-3-Clause-No-Nuclear-Warranty",
"BSD-3-Clause-Open-MPI",
"BSD-3-Clause-OpenWebUI",
"BSD-3-Clause-Sun",
"BSD-3-Clause-Tso",
"BSD-4-Clause",
Expand All @@ -104,16 +108,20 @@
"BSD-4.3RENO",
"BSD-4.3TAHOE",
"BSD-Advertising-Acknowledgement",
"BSD-ask-to-endorse",
"BSD-Attribution-HPND-disclaimer",
"BSD-Inferno-Nettverk",
"BSD-Mark-Modifications",
"BSD-Protection",
"BSD-Source-alt-GPL",
"BSD-Source-beginning-file",
"BSD-Source-Code",
"BSD-Source-Code-no-disclaimer",
"BSD-Systemics",
"BSD-Systemics-W3Works",
"BSL-1.0",
"Buddy",
"Bugroff",
"BUSL-1.1",
"bzip2-1.0.5",
"bzip2-1.0.6",
Expand Down Expand Up @@ -142,6 +150,7 @@
"CC-BY-NC-2.5",
"CC-BY-NC-3.0",
"CC-BY-NC-3.0-DE",
"CC-BY-NC-3.0-IGO",
"CC-BY-NC-4.0",
"CC-BY-NC-ND-1.0",
"CC-BY-NC-ND-2.0",
Expand Down Expand Up @@ -264,6 +273,7 @@
"Fair",
"FBM",
"FDK-AAC",
"FDK-MPEG-H",
"Ferguson-Twofish",
"Frameworx-1.0",
"FreeBSD-DOC",
Expand Down Expand Up @@ -338,6 +348,7 @@
"hdparm",
"HIDAPI",
"Hippocratic-2.1",
"Hippocratic-3.0-core",
"HP-1986",
"HP-1989",
"HPND",
Expand Down Expand Up @@ -377,6 +388,7 @@
"iMatix",
"Imlib2",
"Info-ZIP",
"Informatica",
"Inner-Net-2.0",
"InnoSetup",
"Intel",
Expand Down Expand Up @@ -487,6 +499,7 @@
"MulanPSL-2.0",
"Multics",
"Mup",
"MVT-1.1",
"NAIST-2003",
"NASA-1.3",
"Naumen",
Expand Down Expand Up @@ -764,6 +777,7 @@
"GNOME-examples-exception",
"GNU-compiler-exception",
"gnu-javamail-exception",
"Google-Patent-WebM",
"GPL-3.0-389-ds-base-exception",
"GPL-3.0-interface-exception",
"GPL-3.0-linking-exception",
Expand Down Expand Up @@ -804,6 +818,7 @@
"SHL-2.0",
"SHL-2.1",
"Simple-Library-Usage-exception",
"Spelling-Provider-LGPL-exception",
"sqlitestudio-OpenSSL-exception",
"stunnel-exception",
"SWI-exception",
Expand Down Expand Up @@ -870,6 +885,7 @@
"Aspell-RU": "Aspell Russian License",
"ASWF-Digital-Assets-1.0": "ASWF Digital Assets License version 1.0",
"ASWF-Digital-Assets-1.1": "ASWF Digital Assets License 1.1",
"atc-game": "atc Game License",
"Baekmuk": "Baekmuk License",
"Bahyph": "Bahyph License",
"Barr": "Barr License",
Expand All @@ -887,6 +903,7 @@
"Borceux": "Borceux license",
"Brian-Gladman-2-Clause": "Brian Gladman 2-Clause License",
"Brian-Gladman-3-Clause": "Brian Gladman 3-Clause License",
"Brian-Gladman-3-Clause-no-conversion": "Brian Gladman 3-Clause License (no conversion clause)",
"BSD-1-Clause": "BSD 1-Clause License",
"BSD-2-Clause": "BSD 2-Clause \"Simplified\" License",
"BSD-2-Clause-Darwin": "BSD 2-Clause - Ian Darwin variant",
Expand All @@ -895,6 +912,7 @@
"BSD-2-Clause-NetBSD": "BSD 2-Clause NetBSD License",
"BSD-2-Clause-Patent": "BSD-2-Clause Plus Patent License",
"BSD-2-Clause-pkgconf-disclaimer": "BSD 2-Clause pkgconf disclaimer variant",
"BSD-2-Clause-pos-unchanged": "BSD 2-Clause - position unchanged variant",
"BSD-2-Clause-Views": "BSD 2-Clause with views sentence",
"BSD-3-Clause": "BSD 3-Clause \"New\" or \"Revised\" License",
"BSD-3-Clause-acpica": "BSD 3-Clause acpica variant",
Expand All @@ -909,6 +927,7 @@
"BSD-3-Clause-No-Nuclear-License-2014": "BSD 3-Clause No Nuclear License 2014",
"BSD-3-Clause-No-Nuclear-Warranty": "BSD 3-Clause No Nuclear Warranty",
"BSD-3-Clause-Open-MPI": "BSD 3-Clause Open MPI variant",
"BSD-3-Clause-OpenWebUI": "BSD 3-Clause - OpenWebUI variant",
"BSD-3-Clause-Sun": "BSD 3-Clause Sun Microsystems",
"BSD-3-Clause-Tso": "BSD 3-Clause Tso variant",
"BSD-4-Clause": "BSD 4-Clause \"Original\" or \"Old\" License",
Expand All @@ -917,16 +936,20 @@
"BSD-4.3RENO": "BSD 4.3 RENO License",
"BSD-4.3TAHOE": "BSD 4.3 TAHOE License",
"BSD-Advertising-Acknowledgement": "BSD Advertising Acknowledgement License",
"BSD-ask-to-endorse": "BSD - ask to endorse",
"BSD-Attribution-HPND-disclaimer": "BSD with Attribution and HPND disclaimer",
"BSD-Inferno-Nettverk": "BSD-Inferno-Nettverk",
"BSD-Mark-Modifications": "BSD Mark Modifications License",
"BSD-Protection": "BSD Protection License",
"BSD-Source-alt-GPL": "BSD Source Code Attribution - GPL alternative",
"BSD-Source-beginning-file": "BSD Source Code Attribution - beginning of file variant",
"BSD-Source-Code": "BSD Source Code Attribution",
"BSD-Source-Code-no-disclaimer": "BSD Source Code Attribution - no disclaimer",
"BSD-Systemics": "Systemics BSD variant license",
"BSD-Systemics-W3Works": "Systemics W3Works BSD variant license",
"BSL-1.0": "Boost Software License 1.0",
"Buddy": "Buddy License",
"Bugroff": "Bugroff License",
"BUSL-1.1": "Business Source License 1.1",
"bzip2-1.0.5": "bzip2 and libbzip2 License v1.0.5",
"bzip2-1.0.6": "bzip2 and libbzip2 License v1.0.6",
Expand Down Expand Up @@ -955,6 +978,7 @@
"CC-BY-NC-2.5": "Creative Commons Attribution Non Commercial 2.5 Generic",
"CC-BY-NC-3.0": "Creative Commons Attribution Non Commercial 3.0 Unported",
"CC-BY-NC-3.0-DE": "Creative Commons Attribution Non Commercial 3.0 Germany",
"CC-BY-NC-3.0-IGO": "Creative Commons Attribution Non Commercial 3.0 IGO",
"CC-BY-NC-4.0": "Creative Commons Attribution Non Commercial 4.0 International",
"CC-BY-NC-ND-1.0": "Creative Commons Attribution Non Commercial No Derivatives 1.0 Generic",
"CC-BY-NC-ND-2.0": "Creative Commons Attribution Non Commercial No Derivatives 2.0 Generic",
Expand Down Expand Up @@ -1077,6 +1101,7 @@
"Fair": "Fair License",
"FBM": "Fuzzy Bitmap License",
"FDK-AAC": "Fraunhofer FDK AAC Codec Library",
"FDK-MPEG-H": "Fraunhofer FDK MPEG-H Software",
"Ferguson-Twofish": "Ferguson Twofish License",
"Frameworx-1.0": "Frameworx Open License 1.0",
"FreeBSD-DOC": "FreeBSD Documentation License",
Expand Down Expand Up @@ -1151,6 +1176,7 @@
"hdparm": "hdparm License",
"HIDAPI": "HIDAPI License",
"Hippocratic-2.1": "Hippocratic License 2.1",
"Hippocratic-3.0-core": "Hippocratic License 3.0",
"HP-1986": "Hewlett-Packard 1986 License",
"HP-1989": "Hewlett-Packard 1989 License",
"HPND": "Historical Permission Notice and Disclaimer",
Expand Down Expand Up @@ -1190,6 +1216,7 @@
"iMatix": "iMatix Standard Function Library Agreement",
"Imlib2": "Imlib2 License",
"Info-ZIP": "Info-ZIP License",
"Informatica": "Informatica License",
"Inner-Net-2.0": "Inner Net License v2.0",
"InnoSetup": "Inno Setup License",
"Intel": "Intel Open Source License",
Expand Down Expand Up @@ -1300,6 +1327,7 @@
"MulanPSL-2.0": "Mulan Permissive Software License, Version 2",
"Multics": "Multics License",
"Mup": "Mup License",
"MVT-1.1": "MVT License 1.1",
"NAIST-2003": "Nara Institute of Science and Technology License (2003)",
"NASA-1.3": "NASA Open Source Agreement 1.3",
"Naumen": "Naumen Public License",
Expand Down Expand Up @@ -1577,6 +1605,7 @@
"GNOME-examples-exception": "GNOME examples exception",
"GNU-compiler-exception": "GNU Compiler Exception",
"gnu-javamail-exception": "GNU JavaMail exception",
"Google-Patent-WebM": "Google Additional IP Rights Grant (Patents) - WebM",
"GPL-3.0-389-ds-base-exception": "GPL-3.0 389 DS Base Exception",
"GPL-3.0-interface-exception": "GPL-3.0 Interface Exception",
"GPL-3.0-linking-exception": "GPL-3.0 Linking Exception",
Expand Down Expand Up @@ -1617,6 +1646,7 @@
"SHL-2.0": "Solderpad Hardware License v2.0",
"SHL-2.1": "Solderpad Hardware License v2.1",
"Simple-Library-Usage-exception": "Simple Library Usage Exception",
"Spelling-Provider-LGPL-exception": "Spelling Provider LGPL exception",
"sqlitestudio-OpenSSL-exception": "sqlitestudio OpenSSL exception",
"stunnel-exception": "stunnel Exception",
"SWI-exception": "SWI exception",
Expand Down
Loading
Loading