Skip to content

fix: bmff update manifest support #1284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 11, 2025
Merged

fix: bmff update manifest support #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6615a5
Support for C2PA 2.2 BMFF update manifest changes
mauricefisher64 Aug 4, 2025
25724ac
Merge branch 'main' of https://github.com/contentauth/c2pa-rs into bm…
mauricefisher64 Aug 4, 2025
490555d
Merge branch 'main' of https://github.com/contentauth/c2pa-rs into bm…
mauricefisher64 Aug 8, 2025
b7511a7
Add return of common name for cert info
mauricefisher64 Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions sdk/src/assertions/bmff_hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,8 +1132,9 @@ impl BmffHash {
crate::asset_handlers::bmff_io::write_c2pa_box(
&mut uuid_box_data,
&[],
false,
crate::asset_handlers::bmff_io::MERKLE,
&mm_cbor,
0,
)?;

let first_moof = box_infos
Expand Down Expand Up @@ -1226,8 +1227,9 @@ impl BmffHash {
crate::asset_handlers::bmff_io::write_c2pa_box(
&mut uuid_box_data,
&[],
false,
crate::asset_handlers::bmff_io::MERKLE,
&mm_cbor,
0,
)?;

// replace temp C2PA Merkle box
Expand Down Expand Up @@ -1413,8 +1415,9 @@ impl BmffHash {
crate::asset_handlers::bmff_io::write_c2pa_box(
&mut uuid_box_data,
&[],
false,
crate::asset_handlers::bmff_io::MERKLE,
cbor_data,
0,
)
.unwrap_or_default(); // this cannot fail unless the vec allocation above fails
uuid_box_data
Expand Down Expand Up @@ -1522,7 +1525,7 @@ impl BmffHash {
// the number of MM entries should match the number of ranges
if ranges.len() != mm.count {
return Err(Error::C2PAValidation(
"number of leaves does not match the Merkle".to_string(),
"number of leaves does not match the MerkleMap count".to_string(),
));
}

Expand Down Expand Up @@ -1551,20 +1554,22 @@ impl BmffHash {
.collect::<Vec<(&Vec<BmffMerkleMap>, &Vec<HashRange>)>>();

for (mm_index, (bmff_mm, ranges)) in merkle_maps_with_ranges.into_iter().enumerate() {
let current_mm = &mm_vec[mm_index];

let alg = match &current_mm.alg {
Some(a) => a,
None => self
.alg()
.ok_or(Error::HashMismatch("alg is required".to_string()))?,
};

// check all the ranges in this for this mdat
for (range_index, range) in ranges.iter().enumerate() {
let alg = match &mm_vec[mm_index].alg {
Some(a) => a,
None => self
.alg()
.ok_or(Error::HashMismatch("alg is required".to_string()))?,
};

// hash the entire fragment minus exclusions
let hash = hash_stream_by_alg(alg, reader, Some(vec![range.clone()]), false)?;

// check MerkleMap for the hash
if !mm_vec[mm_index].check_merkle_tree(
if !current_mm.check_merkle_tree(
alg,
&hash,
bmff_mm[range_index].location,
Expand Down
Loading