Skip to content

[pull] main from containerd:main#294

Merged
pull[bot] merged 3 commits intomeonBot:mainfrom
containerd:main
Apr 5, 2026
Merged

[pull] main from containerd:main#294
pull[bot] merged 3 commits intomeonBot:mainfrom
containerd:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Apr 5, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

cpuguy83 and others added 3 commits March 16, 2026 12:05
digest.FromBytes always uses the canonical (sha256) algorithm, so
descriptors using other algorithms (e.g. sha512) would never match
on the embedded data path, falling through to the provider.

Use desc.Digest.Algorithm().FromBytes() to correctly verify data
against whatever algorithm the descriptor specifies.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
newFakeImage used digest.NewDigestFromBytes which hex-encodes the raw
bytes rather than hashing them, producing a digest with an invalid
length. This was previously harmless since the embedded data path in
content.ReadBlob never matched, but now that the digest is validated
before use, the invalid digest causes an error.

Use digest.Canonical.FromBytes which correctly hashes the content.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
content: use descriptor digest algorithm instead of assuming sha256
@pull pull bot locked and limited conversation to collaborators Apr 5, 2026
@pull pull bot added the ⤵️ pull label Apr 5, 2026
@pull pull bot merged commit c586bec into meonBot:main Apr 5, 2026
53 of 55 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants