https://github.com/python/cpython/commit/669ef49c7d42f35da6f7ee280102353b9b37f83e
commit: 669ef49c7d42f35da6f7ee280102353b9b37f83e
branch: main
author: Seth Michael Larson <[email protected]>
committer: gpshead <[email protected]>
date: 2024-03-27T14:56:14-07:00
summary:
gh-99108: Update and check HACL* version information (GH-117295)
* Update and check HACL* version information
files:
M Misc/sbom.spdx.json
M Tools/build/generate_sbom.py
diff --git a/Misc/sbom.spdx.json b/Misc/sbom.spdx.json
index 922c927b37d249..07db46b09ae5f5 100644
--- a/Misc/sbom.spdx.json
+++ b/Misc/sbom.spdx.json
@@ -1584,14 +1584,14 @@
"checksums": [
{
"algorithm": "SHA256",
- "checksumValue":
"c23ac158b238c368389dc86bfc315263e5c0e57785da74144aea2cab9a3d51a2"
+ "checksumValue":
"e31e4ca10da91c585793c0eaf1b98aee3cb43e3a58d3d8d478593e5a6bd82927"
}
],
- "downloadLocation":
"https://github.com/hacl-star/hacl-star/archive/521af282fdf6d60227335120f18ae9309a4b8e8c.zip";,
+ "downloadLocation":
"https://github.com/hacl-star/hacl-star/archive/bb3d0dc8d9d15a5cd51094d5b69e70aa09005ff0.zip";,
"externalRefs": [
{
"referenceCategory": "SECURITY",
- "referenceLocator":
"cpe:2.3:a:hacl-star:hacl-star:521af282fdf6d60227335120f18ae9309a4b8e8c:*:*:*:*:*:*:*",
+ "referenceLocator":
"cpe:2.3:a:hacl-star:hacl-star:bb3d0dc8d9d15a5cd51094d5b69e70aa09005ff0:*:*:*:*:*:*:*",
"referenceType": "cpe23Type"
}
],
@@ -1599,7 +1599,7 @@
"name": "hacl-star",
"originator": "Organization: HACL* Developers",
"primaryPackagePurpose": "SOURCE",
- "versionInfo": "521af282fdf6d60227335120f18ae9309a4b8e8c"
+ "versionInfo": "bb3d0dc8d9d15a5cd51094d5b69e70aa09005ff0"
},
{
"SPDXID": "SPDXRef-PACKAGE-libb2",
diff --git a/Tools/build/generate_sbom.py b/Tools/build/generate_sbom.py
index 6aa4946ee227e7..5c1851f09338a0 100644
--- a/Tools/build/generate_sbom.py
+++ b/Tools/build/generate_sbom.py
@@ -183,6 +183,20 @@ def check_sbom_packages(sbom_data: dict[str, typing.Any])
-> None:
),
)
+ # HACL* specifies its expected rev in a refresh script.
+ if package["name"] == "hacl-star":
+ hacl_refresh_sh = (CPYTHON_ROOT_DIR /
"Modules/_hacl/refresh.sh").read_text()
+ hacl_expected_rev_match = re.search(
+ r"expected_hacl_star_rev=([0-9a-f]{40})",
+ hacl_refresh_sh
+ )
+ hacl_expected_rev = hacl_expected_rev_match and
hacl_expected_rev_match.group(1)
+
+ error_if(
+ hacl_expected_rev != version,
+ "HACL* SBOM version doesn't match value in
'Modules/_hacl/refresh.sh'"
+ )
+
# License must be on the approved list for SPDX.
license_concluded = package["licenseConcluded"]
error_if(
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
