diff --git a/internal/spdxlicense/license_list.go b/internal/spdxlicense/license_list.go index d7fa6645e068..a07f5d904c59 100644 --- a/internal/spdxlicense/license_list.go +++ b/internal/spdxlicense/license_list.go @@ -1,9 +1,9 @@ // Code generated by go generate; DO NOT EDIT. -// This file was generated by robots at 2023-10-05 22:45:16.827263 -0400 EDT m=+0.138031521 +// This file was generated by robots at 2024-02-09 10:57:33.980847 -0500 EST m=+0.165923154 // using data from https://spdx.org/licenses/licenses.json package spdxlicense -const Version = "3.22" +const Version = "3.23" var licenseIDs = map[string]string{ "0bsd": "0BSD", @@ -13,6 +13,7 @@ var licenseIDs = map[string]string{ "adobe2006": "Adobe-2006", "adobe2006.0": "Adobe-2006", "adobe2006.0.0": "Adobe-2006", + "adobedisplaypostscript": "Adobe-Display-PostScript", "adobeglyph": "Adobe-Glyph", "adobeutopia": "Adobe-Utopia", "adsl": "ADSL", @@ -57,6 +58,7 @@ var licenseIDs = map[string]string{ "aladdin": "Aladdin", "amdplpa": "AMDPLPA", "aml": "AML", + "amlglslang": "AML-glslang", "ampas": "AMPAS", "antlrpd": "ANTLR-PD", "antlrpdfallback": "ANTLR-PD-fallback", @@ -108,6 +110,7 @@ var licenseIDs = map[string]string{ "baekmuk": "Baekmuk", "bahyph": "Bahyph", "barr": "Barr", + "bcryptsolardesigner": "bcrypt-Solar-Designer", "beerware": "Beerware", "bitstreamcharter": "Bitstream-Charter", "bitstreamvera": "Bitstream-Vera", @@ -122,6 +125,9 @@ var licenseIDs = map[string]string{ "blueoak1.0.0": "BlueOak-1.0.0", "boehmgc": "Boehm-GC", "borceux": "Borceux", + "briangladman2.0.0clause": "Brian-Gladman-2-Clause", + "briangladman2.0clause": "Brian-Gladman-2-Clause", + "briangladman2clause": "Brian-Gladman-2-Clause", "briangladman3.0.0clause": "Brian-Gladman-3-Clause", "briangladman3.0clause": "Brian-Gladman-3-Clause", "briangladman3clause": "Brian-Gladman-3-Clause", @@ -129,21 +135,25 @@ var licenseIDs = map[string]string{ "bsd1.0clause": "BSD-1-Clause", "bsd1clause": "BSD-1-Clause", "bsd2.0.0clause": "BSD-2-Clause", + "bsd2.0.0clausedarwin": "BSD-2-Clause-Darwin", "bsd2.0.0clausefreebsd": "BSD-2-Clause-Views", "bsd2.0.0clausenetbsd": "BSD-2-Clause", "bsd2.0.0clausepatent": "BSD-2-Clause-Patent", "bsd2.0.0clauseviews": "BSD-2-Clause-Views", "bsd2.0clause": "BSD-2-Clause", + "bsd2.0clausedarwin": "BSD-2-Clause-Darwin", "bsd2.0clausefreebsd": "BSD-2-Clause-Views", "bsd2.0clausenetbsd": "BSD-2-Clause", "bsd2.0clausepatent": "BSD-2-Clause-Patent", "bsd2.0clauseviews": "BSD-2-Clause-Views", "bsd2clause": "BSD-2-Clause", + "bsd2clausedarwin": "BSD-2-Clause-Darwin", "bsd2clausefreebsd": "BSD-2-Clause-Views", "bsd2clausenetbsd": "BSD-2-Clause", "bsd2clausepatent": "BSD-2-Clause-Patent", "bsd2clauseviews": "BSD-2-Clause-Views", "bsd3.0.0clause": "BSD-3-Clause", + "bsd3.0.0clauseacpica": "BSD-3-Clause-acpica", "bsd3.0.0clauseattribution": "BSD-3-Clause-Attribution", "bsd3.0.0clauseclear": "BSD-3-Clause-Clear", "bsd3.0.0clauseflex": "BSD-3-Clause-flex", @@ -157,6 +167,7 @@ var licenseIDs = map[string]string{ "bsd3.0.0clauseopenmpi": "BSD-3-Clause-Open-MPI", "bsd3.0.0clausesun": "BSD-3-Clause-Sun", "bsd3.0clause": "BSD-3-Clause", + "bsd3.0clauseacpica": "BSD-3-Clause-acpica", "bsd3.0clauseattribution": "BSD-3-Clause-Attribution", "bsd3.0clauseclear": "BSD-3-Clause-Clear", "bsd3.0clauseflex": "BSD-3-Clause-flex", @@ -170,6 +181,7 @@ var licenseIDs = map[string]string{ "bsd3.0clauseopenmpi": "BSD-3-Clause-Open-MPI", "bsd3.0clausesun": "BSD-3-Clause-Sun", "bsd3clause": "BSD-3-Clause", + "bsd3clauseacpica": "BSD-3-Clause-acpica", "bsd3clauseattribution": "BSD-3-Clause-Attribution", "bsd3clauseclear": "BSD-3-Clause-Clear", "bsd3clauseflex": "BSD-3-Clause-flex", @@ -201,8 +213,12 @@ var licenseIDs = map[string]string{ "bsdattributionhpnddisclaimer": "BSD-Attribution-HPND-disclaimer", "bsdinfernonettverk": "BSD-Inferno-Nettverk", "bsdprotection": "BSD-Protection", + "bsdsourcebeginningfile": "BSD-Source-beginning-file", "bsdsourcecode": "BSD-Source-Code", "bsdsystemics": "BSD-Systemics", + "bsdsystemicsw3.0.0works": "BSD-Systemics-W3Works", + "bsdsystemicsw3.0works": "BSD-Systemics-W3Works", + "bsdsystemicsw3works": "BSD-Systemics-W3Works", "bsl1": "BSL-1.0", "bsl1.0": "BSL-1.0", "bsl1.0.0": "BSL-1.0", @@ -220,6 +236,7 @@ var licenseIDs = map[string]string{ "cal1.0combinedworkexception": "CAL-1.0-Combined-Work-Exception", "cal1combinedworkexception": "CAL-1.0-Combined-Work-Exception", "caldera": "Caldera", + "calderanopreamble": "Caldera-no-preamble", "catosl1": "CATOSL-1.1", "catosl1.1": "CATOSL-1.1", "catosl1.1.0": "CATOSL-1.1", @@ -241,16 +258,19 @@ var licenseIDs = map[string]string{ "ccby3.0": "CC-BY-3.0", "ccby3.0.0": "CC-BY-3.0", "ccby3.0.0at": "CC-BY-3.0-AT", + "ccby3.0.0au": "CC-BY-3.0-AU", "ccby3.0.0de": "CC-BY-3.0-DE", "ccby3.0.0igo": "CC-BY-3.0-IGO", "ccby3.0.0nl": "CC-BY-3.0-NL", "ccby3.0.0us": "CC-BY-3.0-US", "ccby3.0at": "CC-BY-3.0-AT", + "ccby3.0au": "CC-BY-3.0-AU", "ccby3.0de": "CC-BY-3.0-DE", "ccby3.0igo": "CC-BY-3.0-IGO", "ccby3.0nl": "CC-BY-3.0-NL", "ccby3.0us": "CC-BY-3.0-US", "ccby3at": "CC-BY-3.0-AT", + "ccby3au": "CC-BY-3.0-AU", "ccby3de": "CC-BY-3.0-DE", "ccby3igo": "CC-BY-3.0-IGO", "ccby3nl": "CC-BY-3.0-NL", @@ -420,6 +440,7 @@ var licenseIDs = map[string]string{ "clartistic": "ClArtistic", "clips": "Clips", "cmumach": "CMU-Mach", + "cmumachnodoc": "CMU-Mach-nodoc", "cnrijython": "CNRI-Jython", "cnripython": "CNRI-Python", "cnripythongplcompatible": "CNRI-Python-GPL-Compatible", @@ -456,6 +477,9 @@ var licenseIDs = map[string]string{ "cuda1.0": "C-UDA-1.0", "cuda1.0.0": "C-UDA-1.0", "curl": "curl", + "dec3.0.0clause": "DEC-3-Clause", + "dec3.0clause": "DEC-3-Clause", + "dec3clause": "DEC-3-Clause", "dfsl1": "D-FSL-1.0", "dfsl1.0": "D-FSL-1.0", "dfsl1.0.0": "D-FSL-1.0", @@ -471,6 +495,8 @@ var licenseIDs = map[string]string{ "drl1": "DRL-1.0", "drl1.0": "DRL-1.0", "drl1.0.0": "DRL-1.0", + "drl1.1": "DRL-1.1", + "drl1.1.0": "DRL-1.1", "dsdp": "DSDP", "dtoa": "dtoa", "dvipdfm": "dvipdfm", @@ -526,12 +552,14 @@ var licenseIDs = map[string]string{ "freebsddoc": "FreeBSD-DOC", "freeimage": "FreeImage", "fsfap": "FSFAP", + "fsfapnowarrantydisclaimer": "FSFAP-no-warranty-disclaimer", "fsful": "FSFUL", "fsfullr": "FSFULLR", "fsfullrwd": "FSFULLRWD", "ftl": "FTL", "furuseth": "Furuseth", "fwlw": "fwlw", + "gcrdocs": "GCR-docs", "gd": "GD", "gfdl1": "GFDL-1.1-only", "gfdl1+": "GFDL-1.1-or-later", @@ -672,7 +700,9 @@ var licenseIDs = map[string]string{ "gsoap1.3.0b": "gSOAP-1.3b", "gsoap1.3b": "gSOAP-1.3b", "gsoap1b": "gSOAP-1.3b", + "gtkbook": "gtkbook", "haskellreport": "HaskellReport", + "hdparm": "hdparm", "hippocratic2": "Hippocratic-2.1", "hippocratic2.1": "Hippocratic-2.1", "hippocratic2.1.0": "Hippocratic-2.1", @@ -688,8 +718,13 @@ var licenseIDs = map[string]string{ "hpnddocsell": "HPND-doc-sell", "hpndexportus": "HPND-export-US", "hpndexportusmodify": "HPND-export-US-modify", + "hpndfenneberglivingston": "HPND-Fenneberg-Livingston", + "hpndinriaimag": "HPND-INRIA-IMAG", + "hpndkevlinhenney": "HPND-Kevlin-Henney", "hpndmarkuskuhn": "HPND-Markus-Kuhn", + "hpndmitdisclaimer": "HPND-MIT-disclaimer", "hpndpbmplus": "HPND-Pbmplus", + "hpndsellmitdisclaimerxserver": "HPND-sell-MIT-disclaimer-xserver", "hpndsellregexpr": "HPND-sell-regexpr", "hpndsellvariant": "HPND-sell-variant", "hpndsellvariantmitdisclaimer": "HPND-sell-variant-MIT-disclaimer", @@ -719,6 +754,7 @@ var licenseIDs = map[string]string{ "ipl1.0": "IPL-1.0", "ipl1.0.0": "IPL-1.0", "isc": "ISC", + "iscveillard": "ISC-Veillard", "jam": "Jam", "jasper2": "JasPer-2.0", "jasper2.0": "JasPer-2.0", @@ -802,6 +838,7 @@ var licenseIDs = map[string]string{ "linuxmanpagescopyleftvar": "Linux-man-pages-copyleft-var", "linuxopenib": "Linux-OpenIB", "loop": "LOOP", + "lpddocument": "LPD-document", "lpl1": "LPL-1.0", "lpl1.0": "LPL-1.0", "lpl1.0.0": "LPL-1.0", @@ -828,7 +865,14 @@ var licenseIDs = map[string]string{ "lzmasdk9.22": "LZMA-SDK-9.22", "lzmasdk9.22.0": "LZMA-SDK-9.22", "lzmasdk9to9.20": "LZMA-SDK-9.11-to-9.20", + "mackerras3.0.0clause": "Mackerras-3-Clause", + "mackerras3.0.0clauseacknowledgment": "Mackerras-3-Clause-acknowledgment", + "mackerras3.0clause": "Mackerras-3-Clause", + "mackerras3.0clauseacknowledgment": "Mackerras-3-Clause-acknowledgment", + "mackerras3clause": "Mackerras-3-Clause", + "mackerras3clauseacknowledgment": "Mackerras-3-Clause-acknowledgment", "magaz": "magaz", + "mailprio": "mailprio", "makeindex": "MakeIndex", "martinbirgmeier": "Martin-Birgmeier", "mcpheeslideshow": "McPhee-slideshow", @@ -1008,6 +1052,8 @@ var licenseIDs = map[string]string{ "openpbs2.3": "OpenPBS-2.3", "openpbs2.3.0": "OpenPBS-2.3", "openssl": "OpenSSL", + "opensslstandalone": "OpenSSL-standalone", + "openvision": "OpenVision", "opl1": "OPL-1.0", "opl1.0": "OPL-1.0", "opl1.0.0": "OPL-1.0", @@ -1051,6 +1097,7 @@ var licenseIDs = map[string]string{ "php3.0.0": "PHP-3.0", "php3.01": "PHP-3.01", "php3.01.0": "PHP-3.01", + "pixar": "Pixar", "plexus": "Plexus", "pnmstitch": "pnmstitch", "polyformnoncommercial1": "PolyForm-Noncommercial-1.0.0", @@ -1077,6 +1124,7 @@ var licenseIDs = map[string]string{ "qpl1.0.0inria2004": "QPL-1.0-INRIA-2004", "qpl1.0inria2004": "QPL-1.0-INRIA-2004", "qpl1inria2004": "QPL-1.0-INRIA-2004", + "radvd": "radvd", "rdisc": "Rdisc", "rhecos1": "RHeCos-1.1", "rhecos1.1": "RHeCos-1.1", @@ -1094,6 +1142,9 @@ var licenseIDs = map[string]string{ "ruby": "Ruby", "saxpath": "Saxpath", "saxpd": "SAX-PD", + "saxpd2": "SAX-PD-2.0", + "saxpd2.0": "SAX-PD-2.0", + "saxpd2.0.0": "SAX-PD-2.0", "scea": "SCEA", "schemereport": "SchemeReport", "sendmail": "Sendmail", @@ -1129,6 +1180,7 @@ var licenseIDs = map[string]string{ "smppl": "SMPPL", "snia": "SNIA", "snprintf": "snprintf", + "softsurfer": "softSurfer", "soundex": "Soundex", "spencer86": "Spencer-86", "spencer86.0": "Spencer-86", @@ -1145,6 +1197,7 @@ var licenseIDs = map[string]string{ "sshkeyscan": "ssh-keyscan", "sshopenssh": "SSH-OpenSSH", "sshshort": "SSH-short", + "ssleaystandalone": "SSLeay-standalone", "sspl1": "SSPL-1.0", "sspl1.0": "SSPL-1.0", "sspl1.0.0": "SSPL-1.0", @@ -1152,6 +1205,7 @@ var licenseIDs = map[string]string{ "sugarcrm1": "SugarCRM-1.1.3", "sugarcrm1.1": "SugarCRM-1.1.3", "sugarcrm1.1.3": "SugarCRM-1.1.3", + "sunppp": "Sun-PPP", "sunpro": "SunPro", "swl": "SWL", "swrule": "swrule", @@ -1162,6 +1216,9 @@ var licenseIDs = map[string]string{ "tcl": "TCL", "tcpwrappers": "TCP-wrappers", "termreadkey": "TermReadKey", + "tgppl1": "TGPPL-1.0", + "tgppl1.0": "TGPPL-1.0", + "tgppl1.0.0": "TGPPL-1.0", "tmate": "TMate", "torque1": "TORQUE-1.1", "torque1.1": "TORQUE-1.1", @@ -1184,6 +1241,10 @@ var licenseIDs = map[string]string{ "ucl1.0": "UCL-1.0", "ucl1.0.0": "UCL-1.0", "ulem": "ulem", + "umichmerit": "UMich-Merit", + "unicode3": "Unicode-3.0", + "unicode3.0": "Unicode-3.0", + "unicode3.0.0": "Unicode-3.0", "unicodedfs2015": "Unicode-DFS-2015", "unicodedfs2015.0": "Unicode-DFS-2015", "unicodedfs2015.0.0": "Unicode-DFS-2015", @@ -1236,6 +1297,7 @@ var licenseIDs = map[string]string{ "xfree861.1": "XFree86-1.1", "xfree861.1.0": "XFree86-1.1", "xinetd": "xinetd", + "xkeyboardconfigzinoviev": "xkeyboard-config-Zinoviev", "xlock": "xlock", "xnet": "Xnet", "xpp": "xpp", diff --git a/syft/pkg/cataloger/internal/cpegenerate/dictionary/data/cpe-index.json b/syft/pkg/cataloger/internal/cpegenerate/dictionary/data/cpe-index.json index 56425dc08c6e..26060565f78e 100644 --- a/syft/pkg/cataloger/internal/cpegenerate/dictionary/data/cpe-index.json +++ b/syft/pkg/cataloger/internal/cpegenerate/dictionary/data/cpe-index.json @@ -1057,6 +1057,7 @@ "drxhello": "cpe:2.3:a:pypi:drxhello:*:*:*:*:*:pypi:*:*", "easy-parse": "cpe:2.3:a:easy-parse_project:easy-parse:*:*:*:*:*:python:*:*", "easy-xml": "cpe:2.3:a:easyxml_project:easyxml:*:*:*:*:*:python:*:*", + "ecdsa": "cpe:2.3:a:tlsfuzzer:ecdsa:*:*:*:*:*:python:*:*", "enum34": "cpe:2.3:a:python:enum34:*:*:*:*:*:*:*:*", "exotel": "cpe:2.3:a:exotel_project:exotel:*:*:*:*:*:python:*:*", "flask-restx": "cpe:2.3:a:flask-restx_project:flask-restx:*:*:*:*:*:python:*:*",