Skip to content

Commit ae4c63f

Browse files
pombredannepombredanne
committed
Add support for FIPS
Use sha1 correctly for UUID seed Reported-by: RayGozer @RayGozer Reference: #3165 Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent ce5be3a commit ae4c63f

File tree

264 files changed

+1280
-1243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+1280
-1243
lines changed

‎src/licensedcode/detection.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,8 @@ def identifier(self):
278278

279279
# Return a uuid generated from the contents of the matches
280280
identifier_string = repr(tuple(data))
281-
md_hash = sha1()
282-
md_hash.update(identifier_string.encode('utf-8'))
283-
return str(uuid.UUID(md_hash.hexdigest()))
281+
md_hash = sha1(identifier_string.encode('utf-8'))
282+
return str(uuid.UUID(hex=md_hash.hexdigest()[:32]))
284283

285284
@property
286285
def identifier_with_expression(self):

‎src/licensedcode/models.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,8 +2001,9 @@ def _from_expression(cls, license_expression=None, identifier=None, **kwargs):
20012001
def compute_unique_id(self):
20022002
"""
20032003
Return a a unique id string based on this rule content.
2004-
(Today this is an SHA1 checksum of the identifierm expression and text,
2005-
but this is an implementation detail)
2004+
2005+
(This is a SHA1 checksum of the identifier expression and text, but this
2006+
is an implementation detail)
20062007
"""
20072008
content = f'{self.identifier!r}{self.license_expression!r}{self.text!r}'
20082009
return sha1(content.encode('utf-8')).hexdigest()

