Move SSD digest hex formatting to typed Kotlin
ober
1372eb6d6c6a8404acb4dbc2af767e4e4d12a026
--- a/.build.yml +++ b/.build.yml @@ -5,7 +5,7 @@ packages: - make=4.4.1-r4 sources: # Build dependency: full immutable commit, mirrored in dependencies.lock.json. - - "https://git.sr.ht/~lisp/jerboa#bebe21de07a4914bf63d1419a29a18b739f65e86" + - "https://git.sr.ht/~lisp/jerboa#435e375cf4d3120e3f3c85b70ffd104cf3fd967e" # The second source is the build subject selected by the SourceHut submitter. - https://git.sr.ht/~lisp/jerboa-android tasks: @@ -14,6 +14,6 @@ tasks: test "$(apk info -v chez-scheme)" = chez-scheme-10.3.0-r2 test "$(apk info -v git)" = git-2.54.0-r0 test "$(apk info -v make)" = make-4.4.1-r4 - test "$(git -C ../jerboa rev-parse HEAD)" = bebe21de07a4914bf63d1419a29a18b739f65e86 - test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 56db688f33668ab6000749af03b58fea743939e7 + test "$(git -C ../jerboa rev-parse HEAD)" = 435e375cf4d3120e3f3c85b70ffd104cf3fd967e + test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 3df8708e7bc5edf47c535257ad4d6dbb33cc385e JERBOA="chez --libdirs .:../jerboa/lib --script" make test --- a/dependencies.lock.json +++ b/dependencies.lock.json @@ -11,8 +11,8 @@ "generator_runtime": { "name": "jerboa", "repository": "https://git.sr.ht/~lisp/jerboa", - "commit": "bebe21de07a4914bf63d1419a29a18b739f65e86", - "tree": "56db688f33668ab6000749af03b58fea743939e7" + "commit": "435e375cf4d3120e3f3c85b70ffd104cf3fd967e", + "tree": "3df8708e7bc5edf47c535257ad4d6dbb33cc385e" }, "assurance_tools": { "osv_scanner": { --- a/scripts/verify-supply-chain.sh +++ b/scripts/verify-supply-chain.sh @@ -3,8 +3,8 @@ set -eu repo=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd -P) lock="$repo/dependencies.lock.json" -jerboa_commit=bebe21de07a4914bf63d1419a29a18b739f65e86 # gitsafe:ignore -jerboa_tree=56db688f33668ab6000749af03b58fea743939e7 # gitsafe:ignore +jerboa_commit=435e375cf4d3120e3f3c85b70ffd104cf3fd967e # gitsafe:ignore +jerboa_tree=3df8708e7bc5edf47c535257ad4d6dbb33cc385e # gitsafe:ignore gradle_sha=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 jdk_macos_sha=8fa1eff40bb637a33613b2ccb8b12c70dc3661cc22cf8e784943715769a05336 jdk_linux_sha=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331 --- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -1176,6 +1176,12 @@ ((mut files : Int32) (mut bytes : Int))))) + (typed-kotlin-file "com/sfb/ssdreview/BytesHex.kt" + (typed-library (com sfb ssdreview) + (export bytesToLowerHex) + (def (bytesToLowerHex (bytes : Bytes)) : String + (bytes->lower-hex bytes)))) + (typed-kotlin-file "com/sfb/ssdreview/SsdPdfChoice.kt" (kotlin-imports (android net Uri)) (typed-library (com sfb ssdreview) @@ -6307,7 +6313,7 @@ " }" "" " private fun sha256Hex(bytes: ByteArray): String =" - " MessageDigest.getInstance(\"SHA-256\").digest(bytes).joinToString(\"\") { \"%02x\".format(it) }" + " bytesToLowerHex(MessageDigest.getInstance(\"SHA-256\").digest(bytes))" "" " private fun containedLeaf(base: File, leaf: String): File {" " require(safeLeaf(leaf)) { \"Unsafe local leaf\" }" @@ -7045,7 +7051,7 @@ " if (n < 0) break" " digest.update(buffer, 0, n)" " }" - " return digest.digest().joinToString(\"\") { \"%02x\".format(it) }" + " return bytesToLowerHex(digest.digest())" "}" "" ))