Merge branch 'main' into databricks_ips

microsoft · Jun 26, 2024 · 3e82fd3 · 3e82fd3
2 parents f6d09ef + 21daf3f
commit 3e82fd3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/scripts/build.js b/.github/scripts/build.js
@@ -292,7 +292,7 @@ function getRefIdForBranch(branchName) {
   return createShortHash(`refs/heads/${branchName}\n`);
 }
 function createShortHash(ref) {
-  const hash = createHash('sha1').update(ref, 'utf8').digest('hex')
+  const hash = createHash('sha2').update(ref, 'utf8').digest('hex')
   return hash.substring(0, 8);
 }
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ BUG FIXES:
 * Add workaround to avoid name clashes for storage accounts([#3863](https://github.com/microsoft/AzureTRE/pull/3858))
 * Resource processor fails to deploy first workspace on fresh TRE deployment ([#3950](https://github.com/microsoft/AzureTRE/issues/3950))
 * Dependency and Vulnerability updates
+* Fix Weak hashes ([#3931](https://github.com/microsoft/AzureTRE/issues/3931))
 * Add lifecycle rule to MySQL resources to stop them recreating on `update` ([#3993](https://github.com/microsoft/AzureTRE/issues/3993))
 * Fixes broken links on 'Using the Azure TRE -> Custom Templates' page of documentation ([[#4003](https://github.com/microsoft/AzureTRE/issues/4003)])
 * Fix 'Renew Lets Encrypt Certificates' GitHub Action ([#3978](https://github.com/microsoft/AzureTRE/issues/3978))