From 0f97a9cc53341778506808797a64172bb27299cd Mon Sep 17 00:00:00 2001 From: Gavin Peacock Date: Thu, 10 Oct 2024 15:55:37 -0700 Subject: [PATCH] feat: Change ingredient_ids to org.cai.ingredientIds. Add an array with tag :"org.cai.ingredientIds" to action parameters to associate one or more ingredients with an action. --- make_test_images/json_manifests/C.json | 12 +- make_test_images/json_manifests/CA.json | 14 +- make_test_images/json_manifests/CACA.json | 62 +-- .../json_manifests/CACAE-uri-CA.json | 112 ++-- .../json_manifests/CACAICAICICA.json | 94 ++-- .../json_manifests/CAE-uri-CA.json | 40 +- make_test_images/json_manifests/CAI.json | 24 +- .../json_manifests/CAIAIIICAICIICAIICICA.json | 516 +++++++++--------- make_test_images/json_manifests/CAICA.json | 90 +-- make_test_images/json_manifests/CAICAI.json | 68 +-- make_test_images/json_manifests/CI.json | 14 +- make_test_images/json_manifests/CICA.json | 42 +- make_test_images/json_manifests/CICACACA.json | 50 +- .../json_manifests/CIE-sig-CA.json | 118 ++-- make_test_images/json_manifests/CII.json | 24 +- .../json_manifests/E-clm-CAICAI.json | 48 +- make_test_images/json_manifests/E-sig-CA.json | 14 +- make_test_images/json_manifests/E-uri-CA.json | 16 +- .../json_manifests/E-uri-CIE-sig-CA.json | 120 ++-- make_test_images/json_manifests/XCA.json | 16 +- make_test_images/json_manifests/XCI.json | 16 +- make_test_images/src/compare_manifests.rs | 2 +- make_test_images/src/make_test_images.rs | 4 +- sdk/src/assertions/actions.rs | 19 +- sdk/src/builder.rs | 46 +- sdk/src/signer.rs | 42 ++ 26 files changed, 812 insertions(+), 811 deletions(-) diff --git a/make_test_images/json_manifests/C.json b/make_test_images/json_manifests/C.json index ae7f699f0..679500090 100644 --- a/make_test_images/json_manifests/C.json +++ b/make_test_images/json_manifests/C.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd", + "active_manifest": "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90", "manifests": { - "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd": { + "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "C.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:8cbdca3c-5917-4f43-92f4-3a735da05e6f", + "instance_id": "xmp:iid:6aef2adf-688f-4045-a7e1-56b087eed896", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [], "assertions": [ @@ -56,9 +56,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd" + "label": "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CA.json b/make_test_images/json_manifests/CA.json index a20c30b4d..2fa33f332 100644 --- a/make_test_images/json_manifests/CA.json +++ b/make_test_images/json_manifests/CA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -61,7 +61,7 @@ "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } @@ -80,9 +80,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CACA.json b/make_test_images/json_manifests/CACA.json index 3b736f957..6e9af5537 100644 --- a/make_test_images/json_manifests/CACA.json +++ b/make_test_images/json_manifests/CACA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:c24acef2-e697-45af-9fd4-563ccf230128", + "active_manifest": "contentauth:urn:uuid:a5dc9189-1dbd-41d7-842d-b935de331547", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:a5dc9189-1dbd-41d7-842d-b935de331547": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -13,24 +13,24 @@ "version": "0.36.1" } ], - "title": "CA.jpg", + "title": "CACA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:0492a949-e4e3-4d13-a893-e9a6462ba161", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:a5dc9189-1dbd-41d7-842d-b935de331547/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "A.jpg", + "title": "CA.jpg", "format": "image/jpeg", - "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", - "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp:iid:f5528711-b891-44f9-80e7-38410fa3961f", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, - "relationship": "parentOf" + "relationship": "parentOf", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } ], "assertions": [ @@ -55,14 +55,14 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" + "hash": "G0zapTTWE/Yl2k5m6rCHSeVDVwnRu0DUNPM9Xi4uEqg=" } + ], + "org.cai.ingredientIds": [ + "xmp:iid:f5528711-b891-44f9-80e7-38410fa3961f" ] } }, @@ -80,11 +80,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:37+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:a5dc9189-1dbd-41d7-842d-b935de331547" }, - "contentauth:urn:uuid:c24acef2-e697-45af-9fd4-563ccf230128": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -96,24 +96,24 @@ "version": "0.36.1" } ], - "title": "CACA.jpg", + "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:96bd5fde-68a2-4cd9-8b4e-8da4fef602b5", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c24acef2-e697-45af-9fd4-563ccf230128/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "CA.jpg", + "title": "A.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:84cca206-6223-429b-a506-a6e2e4529015", + "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, - "relationship": "parentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "relationship": "parentOf" } ], "assertions": [ @@ -138,14 +138,14 @@ { "action": "c2pa.opened", "parameters": { + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "zeRFSCBe57n6NlId4kRSAjK5oJLnmL4uLditT59KIcE=" + "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } - ], - "ingredient_ids": [ - "xmp:iid:84cca206-6223-429b-a506-a6e2e4529015" ] } }, @@ -163,9 +163,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:c24acef2-e697-45af-9fd4-563ccf230128" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CACAE-uri-CA.json b/make_test_images/json_manifests/CACAE-uri-CA.json index 4f539ebf8..e73b3bace 100644 --- a/make_test_images/json_manifests/CACAE-uri-CA.json +++ b/make_test_images/json_manifests/CACAE-uri-CA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:5e9e5071-e6cf-4d3f-b18f-7b24827b319d", + "active_manifest": "contentauth:urn:uuid:56cae77e-438f-4871-8126-0078e2f1e6e5", "manifests": { - "contentauth:urn:uuid:5e9e5071-e6cf-4d3f-b18f-7b24827b319d": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -13,24 +13,24 @@ "version": "0.36.1" } ], - "title": "CACAE-uri-CA.jpg", + "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:e3c2c9ab-d9ab-44d8-8220-ca6df6530c46", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5e9e5071-e6cf-4d3f-b18f-7b24827b319d/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "CAE-uri-CA.jpg", + "title": "A.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:4467f38e-59bf-42b5-857e-9119b73b2368", + "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a" + "relationship": "parentOf" } ], "assertions": [ @@ -53,29 +53,24 @@ "data": { "actions": [ { - "action": "c2pa.created", - "softwareAgent": "Make Test Images 0.36.1", - "parameters": { - "name": "gradient" - }, - "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" - }, - { - "action": "c2pa.placed", + "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ - "xmp:iid:4467f38e-59bf-42b5-857e-9119b73b2368" + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "f6Whxl/ZTREBY4MQ4CkLlsQVyoCB1TwytOa0K3i77/8=" + "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } ] } }, { - "action": "c2pa.resized" + "action": "c2pa.color_adjustments", + "parameters": { + "name": "brightnessdeadbeef" + } } ] } @@ -85,11 +80,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:52+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:5e9e5071-e6cf-4d3f-b18f-7b24827b319d" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" }, - "contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a": { + "contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -103,26 +98,26 @@ ], "title": "CAE-uri-CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:4c2bf18e-1c23-4e40-a694-ef1a5335c6e6", + "instance_id": "xmp:iid:2eb96009-0745-47da-a1b5-84fd65a78685", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { "title": "E-uri-CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:cfcb602a-ad6b-4e91-908b-fce371a00aee", + "instance_id": "xmp:iid:e6132f56-2972-4ea2-b871-cdef869f26f3", "thumbnail": { "format": "image/jpeg", "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", "validation_status": [ { "code": "assertion.hashedURI.mismatch", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.actions", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.actions", "explanation": "hash does not match assertion data: self#jumbf=c2pa.assertions/c2pa.actions" } ] @@ -158,13 +153,13 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:cfcb602a-ad6b-4e91-908b-fce371a00aee" + "org.cai.ingredientIds": [ + "xmp:iid:e6132f56-2972-4ea2-b871-cdef869f26f3" ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "JdDgOYkEszN5PycbSLo7BUOg2nk4HzHACbnyZpv0HwQ=" + "hash": "5c6Vujate3HDQz5jbg74iVo5cBveU+WysaLC0GKB9Z4=" } ] } @@ -180,11 +175,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:52+00:00" + "time": "2024-10-10T22:42:41+00:00" }, - "label": "contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a" + "label": "contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f" }, - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:56cae77e-438f-4871-8126-0078e2f1e6e5": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -196,24 +191,24 @@ "version": "0.36.1" } ], - "title": "CA.jpg", + "title": "CACAE-uri-CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:ecdc5c37-7bc6-4c1f-9b77-f5df7e6c81a0", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:56cae77e-438f-4871-8126-0078e2f1e6e5/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "A.jpg", + "title": "CAE-uri-CA.jpg", "format": "image/jpeg", - "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", - "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp:iid:1fafc989-cb59-463f-bf1d-96995b941201", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, - "relationship": "parentOf" + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f" } ], "assertions": [ @@ -236,24 +231,29 @@ "data": { "actions": [ { - "action": "c2pa.opened", + "action": "c2pa.created", + "softwareAgent": "Make Test Images 0.36.1", "parameters": { + "name": "gradient" + }, + "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" + }, + { + "action": "c2pa.placed", + "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:1fafc989-cb59-463f-bf1d-96995b941201" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" + "hash": "a3/pPKZKDfpAOcpygfitaCmjdqzMvcYjtQfWx9nZWv4=" } - ], - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, { - "action": "c2pa.color_adjustments", - "parameters": { - "name": "brightnessdeadbeef" - } + "action": "c2pa.resized" } ] } @@ -263,9 +263,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:42+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:56cae77e-438f-4871-8126-0078e2f1e6e5" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CACAICAICICA.json b/make_test_images/json_manifests/CACAICAICICA.json index 71a849b5f..9c9bb12b8 100644 --- a/make_test_images/json_manifests/CACAICAICICA.json +++ b/make_test_images/json_manifests/CACAICAICICA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:47bc610b-24f6-49db-b3a3-acc4356078f6", + "active_manifest": "contentauth:urn:uuid:cd4f905f-0008-4197-aaba-b0996a5d18ca", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -55,7 +55,7 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ], "ingredient": [ @@ -80,11 +80,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" }, - "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c": { + "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -98,22 +98,22 @@ ], "title": "CICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:2bfdb524-0ae9-4d39-b598-eadb73c2103a", + "instance_id": "xmp:iid:010cf983-3669-4a0c-93f4-a09a3023eb9e", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:63274ae7-9c95-4324-83da-651546d22472", + "instance_id": "xmp:iid:301cbe92-ce6d-4b26-85bc-be45a7d67918", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } ], "assertions": [ @@ -146,13 +146,13 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:63274ae7-9c95-4324-83da-651546d22472" + "org.cai.ingredientIds": [ + "xmp:iid:301cbe92-ce6d-4b26-85bc-be45a7d67918" ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "YePaS0FudHv5qnPvHGCsbnvgbxTz3ZtLiwnCWMAmhq8=" + "hash": "P/G6UEBZ0cLIJewRRw61BXBGt2wWiPGtduzmLs8C/40=" } ] } @@ -168,11 +168,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:50+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c" + "label": "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43" }, - "contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856": { + "contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -186,10 +186,10 @@ ], "title": "CAICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:ab656237-6519-40f5-8dd4-0db2b83d3c1d", + "instance_id": "xmp:iid:85b60a40-6e52-4304-ad71-8188d222e6d4", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -206,13 +206,13 @@ { "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:462d60bc-d974-4939-a115-9d76ea13314f", + "instance_id": "xmp:iid:8101bf21-054c-45fd-8d11-953fce30d2b8", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } ], "assertions": [ @@ -237,7 +237,7 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ], "ingredient": [ @@ -257,13 +257,13 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:462d60bc-d974-4939-a115-9d76ea13314f" + "org.cai.ingredientIds": [ + "xmp:iid:8101bf21-054c-45fd-8d11-953fce30d2b8" ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", - "hash": "Gg3ZhxBbpTI5kg7SQdhJ0+IrEn9be/uLFFu8HgLQav4=" + "hash": "6i39MswWj+LFoyxOKOWwvzPQtAHLh1eyIGlrr/ygNmA=" } ] } @@ -279,11 +279,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:49+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856" + "label": "contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65" }, - "contentauth:urn:uuid:47bc610b-24f6-49db-b3a3-acc4356078f6": { + "contentauth:urn:uuid:cd4f905f-0008-4197-aaba-b0996a5d18ca": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -297,33 +297,33 @@ ], "title": "CACAICAICICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:d0cc63da-b26e-48c5-b9e6-bbfda3a02ee0", + "instance_id": "xmp:iid:93ca978a-3da0-41df-b3f0-5aa72b3922e8", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:47bc610b-24f6-49db-b3a3-acc4356078f6/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:cd4f905f-0008-4197-aaba-b0996a5d18ca/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { "title": "CAICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:777f062e-9227-4bbb-815f-06e92bd62011", + "instance_id": "xmp:iid:db907b1e-63aa-4eb9-9cbc-752115473681", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "relationship": "parentOf", - "active_manifest": "contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856" + "active_manifest": "contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65" }, { "title": "CICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:5b5b8061-86c4-4f77-a85a-2c62991f004f", + "instance_id": "xmp:iid:8215d7de-a62f-4586-9422-8a96989f7a17", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c" + "active_manifest": "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43" } ], "assertions": [ @@ -351,11 +351,11 @@ "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "8Y+BCBNUR3EeR3W1y9tmjG0oG1QXdpWYyIVIKJ5WwCA=" + "hash": "aUXYFdr781rEgmrm4vIAlkHPhobijMfm9n7rsU6EiUo=" } ], - "ingredient_ids": [ - "xmp:iid:777f062e-9227-4bbb-815f-06e92bd62011" + "org.cai.ingredientIds": [ + "xmp:iid:db907b1e-63aa-4eb9-9cbc-752115473681" ] } }, @@ -368,13 +368,13 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:5b5b8061-86c4-4f77-a85a-2c62991f004f" + "org.cai.ingredientIds": [ + "xmp:iid:8215d7de-a62f-4586-9422-8a96989f7a17" ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", - "hash": "Afwj05cXlA0k9pDitDGDCqA5hf9zjlT2uhdddWyVjMc=" + "hash": "sCAuOxB1K3pPnBrY40xV5qOoNs0iZHei8wC5N9Ium+E=" } ] } @@ -390,9 +390,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:50+00:00" + "time": "2024-10-10T22:42:40+00:00" }, - "label": "contentauth:urn:uuid:47bc610b-24f6-49db-b3a3-acc4356078f6" + "label": "contentauth:urn:uuid:cd4f905f-0008-4197-aaba-b0996a5d18ca" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CAE-uri-CA.json b/make_test_images/json_manifests/CAE-uri-CA.json index 854a43825..e94db6f43 100644 --- a/make_test_images/json_manifests/CAE-uri-CA.json +++ b/make_test_images/json_manifests/CAE-uri-CA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a", + "active_manifest": "contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f", "manifests": { - "contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a": { + "contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,26 +15,26 @@ ], "title": "CAE-uri-CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:4c2bf18e-1c23-4e40-a694-ef1a5335c6e6", + "instance_id": "xmp:iid:2eb96009-0745-47da-a1b5-84fd65a78685", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { "title": "E-uri-CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:cfcb602a-ad6b-4e91-908b-fce371a00aee", + "instance_id": "xmp:iid:e6132f56-2972-4ea2-b871-cdef869f26f3", "thumbnail": { "format": "image/jpeg", "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", "validation_status": [ { "code": "assertion.hashedURI.mismatch", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.actions", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.actions", "explanation": "hash does not match assertion data: self#jumbf=c2pa.assertions/c2pa.actions" } ] @@ -70,13 +70,13 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:cfcb602a-ad6b-4e91-908b-fce371a00aee" + "org.cai.ingredientIds": [ + "xmp:iid:e6132f56-2972-4ea2-b871-cdef869f26f3" ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "JdDgOYkEszN5PycbSLo7BUOg2nk4HzHACbnyZpv0HwQ=" + "hash": "5c6Vujate3HDQz5jbg74iVo5cBveU+WysaLC0GKB9Z4=" } ] } @@ -92,11 +92,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:52+00:00" + "time": "2024-10-10T22:42:41+00:00" }, - "label": "contentauth:urn:uuid:df2431a9-92b3-4cae-af72-8e10e5c9916a" + "label": "contentauth:urn:uuid:028a32b7-cad8-4b73-b816-d580db52258f" }, - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -110,10 +110,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -150,14 +150,14 @@ { "action": "c2pa.opened", "parameters": { + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } - ], - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, @@ -175,9 +175,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CAI.json b/make_test_images/json_manifests/CAI.json index 56f8072fe..da79d474d 100644 --- a/make_test_images/json_manifests/CAI.json +++ b/make_test_images/json_manifests/CAI.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24", + "active_manifest": "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b", "manifests": { - "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24": { + "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CAI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:aec09790-ad3a-494f-b279-651cb724bc64", + "instance_id": "xmp:iid:7b575bbd-b3b9-427b-862d-361bbc2f045a", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -66,14 +66,14 @@ { "action": "c2pa.opened", "parameters": { + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } - ], - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, @@ -86,14 +86,14 @@ { "action": "c2pa.placed", "parameters": { + "org.cai.ingredientIds": [ + "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", "hash": "ZTS3dnK1g5HZFq4JywrJSrnm15EA6x/I6sdiCWMRkqo=" } - ], - "ingredient_ids": [ - "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ] } }, @@ -108,9 +108,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:49+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24" + "label": "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CAIAIIICAICIICAIICICA.json b/make_test_images/json_manifests/CAIAIIICAICIICAIICICA.json index bd7821981..b1840ba0a 100644 --- a/make_test_images/json_manifests/CAIAIIICAICIICAIICICA.json +++ b/make_test_images/json_manifests/CAIAIIICAICIICAIICICA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:935c99a5-e669-4a30-a482-3d87e25ca718", + "active_manifest": "contentauth:urn:uuid:c762791e-e7cb-4dd6-8473-2af569bddf39", "manifests": { - "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd": { + "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -13,14 +13,26 @@ "version": "0.36.1" } ], - "title": "C.jpg", + "title": "CICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:8cbdca3c-5917-4f43-92f4-3a735da05e6f", + "instance_id": "xmp:iid:010cf983-3669-4a0c-93f4-a09a3023eb9e", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, - "ingredients": [], + "ingredients": [ + { + "title": "CA.jpg", + "format": "image/jpeg", + "instance_id": "xmp:iid:301cbe92-ce6d-4b26-85bc-be45a7d67918", + "thumbnail": { + "format": "image/jpeg", + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + }, + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" + } + ], "assertions": [ { "label": "stds.schema-org.CreativeWork", @@ -47,6 +59,23 @@ "name": "gradient" }, "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" + }, + { + "action": "c2pa.placed", + "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:301cbe92-ce6d-4b26-85bc-be45a7d67918" + ], + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", + "hash": "P/G6UEBZ0cLIJewRRw61BXBGt2wWiPGtduzmLs8C/40=" + } + ] + } + }, + { + "action": "c2pa.resized" } ] } @@ -56,11 +85,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd" + "label": "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43" }, - "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d": { + "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -72,14 +101,25 @@ "version": "0.36.1" } ], - "title": "CI.jpg", + "title": "CAI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:f18b9eb7-c4d2-4a9f-be1d-5488ddf2e897", + "instance_id": "xmp:iid:7b575bbd-b3b9-427b-862d-361bbc2f045a", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ + { + "title": "A.jpg", + "format": "image/jpeg", + "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "thumbnail": { + "format": "image/jpeg", + "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" + }, + "relationship": "parentOf" + }, { "title": "I.jpg", "format": "image/jpeg", @@ -87,7 +127,7 @@ "instance_id": "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" + "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient__1.jpeg" }, "relationship": "componentOf" } @@ -112,23 +152,35 @@ "data": { "actions": [ { - "action": "c2pa.created", - "softwareAgent": "Make Test Images 0.36.1", + "action": "c2pa.opened", "parameters": { - "name": "gradient" - }, - "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" + ], + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", + "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" + } + ] + } + }, + { + "action": "c2pa.color_adjustments", + "parameters": { + "name": "brightnesscontrast" + } }, { "action": "c2pa.placed", "parameters": { "ingredient": [ { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "Ry7N1H84gGFozMUgt6lASoJvBABgdiUaaePLoDXOsbc=" + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", + "hash": "ZTS3dnK1g5HZFq4JywrJSrnm15EA6x/I6sdiCWMRkqo=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ] } @@ -144,11 +196,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:48+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d" + "label": "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b" }, - "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24": { + "contentauth:urn:uuid:c762791e-e7cb-4dd6-8473-2af569bddf39": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -160,12 +212,12 @@ "version": "0.36.1" } ], - "title": "CAI.jpg", + "title": "CAIAIIICAICIICAIICICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:aec09790-ad3a-494f-b279-651cb724bc64", + "instance_id": "xmp:iid:3dec00d2-6df4-4fe7-9636-83e6df7c67da", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c762791e-e7cb-4dd6-8473-2af569bddf39/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -179,6 +231,17 @@ }, "relationship": "parentOf" }, + { + "title": "C.jpg", + "format": "image/jpeg", + "instance_id": "xmp:iid:9b33135f-54ea-4acc-bd52-0ccbbc3c98b6", + "thumbnail": { + "format": "image/jpeg", + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + }, + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90" + }, { "title": "I.jpg", "format": "image/jpeg", @@ -189,6 +252,50 @@ "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient__1.jpeg" }, "relationship": "componentOf" + }, + { + "title": "CA.jpg", + "format": "image/jpeg", + "instance_id": "xmp:iid:831bdfa2-99ef-4924-9941-9307b398950f", + "thumbnail": { + "format": "image/jpeg", + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + }, + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" + }, + { + "title": "CI.jpg", + "format": "image/jpeg", + "instance_id": "xmp:iid:e153d218-cb02-4ace-adc1-1f670d8845f4", + "thumbnail": { + "format": "image/jpeg", + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + }, + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930" + }, + { + "title": "CAI.jpg", + "format": "image/jpeg", + "instance_id": "xmp:iid:97e2cf6d-7d0f-408b-a8aa-a505fff003c4", + "thumbnail": { + "format": "image/jpeg", + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + }, + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b" + }, + { + "title": "CICA.jpg", + "format": "image/jpeg", + "instance_id": "xmp:iid:1d516760-e1b4-4c3d-b3aa-099734184294", + "thumbnail": { + "format": "image/jpeg", + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + }, + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43" } ], "assertions": [ @@ -219,7 +326,7 @@ "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } @@ -233,17 +340,101 @@ { "action": "c2pa.placed", "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:9b33135f-54ea-4acc-bd52-0ccbbc3c98b6" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", - "hash": "ZTS3dnK1g5HZFq4JywrJSrnm15EA6x/I6sdiCWMRkqo=" + "hash": "W5Yn9iglNj2BV+Z4oNYIaoiuS/iOYqMdteo7dEylH6I=" + } + ] + } + }, + { + "action": "c2pa.placed", + "parameters": { + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", + "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" + ] + } + }, + { + "action": "c2pa.placed", + "parameters": { + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__2", + "hash": "bhyWMrp3pyXUHoo+OpRr/J6T0VYiTVffezxprab1nXQ=" + } + ], + "org.cai.ingredientIds": [ "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ] } }, + { + "action": "c2pa.placed", + "parameters": { + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__3", + "hash": "bKegmkBMH69X/KoY1GVLoNpA2ozfzWE/0fOAWNgFgLo=" + } + ], + "org.cai.ingredientIds": [ + "xmp:iid:831bdfa2-99ef-4924-9941-9307b398950f" + ] + } + }, + { + "action": "c2pa.placed", + "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:e153d218-cb02-4ace-adc1-1f670d8845f4" + ], + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__4", + "hash": "enVCdXPQDA+t+fQHox3ffIFpjn4hw50OTX7H/OKzTn4=" + } + ] + } + }, + { + "action": "c2pa.placed", + "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:97e2cf6d-7d0f-408b-a8aa-a505fff003c4" + ], + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__5", + "hash": "Qdace3KtWSYDxSS2r0v2/BkXxbHoOkYVWAiCbbcYdOo=" + } + ] + } + }, + { + "action": "c2pa.placed", + "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:1d516760-e1b4-4c3d-b3aa-099734184294" + ], + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__6", + "hash": "kfISigrYjvkJaUvcnRA9Xy1iMfDwQ+mS9xq73MBz8E4=" + } + ] + } + }, { "action": "c2pa.resized" } @@ -255,11 +446,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:49+00:00" + "time": "2024-10-10T22:42:42+00:00" }, - "label": "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24" + "label": "contentauth:urn:uuid:c762791e-e7cb-4dd6-8473-2af569bddf39" }, - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -273,10 +464,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -313,14 +504,14 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } + ], + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, @@ -338,11 +529,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" }, - "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c": { + "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -354,24 +545,24 @@ "version": "0.36.1" } ], - "title": "CICA.jpg", + "title": "CI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:2bfdb524-0ae9-4d39-b598-eadb73c2103a", + "instance_id": "xmp:iid:ad435f5e-5ba1-4aeb-9efb-17b87acf327c", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "CA.jpg", + "title": "I.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:63274ae7-9c95-4324-83da-651546d22472", + "document_id": "xmp.did:8a00de7a-e694-43b2-a7e6-ed950421a21a", + "instance_id": "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "relationship": "componentOf" } ], "assertions": [ @@ -404,14 +595,14 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:63274ae7-9c95-4324-83da-651546d22472" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "YePaS0FudHv5qnPvHGCsbnvgbxTz3ZtLiwnCWMAmhq8=" + "hash": "Ry7N1H84gGFozMUgt6lASoJvBABgdiUaaePLoDXOsbc=" } + ], + "org.cai.ingredientIds": [ + "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ] } }, @@ -426,11 +617,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:50+00:00" + "time": "2024-10-10T22:42:37+00:00" }, - "label": "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c" + "label": "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930" }, - "contentauth:urn:uuid:935c99a5-e669-4a30-a482-3d87e25ca718": { + "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -442,92 +633,14 @@ "version": "0.36.1" } ], - "title": "CAIAIIICAICIICAIICICA.jpg", + "title": "C.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:ae09d8d2-0113-4f63-98a2-b90eaf045789", + "instance_id": "xmp:iid:6aef2adf-688f-4045-a7e1-56b087eed896", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:935c99a5-e669-4a30-a482-3d87e25ca718/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, - "ingredients": [ - { - "title": "A.jpg", - "format": "image/jpeg", - "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", - "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", - "thumbnail": { - "format": "image/jpeg", - "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" - }, - "relationship": "parentOf" - }, - { - "title": "C.jpg", - "format": "image/jpeg", - "instance_id": "xmp:iid:9786dd65-d696-4736-b9d5-73bd2197ed28", - "thumbnail": { - "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd/c2pa.assertions/c2pa.thumbnail.claim.jpeg" - }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd" - }, - { - "title": "I.jpg", - "format": "image/jpeg", - "document_id": "xmp.did:8a00de7a-e694-43b2-a7e6-ed950421a21a", - "instance_id": "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a", - "thumbnail": { - "format": "image/jpeg", - "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient__1.jpeg" - }, - "relationship": "componentOf" - }, - { - "title": "CA.jpg", - "format": "image/jpeg", - "instance_id": "xmp:iid:e6378bb7-eaae-417b-abad-30adf6e35666", - "thumbnail": { - "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" - }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" - }, - { - "title": "CI.jpg", - "format": "image/jpeg", - "instance_id": "xmp:iid:faf9d01e-b0b6-4598-9e7d-2ba0e59d1c52", - "thumbnail": { - "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d/c2pa.assertions/c2pa.thumbnail.claim.jpeg" - }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d" - }, - { - "title": "CAI.jpg", - "format": "image/jpeg", - "instance_id": "xmp:iid:6a7f4258-3981-4ea2-bf41-5102d3695014", - "thumbnail": { - "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24/c2pa.assertions/c2pa.thumbnail.claim.jpeg" - }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24" - }, - { - "title": "CICA.jpg", - "format": "image/jpeg", - "instance_id": "xmp:iid:90eeb681-9c3c-47e6-a858-fee4b233f276", - "thumbnail": { - "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c/c2pa.assertions/c2pa.thumbnail.claim.jpeg" - }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c" - } - ], + "ingredients": [], "assertions": [ { "label": "stds.schema-org.CreativeWork", @@ -548,125 +661,12 @@ "data": { "actions": [ { - "action": "c2pa.opened", - "parameters": { - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" - } - ], - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" - ] - } - }, - { - "action": "c2pa.color_adjustments", - "parameters": { - "name": "brightnesscontrast" - } - }, - { - "action": "c2pa.placed", - "parameters": { - "ingredient_ids": [ - "xmp:iid:9786dd65-d696-4736-b9d5-73bd2197ed28" - ], - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", - "hash": "limBlQQoQgyl7wSCAq7VFiTEsPYbBnSip0cjWBV8fK0=" - } - ] - } - }, - { - "action": "c2pa.placed", - "parameters": { - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" - } - ], - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" - ] - } - }, - { - "action": "c2pa.placed", - "parameters": { - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__2", - "hash": "bhyWMrp3pyXUHoo+OpRr/J6T0VYiTVffezxprab1nXQ=" - } - ], - "ingredient_ids": [ - "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" - ] - } - }, - { - "action": "c2pa.placed", - "parameters": { - "ingredient_ids": [ - "xmp:iid:e6378bb7-eaae-417b-abad-30adf6e35666" - ], - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__3", - "hash": "RWQ4eH8kpZ6hQYPMgfbdyLDiJreFfPmRp0vJApSkohU=" - } - ] - } - }, - { - "action": "c2pa.placed", - "parameters": { - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__4", - "hash": "U7U4waKrTXjgnv5C/COO5ZKSBP9xIUusi9mCxa6gn4c=" - } - ], - "ingredient_ids": [ - "xmp:iid:faf9d01e-b0b6-4598-9e7d-2ba0e59d1c52" - ] - } - }, - { - "action": "c2pa.placed", - "parameters": { - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__5", - "hash": "8/PrqZYaD70vNHAaIN6JFBI3D+uyAxQYYQ6LkqGWPg0=" - } - ], - "ingredient_ids": [ - "xmp:iid:6a7f4258-3981-4ea2-bf41-5102d3695014" - ] - } - }, - { - "action": "c2pa.placed", + "action": "c2pa.created", + "softwareAgent": "Make Test Images 0.36.1", "parameters": { - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__6", - "hash": "efFmtZxzD6j13snwJhoGZlaDHOQarD6iof1X63BTO9U=" - } - ], - "ingredient_ids": [ - "xmp:iid:90eeb681-9c3c-47e6-a858-fee4b233f276" - ] - } - }, - { - "action": "c2pa.resized" + "name": "gradient" + }, + "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" } ] } @@ -676,9 +676,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:52+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:935c99a5-e669-4a30-a482-3d87e25ca718" + "label": "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CAICA.json b/make_test_images/json_manifests/CAICA.json index a7f2fbf2f..abc652c17 100644 --- a/make_test_images/json_manifests/CAICA.json +++ b/make_test_images/json_manifests/CAICA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856", + "active_manifest": "contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -13,12 +13,12 @@ "version": "0.36.1" } ], - "title": "CA.jpg", + "title": "CAICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:85b60a40-6e52-4304-ad71-8188d222e6d4", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -31,6 +31,17 @@ "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, "relationship": "parentOf" + }, + { + "title": "CA.jpg", + "format": "image/jpeg", + "instance_id": "xmp:iid:8101bf21-054c-45fd-8d11-953fce30d2b8", + "thumbnail": { + "format": "image/jpeg", + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + }, + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } ], "assertions": [ @@ -61,7 +72,7 @@ "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } @@ -71,6 +82,23 @@ "parameters": { "name": "brightnesscontrast" } + }, + { + "action": "c2pa.placed", + "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:8101bf21-054c-45fd-8d11-953fce30d2b8" + ], + "ingredient": [ + { + "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", + "hash": "6i39MswWj+LFoyxOKOWwvzPQtAHLh1eyIGlrr/ygNmA=" + } + ] + } + }, + { + "action": "c2pa.resized" } ] } @@ -80,11 +108,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:bbaf38d4-ac20-4c55-b191-02c01d4b4c65" }, - "contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -96,12 +124,12 @@ "version": "0.36.1" } ], - "title": "CAICA.jpg", + "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:ab656237-6519-40f5-8dd4-0db2b83d3c1d", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -114,17 +142,6 @@ "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, "relationship": "parentOf" - }, - { - "title": "CA.jpg", - "format": "image/jpeg", - "instance_id": "xmp:iid:462d60bc-d974-4939-a115-9d76ea13314f", - "thumbnail": { - "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" - }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" } ], "assertions": [ @@ -149,14 +166,14 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } + ], + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, @@ -165,23 +182,6 @@ "parameters": { "name": "brightnesscontrast" } - }, - { - "action": "c2pa.placed", - "parameters": { - "ingredient_ids": [ - "xmp:iid:462d60bc-d974-4939-a115-9d76ea13314f" - ], - "ingredient": [ - { - "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", - "hash": "Gg3ZhxBbpTI5kg7SQdhJ0+IrEn9be/uLFFu8HgLQav4=" - } - ] - } - }, - { - "action": "c2pa.resized" } ] } @@ -191,9 +191,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:49+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:b787cadd-cd47-40ed-a15b-c3205d94a856" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CAICAI.json b/make_test_images/json_manifests/CAICAI.json index ea5974635..f15e254c6 100644 --- a/make_test_images/json_manifests/CAICAI.json +++ b/make_test_images/json_manifests/CAICAI.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64", + "active_manifest": "contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00", "manifests": { - "contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64": { + "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -13,12 +13,12 @@ "version": "0.36.1" } ], - "title": "CAICAI.jpg", + "title": "CAI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:0e6c7d71-5225-43ac-b6c0-bda3d715913a", + "instance_id": "xmp:iid:7b575bbd-b3b9-427b-862d-361bbc2f045a", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -33,15 +33,15 @@ "relationship": "parentOf" }, { - "title": "CAI.jpg", + "title": "I.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:5bb71e61-3a42-4091-87bb-66b218cf00cb", + "document_id": "xmp.did:8a00de7a-e694-43b2-a7e6-ed950421a21a", + "instance_id": "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient__1.jpeg" }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24" + "relationship": "componentOf" } ], "assertions": [ @@ -66,14 +66,14 @@ { "action": "c2pa.opened", "parameters": { + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } - ], - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, @@ -86,14 +86,14 @@ { "action": "c2pa.placed", "parameters": { + "org.cai.ingredientIds": [ + "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", - "hash": "AzQ38WE4DmM/cjcKpnd9hmfVZTKwn0clmAG9J2bLdmY=" + "hash": "ZTS3dnK1g5HZFq4JywrJSrnm15EA6x/I6sdiCWMRkqo=" } - ], - "ingredient_ids": [ - "xmp:iid:5bb71e61-3a42-4091-87bb-66b218cf00cb" ] } }, @@ -108,11 +108,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:50+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64" + "label": "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b" }, - "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24": { + "contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -124,12 +124,12 @@ "version": "0.36.1" } ], - "title": "CAI.jpg", + "title": "CAICAI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:aec09790-ad3a-494f-b279-651cb724bc64", + "instance_id": "xmp:iid:9b44d5f7-6987-4b28-a23a-a0b3dfa06e07", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -144,15 +144,15 @@ "relationship": "parentOf" }, { - "title": "I.jpg", + "title": "CAI.jpg", "format": "image/jpeg", - "document_id": "xmp.did:8a00de7a-e694-43b2-a7e6-ed950421a21a", - "instance_id": "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a", + "instance_id": "xmp:iid:3d11fba7-8498-4dd8-97c6-ebe83286869b", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient__1.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, - "relationship": "componentOf" + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b" } ], "assertions": [ @@ -177,7 +177,7 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ], "ingredient": [ @@ -200,11 +200,11 @@ "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", - "hash": "ZTS3dnK1g5HZFq4JywrJSrnm15EA6x/I6sdiCWMRkqo=" + "hash": "UVtaNWXqSbgbMggcEl/rRQKUwYS4IpG05s4IULBC8yQ=" } ], - "ingredient_ids": [ - "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" + "org.cai.ingredientIds": [ + "xmp:iid:3d11fba7-8498-4dd8-97c6-ebe83286869b" ] } }, @@ -219,9 +219,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:49+00:00" + "time": "2024-10-10T22:42:40+00:00" }, - "label": "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24" + "label": "contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CI.json b/make_test_images/json_manifests/CI.json index d8c5fb8bd..9926422e2 100644 --- a/make_test_images/json_manifests/CI.json +++ b/make_test_images/json_manifests/CI.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d", + "active_manifest": "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930", "manifests": { - "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d": { + "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:f18b9eb7-c4d2-4a9f-be1d-5488ddf2e897", + "instance_id": "xmp:iid:ad435f5e-5ba1-4aeb-9efb-17b87acf327c", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -69,7 +69,7 @@ "hash": "Ry7N1H84gGFozMUgt6lASoJvBABgdiUaaePLoDXOsbc=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ] } @@ -85,9 +85,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:48+00:00" + "time": "2024-10-10T22:42:37+00:00" }, - "label": "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d" + "label": "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CICA.json b/make_test_images/json_manifests/CICA.json index ac19fd502..d5a54374a 100644 --- a/make_test_images/json_manifests/CICA.json +++ b/make_test_images/json_manifests/CICA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c", + "active_manifest": "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -55,14 +55,14 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } + ], + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, @@ -80,11 +80,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" }, - "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c": { + "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -98,22 +98,22 @@ ], "title": "CICA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:2bfdb524-0ae9-4d39-b598-eadb73c2103a", + "instance_id": "xmp:iid:010cf983-3669-4a0c-93f4-a09a3023eb9e", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:63274ae7-9c95-4324-83da-651546d22472", + "instance_id": "xmp:iid:301cbe92-ce6d-4b26-85bc-be45a7d67918", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } ], "assertions": [ @@ -146,14 +146,14 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:63274ae7-9c95-4324-83da-651546d22472" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "YePaS0FudHv5qnPvHGCsbnvgbxTz3ZtLiwnCWMAmhq8=" + "hash": "P/G6UEBZ0cLIJewRRw61BXBGt2wWiPGtduzmLs8C/40=" } + ], + "org.cai.ingredientIds": [ + "xmp:iid:301cbe92-ce6d-4b26-85bc-be45a7d67918" ] } }, @@ -168,9 +168,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:50+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:07cf845e-f0ae-4ed0-b964-7fa6dcd27a9c" + "label": "contentauth:urn:uuid:e4880caf-33de-48d6-8816-56f78a6edc43" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CICACACA.json b/make_test_images/json_manifests/CICACACA.json index 372d53311..7268177af 100644 --- a/make_test_images/json_manifests/CICACACA.json +++ b/make_test_images/json_manifests/CICACACA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:a64c3647-f5c9-4786-8f0c-2536b864a701", + "active_manifest": "contentauth:urn:uuid:0b7fcdba-1da5-43e2-a8bc-448a0943ec22", "manifests": { - "contentauth:urn:uuid:a64c3647-f5c9-4786-8f0c-2536b864a701": { + "contentauth:urn:uuid:0b7fcdba-1da5-43e2-a8bc-448a0943ec22": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,22 +15,22 @@ ], "title": "CICACACA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:e4fba062-cd8a-4171-90fd-a39d20fb02ed", + "instance_id": "xmp:iid:f7000916-7cce-4e84-abe0-3f0654360189", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:a64c3647-f5c9-4786-8f0c-2536b864a701/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:0b7fcdba-1da5-43e2-a8bc-448a0943ec22/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:23d43f2c-ad29-4a69-ab77-0de417ca9aa7", + "instance_id": "xmp:iid:d591f601-90e7-4c63-b364-ab83f657f61a", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } ], "assertions": [ @@ -63,13 +63,13 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:23d43f2c-ad29-4a69-ab77-0de417ca9aa7" + "org.cai.ingredientIds": [ + "xmp:iid:d591f601-90e7-4c63-b364-ab83f657f61a" ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "pCRc0JdZu4sdL5S+RGv3L+X7XL5j7ElqlRRkLHq8cOs=" + "hash": "XCtLy0dLqbq2jhSJl3wFiOdkbTlqZIEMJMaiOpQJ8CE=" } ] } @@ -77,14 +77,14 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp:iid:23d43f2c-ad29-4a69-ab77-0de417ca9aa7" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "pCRc0JdZu4sdL5S+RGv3L+X7XL5j7ElqlRRkLHq8cOs=" + "hash": "XCtLy0dLqbq2jhSJl3wFiOdkbTlqZIEMJMaiOpQJ8CE=" } + ], + "org.cai.ingredientIds": [ + "xmp:iid:d591f601-90e7-4c63-b364-ab83f657f61a" ] } }, @@ -94,11 +94,11 @@ "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "pCRc0JdZu4sdL5S+RGv3L+X7XL5j7ElqlRRkLHq8cOs=" + "hash": "XCtLy0dLqbq2jhSJl3wFiOdkbTlqZIEMJMaiOpQJ8CE=" } ], - "ingredient_ids": [ - "xmp:iid:23d43f2c-ad29-4a69-ab77-0de417ca9aa7" + "org.cai.ingredientIds": [ + "xmp:iid:d591f601-90e7-4c63-b364-ab83f657f61a" ] } }, @@ -113,11 +113,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:51+00:00" + "time": "2024-10-10T22:42:40+00:00" }, - "label": "contentauth:urn:uuid:a64c3647-f5c9-4786-8f0c-2536b864a701" + "label": "contentauth:urn:uuid:0b7fcdba-1da5-43e2-a8bc-448a0943ec22" }, - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -131,10 +131,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -171,7 +171,7 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ], "ingredient": [ @@ -196,9 +196,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CIE-sig-CA.json b/make_test_images/json_manifests/CIE-sig-CA.json index 90ae9373b..cba38d856 100644 --- a/make_test_images/json_manifests/CIE-sig-CA.json +++ b/make_test_images/json_manifests/CIE-sig-CA.json @@ -1,8 +1,8 @@ { - "active_manifest": "contentauth:urn:uuid:2cb1ab90-782d-4cc3-8e13-725bd98fe4cb", + "active_manifest": "contentauth:urn:uuid:60297ced-8e85-4bab-808d-fbabc93571a6", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { - "claim_generator": "make_test_xxxxxx/0.36.1 c2pa-rs/0.36.1", + "contentauth:urn:uuid:60297ced-8e85-4bab-808d-fbabc93571a6": { + "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { "name": "make_test_images", @@ -13,24 +13,36 @@ "version": "0.36.1" } ], - "title": "CA.jpg", + "title": "CIE-sig-CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:1efa9a13-04ab-45dc-a064-94dfd9fd6c15", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:60297ced-8e85-4bab-808d-fbabc93571a6/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "A.jpg", + "title": "E-sig-CA.jpg", "format": "image/jpeg", - "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", - "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp:iid:ed156acd-25da-45f9-bd63-cb80de995dee", "thumbnail": { "format": "image/jpeg", "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, - "relationship": "parentOf" + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", + "validation_status": [ + { + "code": "timeStamp.mismatch", + "url": "Cose_Sign1", + "explanation": "timestamp did not match signed data" + }, + { + "code": "general.error", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.signature", + "explanation": "claim signature is not valid: CoseTimeStampMismatch" + } + ] } ], "assertions": [ @@ -53,24 +65,29 @@ "data": { "actions": [ { - "action": "c2pa.opened", + "action": "c2pa.created", + "softwareAgent": "Make Test Images 0.36.1", "parameters": { + "name": "gradient" + }, + "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" + }, + { + "action": "c2pa.placed", + "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:ed156acd-25da-45f9-bd63-cb80de995dee" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" + "hash": "0gsConiP0VYhZ9iqPKI42w/J05yc7KT9f3jX3SvZRCw=" } - ], - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, { - "action": "c2pa.color_adjustments", - "parameters": { - "name": "brightnesscontrast" - } + "action": "c2pa.resized" } ] } @@ -79,12 +96,13 @@ "signature_info": { "alg": "Ps256", "issuer": "C2PA Test Signing Cert", - "cert_serial_number": "720724073027128164015125666832722375746636448153" + "cert_serial_number": "720724073027128164015125666832722375746636448153", + "time": "2024-10-10T22:42:41+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:60297ced-8e85-4bab-808d-fbabc93571a6" }, - "contentauth:urn:uuid:2cb1ab90-782d-4cc3-8e13-725bd98fe4cb": { - "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { + "claim_generator": "make_test_xxxxxx/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { "name": "make_test_images", @@ -95,36 +113,24 @@ "version": "0.36.1" } ], - "title": "CIE-sig-CA.jpg", + "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:5192d770-de01-4392-810e-17c2a96cac6c", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:2cb1ab90-782d-4cc3-8e13-725bd98fe4cb/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "E-sig-CA.jpg", + "title": "A.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:374d8a4b-ed34-496e-b1b4-7e3296ec5ee7", + "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", "thumbnail": { "format": "image/jpeg", "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", - "validation_status": [ - { - "code": "timeStamp.mismatch", - "url": "Cose_Sign1", - "explanation": "timestamp did not match signed data" - }, - { - "code": "general.error", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.signature", - "explanation": "claim signature is not valid: CoseTimeStampMismatch" - } - ] + "relationship": "parentOf" } ], "assertions": [ @@ -147,29 +153,24 @@ "data": { "actions": [ { - "action": "c2pa.created", - "softwareAgent": "Make Test Images 0.36.1", - "parameters": { - "name": "gradient" - }, - "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" - }, - { - "action": "c2pa.placed", + "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ - "xmp:iid:374d8a4b-ed34-496e-b1b4-7e3296ec5ee7" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "STCnoXA0pXzpI3bGZeOMIX0oJ8p0zcSeDvunRr8LDfw=" + "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } + ], + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, { - "action": "c2pa.resized" + "action": "c2pa.color_adjustments", + "parameters": { + "name": "brightnesscontrast" + } } ] } @@ -178,10 +179,9 @@ "signature_info": { "alg": "Ps256", "issuer": "C2PA Test Signing Cert", - "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:51+00:00" + "cert_serial_number": "720724073027128164015125666832722375746636448153" }, - "label": "contentauth:urn:uuid:2cb1ab90-782d-4cc3-8e13-725bd98fe4cb" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/CII.json b/make_test_images/json_manifests/CII.json index 2e0040f71..f592888b7 100644 --- a/make_test_images/json_manifests/CII.json +++ b/make_test_images/json_manifests/CII.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:f8a14c8a-af83-4802-beea-290d15f61b21", + "active_manifest": "contentauth:urn:uuid:c3c82103-44ce-4739-bbe9-e2a939e5b946", "manifests": { - "contentauth:urn:uuid:f8a14c8a-af83-4802-beea-290d15f61b21": { + "contentauth:urn:uuid:c3c82103-44ce-4739-bbe9-e2a939e5b946": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CII.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:94d19f53-3731-49a4-be8c-d4084608778f", + "instance_id": "xmp:iid:1cad3e4f-582f-4377-be51-347691ed1536", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:f8a14c8a-af83-4802-beea-290d15f61b21/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c3c82103-44ce-4739-bbe9-e2a939e5b946/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -63,28 +63,28 @@ { "action": "c2pa.placed", "parameters": { + "org.cai.ingredientIds": [ + "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "Ry7N1H84gGFozMUgt6lASoJvBABgdiUaaePLoDXOsbc=" } - ], - "ingredient_ids": [ - "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ] } }, { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ - "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "Ry7N1H84gGFozMUgt6lASoJvBABgdiUaaePLoDXOsbc=" } + ], + "org.cai.ingredientIds": [ + "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ] } }, @@ -99,9 +99,9 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:49+00:00" + "time": "2024-10-10T22:42:38+00:00" }, - "label": "contentauth:urn:uuid:f8a14c8a-af83-4802-beea-290d15f61b21" + "label": "contentauth:urn:uuid:c3c82103-44ce-4739-bbe9-e2a939e5b946" } } } \ No newline at end of file diff --git a/make_test_images/json_manifests/E-clm-CAICAI.json b/make_test_images/json_manifests/E-clm-CAICAI.json index 4560022b3..26cff6bed 100644 --- a/make_test_images/json_manifests/E-clm-CAICAI.json +++ b/make_test_images/json_manifests/E-clm-CAICAI.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64", + "active_manifest": "contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00", "manifests": { - "contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64": { + "contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CAICAI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:0e6c7d71-5225-43ac-b6c0-bda3d715913a", + "instance_id": "xmp:iid:9b44d5f7-6987-4b28-a23a-a0b3dfa06e07", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -35,13 +35,13 @@ { "title": "CAI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:5bb71e61-3a42-4091-87bb-66b218cf00cb", + "instance_id": "xmp:iid:3d11fba7-8498-4dd8-97c6-ebe83286869b", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "relationship": "componentOf", - "active_manifest": "contentbeef:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24" + "active_manifest": "contentbeef:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b" } ], "assertions": [ @@ -72,7 +72,7 @@ "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } @@ -89,11 +89,11 @@ "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient__1", - "hash": "AzQ38WE4DmM/cjcKpnd9hmfVZTKwn0clmAG9J2bLdmY=" + "hash": "UVtaNWXqSbgbMggcEl/rRQKUwYS4IpG05s4IULBC8yQ=" } ], - "ingredient_ids": [ - "xmp:iid:5bb71e61-3a42-4091-87bb-66b218cf00cb" + "org.cai.ingredientIds": [ + "xmp:iid:3d11fba7-8498-4dd8-97c6-ebe83286869b" ] } }, @@ -108,11 +108,11 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:50+00:00" + "time": "2024-10-10T22:42:40+00:00" }, - "label": "contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64" + "label": "contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00" }, - "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24": { + "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -126,10 +126,10 @@ ], "title": "CAI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:aec09790-ad3a-494f-b279-651cb724bc64", + "instance_id": "xmp:iid:7b575bbd-b3b9-427b-862d-361bbc2f045a", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -177,14 +177,14 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" - ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } + ], + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, @@ -203,7 +203,7 @@ "hash": "ZTS3dnK1g5HZFq4JywrJSrnm15EA6x/I6sdiCWMRkqo=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ] } @@ -219,20 +219,20 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:49+00:00" + "time": "2024-10-10T22:42:39+00:00" }, - "label": "contentauth:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24" + "label": "contentauth:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b" } }, "validation_status": [ { "code": "assertion.hashedURI.mismatch", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:3b929e55-4fd3-4500-94ae-6026f2cdfb64/c2pa.assertions/c2pa.ingredient__1", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:bef41f24-13aa-4040-8efa-08e5e85c4a00/c2pa.assertions/c2pa.ingredient__1", "explanation": "hash does not match assertion data: self#jumbf=c2pa.assertions/c2pa.ingredient__1" }, { "code": "claim.missing", - "url": "self#jumbf=/c2pa/contentbeef:urn:uuid:5faa5997-96df-418b-8bd3-d74cefde8a24", + "url": "self#jumbf=/c2pa/contentbeef:urn:uuid:7aae25df-bad6-42de-8f2b-7d241ba0003b", "explanation": "ingredient not found" } ] diff --git a/make_test_images/json_manifests/E-sig-CA.json b/make_test_images/json_manifests/E-sig-CA.json index a3378dadf..6e1af6be5 100644 --- a/make_test_images/json_manifests/E-sig-CA.json +++ b/make_test_images/json_manifests/E-sig-CA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_xxxxxx/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -55,7 +55,7 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ], "ingredient": [ @@ -81,7 +81,7 @@ "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } }, "validation_status": [ @@ -92,7 +92,7 @@ }, { "code": "general.error", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.signature", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.signature", "explanation": "claim signature is not valid: CoseTimeStampMismatch" } ] diff --git a/make_test_images/json_manifests/E-uri-CA.json b/make_test_images/json_manifests/E-uri-CA.json index e357bd2eb..fad9f0c3b 100644 --- a/make_test_images/json_manifests/E-uri-CA.json +++ b/make_test_images/json_manifests/E-uri-CA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -55,7 +55,7 @@ { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ], "ingredient": [ @@ -80,15 +80,15 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } }, "validation_status": [ { "code": "assertion.hashedURI.mismatch", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.actions", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.actions", "explanation": "hash does not match assertion data: self#jumbf=c2pa.assertions/c2pa.actions" } ] diff --git a/make_test_images/json_manifests/E-uri-CIE-sig-CA.json b/make_test_images/json_manifests/E-uri-CIE-sig-CA.json index 23dc845a2..ac576ee22 100644 --- a/make_test_images/json_manifests/E-uri-CIE-sig-CA.json +++ b/make_test_images/json_manifests/E-uri-CIE-sig-CA.json @@ -1,8 +1,8 @@ { - "active_manifest": "contentauth:urn:uuid:2cb1ab90-782d-4cc3-8e13-725bd98fe4cb", + "active_manifest": "contentauth:urn:uuid:60297ced-8e85-4bab-808d-fbabc93571a6", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { - "claim_generator": "make_test_xxxxxx/0.36.1 c2pa-rs/0.36.1", + "contentauth:urn:uuid:60297ced-8e85-4bab-808d-fbabc93571a6": { + "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { "name": "make_test_images", @@ -13,24 +13,36 @@ "version": "0.36.1" } ], - "title": "CA.jpg", + "title": "CIE-sig-CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:1efa9a13-04ab-45dc-a064-94dfd9fd6c15", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:60297ced-8e85-4bab-808d-fbabc93571a6/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "A.jpg", + "title": "E-sig-CA.jpg", "format": "image/jpeg", - "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", - "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp:iid:ed156acd-25da-45f9-bd63-cb80de995dee", "thumbnail": { "format": "image/jpeg", "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, - "relationship": "parentOf" + "relationship": "componentOf", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", + "validation_status": [ + { + "code": "timeStamp.mismatch", + "url": "Cose_Sign1", + "explanation": "timestamp did not match signed data" + }, + { + "code": "general.error", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.signature", + "explanation": "claim signature is not valid: CoseTimeStampMismatch" + } + ] } ], "assertions": [ @@ -53,24 +65,29 @@ "data": { "actions": [ { - "action": "c2pa.opened", + "action": "c2pa.created", + "softwareAgent": "Make Test Images 0.36.1", + "parameters": { + "name": "gradient" + }, + "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" + }, + { + "action": "c2pa.placed", "parameters": { + "org.cai.ingredientIds": [ + "xmp:iid:ed156acd-25da-45f9-bd63-cb80de995dee" + ], "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" + "hash": "0gsConiP0VYhZ9iqPKI42w/J05yc7KT9f3jX3SvZRCw=" } - ], - "ingredient_ids": [ - "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, { - "action": "c2pa.color_adjustments", - "parameters": { - "name": "brightnessdeadbeef" - } + "action": "c2pa.resized" } ] } @@ -79,12 +96,13 @@ "signature_info": { "alg": "Ps256", "issuer": "C2PA Test Signing Cert", - "cert_serial_number": "720724073027128164015125666832722375746636448153" + "cert_serial_number": "720724073027128164015125666832722375746636448153", + "time": "2024-10-10T22:42:41+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:60297ced-8e85-4bab-808d-fbabc93571a6" }, - "contentauth:urn:uuid:2cb1ab90-782d-4cc3-8e13-725bd98fe4cb": { - "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { + "claim_generator": "make_test_xxxxxx/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { "name": "make_test_images", @@ -95,36 +113,24 @@ "version": "0.36.1" } ], - "title": "CIE-sig-CA.jpg", + "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:5192d770-de01-4392-810e-17c2a96cac6c", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:2cb1ab90-782d-4cc3-8e13-725bd98fe4cb/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { - "title": "E-sig-CA.jpg", + "title": "A.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:374d8a4b-ed34-496e-b1b4-7e3296ec5ee7", + "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb", + "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb", "thumbnail": { "format": "image/jpeg", "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg" }, - "relationship": "componentOf", - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", - "validation_status": [ - { - "code": "timeStamp.mismatch", - "url": "Cose_Sign1", - "explanation": "timestamp did not match signed data" - }, - { - "code": "general.error", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.signature", - "explanation": "claim signature is not valid: CoseTimeStampMismatch" - } - ] + "relationship": "parentOf" } ], "assertions": [ @@ -147,29 +153,24 @@ "data": { "actions": [ { - "action": "c2pa.created", - "softwareAgent": "Make Test Images 0.36.1", - "parameters": { - "name": "gradient" - }, - "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia" - }, - { - "action": "c2pa.placed", + "action": "c2pa.opened", "parameters": { "ingredient": [ { "url": "self#jumbf=c2pa.assertions/c2pa.ingredient", - "hash": "STCnoXA0pXzpI3bGZeOMIX0oJ8p0zcSeDvunRr8LDfw=" + "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } ], - "ingredient_ids": [ - "xmp:iid:374d8a4b-ed34-496e-b1b4-7e3296ec5ee7" + "org.cai.ingredientIds": [ + "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } }, { - "action": "c2pa.resized" + "action": "c2pa.color_adjustments", + "parameters": { + "name": "brightnessdeadbeef" + } } ] } @@ -178,21 +179,20 @@ "signature_info": { "alg": "Ps256", "issuer": "C2PA Test Signing Cert", - "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:51+00:00" + "cert_serial_number": "720724073027128164015125666832722375746636448153" }, - "label": "contentauth:urn:uuid:2cb1ab90-782d-4cc3-8e13-725bd98fe4cb" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } }, "validation_status": [ { "code": "ingredient.hashedURI.mismatch", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", "explanation": "ingredient hash incorrect" }, { "code": "assertion.hashedURI.mismatch", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.actions", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.actions", "explanation": "hash does not match assertion data: self#jumbf=c2pa.assertions/c2pa.actions" } ] diff --git a/make_test_images/json_manifests/XCA.json b/make_test_images/json_manifests/XCA.json index 0bd1b4872..44cb044dd 100644 --- a/make_test_images/json_manifests/XCA.json +++ b/make_test_images/json_manifests/XCA.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737", + "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2", "manifests": { - "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": { + "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CA.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6", + "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -61,7 +61,7 @@ "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4=" } ], - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb" ] } @@ -80,15 +80,15 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:47+00:00" + "time": "2024-10-10T22:42:36+00:00" }, - "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737" + "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2" } }, "validation_status": [ { "code": "assertion.dataHash.mismatch", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.hash.data", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.hash.data", "explanation": "asset hash error, name: jumbf manifest, error: hash verification( Hashes do not match )" } ] diff --git a/make_test_images/json_manifests/XCI.json b/make_test_images/json_manifests/XCI.json index 511e507d2..4ca497f91 100644 --- a/make_test_images/json_manifests/XCI.json +++ b/make_test_images/json_manifests/XCI.json @@ -1,7 +1,7 @@ { - "active_manifest": "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d", + "active_manifest": "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930", "manifests": { - "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d": { + "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930": { "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1", "claim_generator_info": [ { @@ -15,10 +15,10 @@ ], "title": "CI.jpg", "format": "image/jpeg", - "instance_id": "xmp:iid:f18b9eb7-c4d2-4a9f-be1d-5488ddf2e897", + "instance_id": "xmp:iid:ad435f5e-5ba1-4aeb-9efb-17b87acf327c", "thumbnail": { "format": "image/jpeg", - "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d/c2pa.assertions/c2pa.thumbnail.claim.jpeg" + "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930/c2pa.assertions/c2pa.thumbnail.claim.jpeg" }, "ingredients": [ { @@ -63,7 +63,7 @@ { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [ + "org.cai.ingredientIds": [ "xmp.iid:8a00de7a-e694-43b2-a7e6-ed950421a21a" ], "ingredient": [ @@ -85,15 +85,15 @@ "alg": "Ps256", "issuer": "C2PA Test Signing Cert", "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2024-10-08T22:56:48+00:00" + "time": "2024-10-10T22:42:37+00:00" }, - "label": "contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d" + "label": "contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930" } }, "validation_status": [ { "code": "assertion.dataHash.mismatch", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:c78bd36d-7fca-4727-91c4-4bc90cdbd48d/c2pa.assertions/c2pa.hash.data", + "url": "self#jumbf=/c2pa/contentauth:urn:uuid:d0bd056e-61c0-465f-81e1-82cbb3154930/c2pa.assertions/c2pa.hash.data", "explanation": "asset hash error, name: jumbf manifest, error: hash verification( Hashes do not match )" } ] diff --git a/make_test_images/src/compare_manifests.rs b/make_test_images/src/compare_manifests.rs index 18847d0dd..2f1747577 100644 --- a/make_test_images/src/compare_manifests.rs +++ b/make_test_images/src/compare_manifests.rs @@ -181,7 +181,7 @@ fn compare_json_values( (val1, val2) if val1 != val2 => { if !(path.ends_with(".instance_id") || path.ends_with(".time") - || path.ends_with(".parameters.ingredient_ids[0]") + || path.contains(".parameters.org.cai.ingredientIds") || path.contains(".hash") || val1.is_string() && val2.is_string() diff --git a/make_test_images/src/make_test_images.rs b/make_test_images/src/make_test_images.rs index 2394d268f..8eeef3840 100644 --- a/make_test_images/src/make_test_images.rs +++ b/make_test_images/src/make_test_images.rs @@ -304,7 +304,7 @@ impl MakeTestImages { { "action": "c2pa.opened", "parameters": { - "ingredient_ids": [&instance_id] + "org.cai.ingredientIds": [&instance_id] } } )); @@ -389,7 +389,7 @@ impl MakeTestImages { { "action": "c2pa.placed", "parameters": { - "ingredient_ids": [&instance_id] + "org.cai.ingredientIds": [&instance_id] } } )); diff --git a/sdk/src/assertions/actions.rs b/sdk/src/assertions/actions.rs index ea52ab843..f439fb904 100644 --- a/sdk/src/assertions/actions.rs +++ b/sdk/src/assertions/actions.rs @@ -26,6 +26,7 @@ use crate::{ }; const ASSERTION_CREATION_VERSION: usize = 2; +pub const CAI_INGREDIENT_IDS: &str = "org.cai.ingredientIds"; /// Specification defined C2PA actions pub mod c2pa_action { @@ -119,7 +120,7 @@ pub struct Action { /// This is NOT the instanceID in the spec /// It is now deprecated but was previously used to map the action to an ingredient #[serde(rename = "instanceId", skip_serializing)] // this should never be written to CBOR - #[deprecated(since = "0.37.0", note = "Use `ingredient_ids` instead")] + #[deprecated(since = "0.37.0", note = "Use `org.cai.ingredientIds` instead")] instance_id: Option, /// Additional parameters of the action. These vary by the type of action. @@ -189,7 +190,7 @@ impl Action { /// Returns the value of the `xmpMM:InstanceID` property for the modified /// (output) resource. - #[deprecated(since = "0.37.0", note = "Use `ingredient_ids` instead")] + #[deprecated(since = "0.37.0", note = "Use `org.cai.ingredientIds` instead")] pub fn instance_id(&self) -> Option<&str> { #[allow(deprecated)] self.instance_id.as_deref() @@ -278,9 +279,9 @@ impl Action { self } - // internal function to return any ingredients referenced by this action - pub(crate) fn ingredient_ids(&self) -> Option> { - match self.get_parameter("ingredient_ids") { + // Internal function to return any ingredients referenced by this action. + pub(crate) fn ingredient_ids(&mut self) -> Option> { + match self.get_parameter(CAI_INGREDIENT_IDS) { Some(Value::Array(ids)) => { let mut result = Vec::new(); for id in ids { @@ -291,7 +292,7 @@ impl Action { Some(result) } Some(_) => None, // Invalid format, so ignore it. - // If there is no ingredient_ids parameter, check for the deprecated instance_id + // If there is no org.cai.ingredientIds parameter, check for the deprecated instance_id #[allow(deprecated)] None => self.instance_id.as_ref().map(|id| vec![id.to_string()]), } @@ -388,12 +389,12 @@ impl Action { /// Adds an ingredient id to the action. pub fn add_ingredient_id(&mut self, ingredient_id: &str) -> Result<&mut Self> { - if let Some(Value::Array(ids)) = self.get_parameter_mut("ingredient_ids") { + if let Some(Value::Array(ids)) = self.get_parameter_mut(CAI_INGREDIENT_IDS) { ids.push(Value::Text(ingredient_id.to_string())); return Ok(self); } let ids = vec![Value::Text(ingredient_id.to_string())]; - self.set_parameter_ref("ingredient_ids", ids)?; + self.set_parameter_ref(CAI_INGREDIENT_IDS, ids)?; Ok(self) } } @@ -787,7 +788,7 @@ pub mod tests { "action": "c2pa.opened", "parameters": { "description": "import", - "ingredient_ids": ["xmp.iid:7b57930e-2f23-47fc-affe-0400d70b738d"], + "org.cai.ingredientIds": ["xmp.iid:7b57930e-2f23-47fc-affe-0400d70b738d"], }, "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/algorithmicMedia", "softwareAgent": "TestApp 1.0", diff --git a/sdk/src/builder.rs b/sdk/src/builder.rs index 5ff014655..dde5877dd 100644 --- a/sdk/src/builder.rs +++ b/sdk/src/builder.rs @@ -34,16 +34,11 @@ use crate::{ }, claim::Claim, error::{Error, Result}, - // manifest_definition::{AssertionData, AssertionDefinition, ManifestDefinition}, resource_store::{ResourceRef, ResourceResolver, ResourceStore}, salt::DefaultSalt, store::Store, utils::mime::format_to_mime, - AsyncSigner, - ClaimGeneratorInfo, - HashRange, - Ingredient, - Signer, + AsyncSigner, ClaimGeneratorInfo, HashRange, Ingredient, Signer, }; /// Version of the Builder Archive file @@ -680,7 +675,7 @@ impl Builder { uris.push(hash_url.clone()); } else { return Err(Error::BadParam(format!( - "Action ingredient id not found: {id}" + "Action ingredientId not found: {id}" ))); } } @@ -693,43 +688,6 @@ impl Builder { actions = actions.update_action(update.0, update.1); } - // for action in actions.actions_mut() { - // if let Some(ids) = action.ingredient_ids() { - // let mut update = action.clone(); - // let mut uris = Vec::new(); - // for id in ids { - // if let Some(hash_url) = ingredient_map.get(&id) { - // uris.push(hash_url.clone()); - // } else { - // return Err(Error::BadParam(format!( - // "Action ingredient id not found: {id}"))) - // } - // } - // update = update.set_parameter(ingredients_key, uris)?; - // actions.update_action(0, update); - // } - // } - - // for (index, action) in needs_ingredient { - // if let Some(id) = action.instance_id() { - // if let Some(hash_url) = ingredient_map.get(id) { - // let mut update = match ingredients_key { - // "ingredient" => { - // action.set_parameter(ingredients_key, hash_url.clone()) - // } - // _ => { - // // we only support on instanceId for actions, so only one ingredient on writing - // action.set_parameter(ingredients_key, [hash_url.clone()]) - // } - // }?; - // update.clear_instance_id(); // don't let this get written out - // actions = actions.update_action(index, update); - // } else { - // return Err(Error::MissingIngredient(id.to_string())); - // } - // } - // } - if let Some(templates) = actions.templates.as_mut() { for template in templates { // replace icon with hashed_uri diff --git a/sdk/src/signer.rs b/sdk/src/signer.rs index 0119f9b6d..71c90f2af 100644 --- a/sdk/src/signer.rs +++ b/sdk/src/signer.rs @@ -264,3 +264,45 @@ pub trait RemoteSigner: Sync { /// than this value. fn reserve_size(&self) -> usize; } + +impl Signer for Box { + fn sign(&self, data: &[u8]) -> Result> { + (**self).sign(data) + } + + fn alg(&self) -> SigningAlg { + (**self).alg() + } + + fn certs(&self) -> Result>> { + (**self).certs() + } + + fn reserve_size(&self) -> usize { + (**self).reserve_size() + } + + fn time_authority_url(&self) -> Option { + (**self).time_authority_url() + } + + fn timestamp_request_headers(&self) -> Option> { + (**self).timestamp_request_headers() + } + + fn timestamp_request_body(&self, message: &[u8]) -> Result> { + (**self).timestamp_request_body(message) + } + + fn send_timestamp_request(&self, message: &[u8]) -> Option>> { + (**self).send_timestamp_request(message) + } + + fn ocsp_val(&self) -> Option> { + (**self).ocsp_val() + } + + fn direct_cose_handling(&self) -> bool { + (**self).direct_cose_handling() + } +}