‎tests/cluecode/data/plugin_filter_clues/filtered-expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"license_detections": [
33
{
4-
"identifier": "apache_1_1-81b019ea-ed6c-17e3-1cfc-fad8557f8cac",
4+
"identifier": "apache_1_1-cb71ed90-062c-facf-d5cf-148f22222367",
55
"license_expression": "apache-1.1",
66
"count": 1,
77
"detection_log": [
@@ -107,7 +107,7 @@
107107
"license_clues": [],
108108
"percentage_of_license_text": 92.44,
109109
"for_license_detections": [
110-
"apache_1_1-81b019ea-ed6c-17e3-1cfc-fad8557f8cac"
110+
"apache_1_1-cb71ed90-062c-facf-d5cf-148f22222367"
111111
],
112112
"copyrights": [
113113
{

‎tests/cluecode/data/plugin_filter_clues/filtered-expected2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"license_detections": [
33
{
4-
"identifier": "pygres_2_2-7b7e2330-4841-998b-3287-06b5bc6e5a90",
4+
"identifier": "pygres_2_2-88058d56-5916-1e18-d3aa-1de8b39f7fbf",
55
"license_expression": "pygres-2.2",
66
"count": 1,
77
"detection_log": [
@@ -99,7 +99,7 @@
9999
"license_clues": [],
100100
"percentage_of_license_text": 69.38,
101101
"for_license_detections": [
102-
"pygres_2_2-7b7e2330-4841-998b-3287-06b5bc6e5a90"
102+
"pygres_2_2-88058d56-5916-1e18-d3aa-1de8b39f7fbf"
103103
],
104104
"copyrights": [
105105
{

‎tests/cluecode/data/plugin_filter_clues/filtered-expected3.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"license_detections": [
33
{
4-
"identifier": "pcre-043db187-9376-d7a9-e89b-d027667acb34",
4+
"identifier": "pcre-6bfd6b44-b749-0fea-8561-aeb76e388c06",
55
"license_expression": "pcre",
66
"count": 1,
77
"detection_log": [
@@ -100,7 +100,7 @@
100100
"license_clues": [],
101101
"percentage_of_license_text": 100.0,
102102
"for_license_detections": [
103-
"pcre-043db187-9376-d7a9-e89b-d027667acb34"
103+
"pcre-6bfd6b44-b749-0fea-8561-aeb76e388c06"
104104
],
105105
"copyrights": [
106106
{

‎tests/formattedcode/data/csv/livescan/expected.csv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
path,type,name,base_name,extension,size,date,sha1,md5,sha256,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,detected_license_expression,detected_license_expression_spdx,percentage_of_license_text,files_count,dirs_count,size_count,scan_errors,license_expression,detection_log,license_match__score,start_line,end_line,license_match__matched_length,license_match__match_coverage,license_match__matcher,license_match__license_expression,license_match__rule_identifier,license_match__rule_url,copyright,holder,email,url,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl
2-
json2csv.rb,file,json2csv.rb,json2csv,.rb,912,2022-04-20,1236469a06a2bacbdd8e172ad718482af5b0a936,1307c281e0b153202e291b217eab85d5,12ba215313981dbe810d9ed696b7cc753d97adfcc26eba1e13f941dc7506aa4e,text/x-script.python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,apache-2.0,Apache-2.0,62.04,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
2+
json2csv.rb,file,json2csv.rb,json2csv,.rb,912,2018-11-15,1236469a06a2bacbdd8e172ad718482af5b0a936,1307c281e0b153202e291b217eab85d5,12ba215313981dbe810d9ed696b7cc753d97adfcc26eba1e13f941dc7506aa4e,text/x-script.python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,apache-2.0,Apache-2.0,62.04,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
33
json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,apache-2.0,not-combined,100.00,5,13,85,100.00,2-aho,apache-2.0,apache-2.0_7.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
44
json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,,,Copyright (c) 2017 nexB Inc. and others,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
55
json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,,,,nexB Inc. and others,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
66
json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
77
json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
88
json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,8,,,,,,,,,,http://www.apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
9-
license,file,license,license,,679,2022-04-20,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,a34098a43e5677495f59dff825a3f9bc0f2b0261d75feb2356919f4c3ce049ab,text/plain,ASCII text,,False,True,False,False,False,False,gpl-2.0-plus,GPL-2.0-or-later,100.0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
9+
license,file,license,license,,679,2018-10-15,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,a34098a43e5677495f59dff825a3f9bc0f2b0261d75feb2356919f4c3ce049ab,text/plain,ASCII text,,False,True,False,False,False,False,gpl-2.0-plus,GPL-2.0-or-later,100.0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1010
license,,,,,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,not-combined,100.00,1,12,113,100.00,1-hash,gpl-2.0-plus,gpl-2.0-plus_420.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
11-
package.json,file,package.json,package,.json,2200,2022-04-20,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,29f6068a1b6c7d06f115a5edc4ed8558edde42c6bbf0145ed77cf1108a0dd529,application/json,JSON data,,False,True,False,False,False,False,mit,MIT,45.72,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
11+
package.json,file,package.json,package,.json,2200,2018-10-15,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,29f6068a1b6c7d06f115a5edc4ed8558edde42c6bbf0145ed77cf1108a0dd529,application/json,JSON data,,False,True,False,False,False,False,mit,MIT,45.72,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1212
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,from-package-file,100.00,24,24,3,100.00,2-aho,mit,mit_27.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1313
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,from-package-file,84.68,24,24,136,85.53,3-seq,mit,mit_823.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1414
package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,Copyright (c) 2012 LearnBoost <tj@learnboost.com>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

‎tests/licensedcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"license_detections": [
33
{
4-
"identifier": "python-f9a5ba7d-9d66-5878-a0bd-1afe42fe0bd9",
4+
"identifier": "python-c496ccae-69a0-c5f8-a742-83bcd66bfe68",
55
"license_expression": "python",
66
"count": 1,
77
"detection_log": [
@@ -22,7 +22,7 @@
2222
]
2323
},
2424
{
25-
"identifier": "other_copyleft_and_gpl_1_0_plus-a9ef94dc-a60e-21b6-82b8-77454e7751c0",
25+
"identifier": "other_copyleft_and_gpl_1_0_plus-c5a15bb8-ff73-7153-6670-e0604d5ef8df",
2626
"license_expression": "other-copyleft AND gpl-1.0-plus",
2727
"count": 1,
2828
"detection_log": [
@@ -120,7 +120,7 @@
120120
]
121121
},
122122
{
123-
"identifier": "python_and_python_cwi-3136274a-0a35-5bea-9531-6e328486ea3b",
123+
"identifier": "python_and_python_cwi-dda7296c-6bc9-a87c-6fcd-8aa47c3484dc",
124124
"license_expression": "python AND python-cwi",
125125
"count": 1,
126126
"detection_log": [
@@ -152,7 +152,7 @@
152152
]
153153
},
154154
{
155-
"identifier": "bzip2_libbzip_2010-4854df4f-b9f8-1a96-92bd-44873ee7c7c5",
155+
"identifier": "bzip2_libbzip_2010-be66cf99-e877-62c2-7da8-50038fbab17e",
156156
"license_expression": "bzip2-libbzip-2010",
157157
"count": 1,
158158
"detection_log": [
@@ -184,7 +184,7 @@
184184
]
185185
},
186186
{
187-
"identifier": "sleepycat-82c2d26c-feb1-2257-3b27-0e92e4721958",
187+
"identifier": "sleepycat-d3ff9cc0-b5f7-3c64-8469-dbf5e3e3a267",
188188
"license_expression": "sleepycat",
189189
"count": 1,
190190
"detection_log": [
@@ -216,7 +216,7 @@
216216
]
217217
},
218218
{
219-
"identifier": "bsd_simplified-d90f717a-d127-c345-d8a9-dc828c2be7e6",
219+
"identifier": "bsd_simplified-e047ae52-467f-e59b-d067-9f745901b880",
220220
"license_expression": "bsd-simplified",
221221
"count": 1,
222222
"detection_log": [
@@ -238,7 +238,7 @@
238238
]
239239
},
240240
{
241-
"identifier": "bsd_new-e65e2324-d4b0-5ad8-3314-a798683d13e3",
241+
"identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98",
242242
"license_expression": "bsd-new",
243243
"count": 1,
244244
"detection_log": [
@@ -259,7 +259,7 @@
259259
]
260260
},
261261
{
262-
"identifier": "bsd_new-4c57e726-e851-a66a-1dbe-d6106bcb4751",
262+
"identifier": "bsd_new-35c287f1-5d41-52f8-399e-2391cd1b4b40",
263263
"license_expression": "bsd-new",
264264
"count": 1,
265265
"detection_log": [
@@ -280,7 +280,7 @@
280280
]
281281
},
282282
{
283-
"identifier": "openssl_ssleay-7a0dc499-dddd-4bf1-2d0d-9a84c910b0bc",
283+
"identifier": "openssl_ssleay-69366d44-6158-dac6-668f-098772459a8f",
284284
"license_expression": "openssl-ssleay",
285285
"count": 1,
286286
"detection_log": [
@@ -323,7 +323,7 @@
323323
]
324324
},
325325
{
326-
"identifier": "openssl-dacfdecf-b752-23a6-37ba-f98e7d93554a",
326+
"identifier": "openssl-e1da0b01-fab9-e27d-4ff3-c4944b09b621",
327327
"license_expression": "openssl",
328328
"count": 1,
329329
"detection_log": [
@@ -344,7 +344,7 @@
344344
]
345345
},
346346
{
347-
"identifier": "ssleay_windows-50e05b6f-8602-75e7-7568-c3b4e72fec38",
347+
"identifier": "ssleay_windows-d3dabc12-d861-87db-b339-f73beba8703a",
348348
"license_expression": "ssleay-windows",
349349
"count": 1,
350350
"detection_log": [
@@ -365,7 +365,7 @@
365365
]
366366
},
367367
{
368-
"identifier": "tcl-d352cc42-40ca-8f87-931e-725ee0a85c3e",
368+
"identifier": "tcl-95cfff5e-1fec-4b5f-5c62-566773dfba90",
369369
"license_expression": "tcl",
370370
"count": 1,
371371
"detection_log": [
@@ -397,7 +397,7 @@
397397
]
398398
},
399399
{
400-
"identifier": "tcl-e49b63d5-028c-f39c-035e-68c9e6c60e34",
400+
"identifier": "tcl-1a602c64-bffb-7e52-83cf-8500a077bb47",
401401
"license_expression": "tcl",
402402
"count": 1,
403403
"detection_log": [
@@ -1368,19 +1368,19 @@
13681368
"license_clues": [],
13691369
"percentage_of_license_text": 83.64,
13701370
"for_license_detections": [
1371-
"python-f9a5ba7d-9d66-5878-a0bd-1afe42fe0bd9",
1372-
"other_copyleft_and_gpl_1_0_plus-a9ef94dc-a60e-21b6-82b8-77454e7751c0",
1373-
"python_and_python_cwi-3136274a-0a35-5bea-9531-6e328486ea3b",
1374-
"bzip2_libbzip_2010-4854df4f-b9f8-1a96-92bd-44873ee7c7c5",
1375-
"sleepycat-82c2d26c-feb1-2257-3b27-0e92e4721958",
1376-
"bsd_simplified-d90f717a-d127-c345-d8a9-dc828c2be7e6",
1377-
"bsd_new-e65e2324-d4b0-5ad8-3314-a798683d13e3",
1378-
"bsd_new-4c57e726-e851-a66a-1dbe-d6106bcb4751",
1379-
"openssl_ssleay-7a0dc499-dddd-4bf1-2d0d-9a84c910b0bc",
1380-
"openssl-dacfdecf-b752-23a6-37ba-f98e7d93554a",
1381-
"ssleay_windows-50e05b6f-8602-75e7-7568-c3b4e72fec38",
1382-
"tcl-d352cc42-40ca-8f87-931e-725ee0a85c3e",
1383-
"tcl-e49b63d5-028c-f39c-035e-68c9e6c60e34"
1371+
"python-c496ccae-69a0-c5f8-a742-83bcd66bfe68",
1372+
"other_copyleft_and_gpl_1_0_plus-c5a15bb8-ff73-7153-6670-e0604d5ef8df",
1373+
"python_and_python_cwi-dda7296c-6bc9-a87c-6fcd-8aa47c3484dc",
1374+
"bzip2_libbzip_2010-be66cf99-e877-62c2-7da8-50038fbab17e",
1375+
"sleepycat-d3ff9cc0-b5f7-3c64-8469-dbf5e3e3a267",
1376+
"bsd_simplified-e047ae52-467f-e59b-d067-9f745901b880",
1377+
"bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98",
1378+
"bsd_new-35c287f1-5d41-52f8-399e-2391cd1b4b40",
1379+
"openssl_ssleay-69366d44-6158-dac6-668f-098772459a8f",
1380+
"openssl-e1da0b01-fab9-e27d-4ff3-c4944b09b621",
1381+
"ssleay_windows-d3dabc12-d861-87db-b339-f73beba8703a",
1382+
"tcl-95cfff5e-1fec-4b5f-5c62-566773dfba90",
1383+
"tcl-1a602c64-bffb-7e52-83cf-8500a077bb47"
13841384
],
13851385
"scan_errors": []
13861386
}

‎tests/licensedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"match_coverage": 100.0,
5454
"matcher": "1-spdx-id",
5555
"license_expression": "artistic-2.0 OR mit",
56-
"rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-ae7a45be8a9def2cb13f52fd6f5dce69",
56+
"rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-0966c1258469e15c75e50ee743ab0c97510de07a",
5757
"rule_url": null,
5858
"matched_text": "Artistic-2.0 OR MIT"
5959
}
@@ -83,7 +83,7 @@
8383
"dependencies": [],
8484
"license_detections": [
8585
{
86-
"identifier": "apache_2_0_and__mit_or_bsd_simplified-3f15b80a-b323-ff84-3c01-1559a24c2af1",
86+
"identifier": "apache_2_0_and__mit_or_bsd_simplified-b459fcbf-3240-8427-3cbc-0704d95e5256",
8787
"license_expression": "apache-2.0 AND (mit OR bsd-simplified)",
8888
"count": 1,
8989
"detection_log": [
@@ -109,13 +109,13 @@
109109
"match_coverage": 100.0,
110110
"matcher": "1-spdx-id",
111111
"license_expression": "mit OR bsd-simplified",
112-
"rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-a2e025db7795bed12bedb2a9726bf283",
112+
"rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-1fc2d250fa0a912969ee93a5a445b14efea0063c",
113113
"rule_url": null
114114
}
115115
]
116116
},
117117
{
118-
"identifier": "artistic_2_0-c69ba991-eda9-d458-568a-670d821906e2",
118+
"identifier": "artistic_2_0-cb894725-5f2d-c39e-81e5-50ee1d4322fa",
119119
"license_expression": "artistic-2.0",
120120
"count": 1,
121121
"detection_log": [
@@ -136,7 +136,7 @@
136136
]
137137
},
138138
{
139-
"identifier": "artistic_2_0_or_mit-c0eb2112-a2cd-5aaa-d543-185b0984d576",
139+
"identifier": "artistic_2_0_or_mit-434f17c8-3734-fc88-9dce-bf0d423dbb81",
140140
"license_expression": "artistic-2.0 OR mit",
141141
"count": 1,
142142
"detection_log": [
@@ -151,7 +151,7 @@
151151
"match_coverage": 100.0,
152152
"matcher": "1-spdx-id",
153153
"license_expression": "artistic-2.0 OR mit",
154-
"rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-ae7a45be8a9def2cb13f52fd6f5dce69",
154+
"rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-0966c1258469e15c75e50ee743ab0c97510de07a",
155155
"rule_url": null
156156
}
157157
]
@@ -260,7 +260,7 @@
260260
],
261261
"license_rule_references": [
262262
{
263-
"rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-ae7a45be8a9def2cb13f52fd6f5dce69",
263+
"rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-0966c1258469e15c75e50ee743ab0c97510de07a",
264264
"license_expression": "artistic-2.0 OR mit",
265265
"rule_url": null,
266266
"rule_relevance": 100,
@@ -290,7 +290,7 @@
290290
"rule_text": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License."
291291
},
292292
{
293-
"rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-a2e025db7795bed12bedb2a9726bf283",
293+
"rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-1fc2d250fa0a912969ee93a5a445b14efea0063c",
294294
"license_expression": "mit OR bsd-simplified",
295295
"rule_url": null,
296296
"rule_relevance": 100,
@@ -368,7 +368,7 @@
368368
"match_coverage": 100.0,
369369
"matcher": "1-spdx-id",
370370
"license_expression": "mit OR bsd-simplified",
371-
"rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-a2e025db7795bed12bedb2a9726bf283",
371+
"rule_identifier": "spdx-license-identifier-mit OR bsd-simplified-1fc2d250fa0a912969ee93a5a445b14efea0063c",
372372
"rule_url": null,
373373
"matched_text": "SPDX-License-Identifier: MIT or BSD-2-Clause"
374374
}
@@ -378,7 +378,7 @@
378378
"license_clues": [],
379379
"percentage_of_license_text": 100.0,
380380
"for_license_detections": [
381-
"apache_2_0_and__mit_or_bsd_simplified-3f15b80a-b323-ff84-3c01-1559a24c2af1"
381+
"apache_2_0_and__mit_or_bsd_simplified-b459fcbf-3240-8427-3cbc-0704d95e5256"
382382
],
383383
"scan_errors": []
384384
},
@@ -439,7 +439,7 @@
439439
"match_coverage": 100.0,
440440
"matcher": "1-spdx-id",
441441
"license_expression": "artistic-2.0 OR mit",
442-
"rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-ae7a45be8a9def2cb13f52fd6f5dce69",
442+
"rule_identifier": "spdx-license-identifier-artistic-2.0 OR mit-0966c1258469e15c75e50ee743ab0c97510de07a",
443443
"rule_url": null,
444444
"matched_text": "Artistic-2.0 OR MIT"
445445
}
@@ -492,8 +492,8 @@
492492
"license_clues": [],
493493
"percentage_of_license_text": 5.0,
494494
"for_license_detections": [
495-
"artistic_2_0-c69ba991-eda9-d458-568a-670d821906e2",
496-
"artistic_2_0_or_mit-c0eb2112-a2cd-5aaa-d543-185b0984d576"
495+
"artistic_2_0-cb894725-5f2d-c39e-81e5-50ee1d4322fa",
496+
"artistic_2_0_or_mit-434f17c8-3734-fc88-9dce-bf0d423dbb81"
497497
],
498498
"scan_errors": []
499499
}

0 commit comments

Comments
 (0)