diff --git a/.changeset/eager-queens-yawn.md b/.changeset/eager-queens-yawn.md new file mode 100644 index 0000000..4aa4ad6 --- /dev/null +++ b/.changeset/eager-queens-yawn.md @@ -0,0 +1,5 @@ +--- +"@contentauth/c2pa-node": patch +--- + +Add context to additional methods. Update c2pa crate. diff --git a/Cargo.lock b/Cargo.lock index a65a8a6..a6fcc66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,6 +89,56 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +dependencies = [ + "windows-sys 0.60.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.60.2", +] + [[package]] name = "anyhow" version = "1.0.98" @@ -123,9 +173,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "asn1-rs" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -133,15 +183,15 @@ dependencies = [ "nom 7.1.3", "num-traits", "rusticata-macros", - "thiserror 1.0.69", + "thiserror 2.0.17", "time", ] [[package]] name = "asn1-rs-derive" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c" dependencies = [ "proc-macro2", "quote", @@ -448,9 +498,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "c2pa" -version = "0.74.0" +version = "0.75.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf4d7ce3f8bc8001e269a0ae03540cc02cf18c58ab29a3d0f0f952640937902" +checksum = "ec84a99bf4acb2db1f9459f9668cac78fe26cf04c21ed7a04b3ce1044a02c7d6" dependencies = [ "asn1-rs", "async-generic", @@ -502,7 +552,7 @@ dependencies = [ "png_pong", "quick-xml", "rand 0.8.5", - "rand_chacha 0.3.1", + "rand_chacha 0.9.0", "range-set", "rasn", "rasn-cms", @@ -526,7 +576,7 @@ dependencies = [ "static-iref", "tempfile", "thiserror 2.0.17", - "toml", + "toml 0.9.11+spec-1.1.0", "ureq 3.1.2", "url", "uuid", @@ -538,7 +588,8 @@ dependencies = [ "wstd", "x509-parser", "zeroize", - "zip", + "zip 6.0.0", + "zip 7.2.0", ] [[package]] @@ -561,7 +612,7 @@ dependencies = [ "thiserror 1.0.69", "tokio", "tokio-util", - "toml", + "toml 0.8.23", "trustmark", ] @@ -673,6 +724,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + [[package]] name = "config" version = "0.14.1" @@ -683,7 +740,7 @@ dependencies = [ "pathdiff", "serde", "serde_json", - "toml", + "toml 0.8.23", ] [[package]] @@ -905,9 +962,9 @@ dependencies = [ [[package]] name = "der-parser" -version = "9.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6" dependencies = [ "asn1-rs", "displaydoc", @@ -1063,16 +1120,26 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.2" +name = "env_filter" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", ] [[package]] @@ -1128,9 +1195,9 @@ dependencies = [ [[package]] name = "extfmt" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a48fe53466ab1f4ea6303bf9d7a0ca8060778590f09fd6c3304cc817aeb9935d" +checksum = "4a61bffc6f807b136c3efeeac295edde2c65b1e345de7ea777e75f63de7436c6" [[package]] name = "fast_image_resize" @@ -1387,7 +1454,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.10.0", + "indexmap 2.13.0", "slab", "tokio", "tokio-util", @@ -1418,9 +1485,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.15.4" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -1428,12 +1495,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" - [[package]] name = "hex" version = "0.4.3" @@ -1510,12 +1571,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" -[[package]] -name = "humantime" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" - [[package]] name = "hyper" version = "1.6.0" @@ -1691,9 +1746,9 @@ dependencies = [ [[package]] name = "id3" -version = "1.16.1" +version = "1.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872718dfcd3a6f4601a3fb413365ee5e1d3ec050316ff79e690c98658a6738ef" +checksum = "965c5e6a62a241f2f673df956ea5f52c27780bc1031855890a551ed9b869e2d1" dependencies = [ "bitflags 2.9.1", "byteorder", @@ -1762,9 +1817,9 @@ dependencies = [ [[package]] name = "img-parts" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4e24cfdc6f897b582508e3c382eaf5378076898f80500a80d10d761ae85e90" +checksum = "19734e3c43b2a850f5889c077056e47c874095f2d87e853c7c41214ae67375f0" dependencies = [ "bytes", "crc32fast", @@ -1790,13 +1845,14 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.10.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown 0.15.4", + "hashbrown 0.16.1", "serde", + "serde_core", ] [[package]] @@ -1876,15 +1932,10 @@ dependencies = [ ] [[package]] -name = "is-terminal" -version = "0.4.16" +name = "is_terminal_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.59.0", -] +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" @@ -2096,9 +2147,9 @@ dependencies = [ [[package]] name = "lopdf" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7184fdea2bc3cd272a1acec4030c321a8f9875e877b3f92a53f2f6033fdc289" +checksum = "f560f57dfb9142a02d673e137622fd515d4231e51feb8b4af28d92647d83f35b" dependencies = [ "aes", "bitflags 2.9.1", @@ -2108,7 +2159,7 @@ dependencies = [ "encoding_rs", "flate2", "getrandom 0.3.4", - "indexmap 2.10.0", + "indexmap 2.13.0", "itoa", "jiff", "log", @@ -2302,9 +2353,9 @@ dependencies = [ [[package]] name = "non-empty-string" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cf0f4060e345ae505219853da9ca1150564158a648a6aa6a528f0d5794bb33" +checksum = "260010741d90def3ca7c4b5ec0bbe28c26d0c775d3c7d291b38642514136677a" dependencies = [ "delegate", "serde", @@ -2312,9 +2363,9 @@ dependencies = [ [[package]] name = "nonempty-collections" -version = "0.3.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e216d0e8cf9d54fa66e5780f6e1d5dc96d1c1b3c25aeba3b6758548bcbbd8b9d" +checksum = "3d127e00b37b19c36c28ac00e874240a61faeea14c7b759b1d9c77efa048322a" dependencies = [ "serde", ] @@ -2444,9 +2495,9 @@ dependencies = [ [[package]] name = "oid-registry" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7" dependencies = [ "asn1-rs", ] @@ -2457,6 +2508,12 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + [[package]] name = "ort" version = "2.0.0-rc.8" @@ -2780,9 +2837,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.38.4" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" +checksum = "f2e3bf4aa9d243beeb01a7b3bc30b77cfe2c44e24ec02d751a7104a53c2c49a1" dependencies = [ "memchr", ] @@ -2933,9 +2990,9 @@ dependencies = [ [[package]] name = "range-set" -version = "0.0.11" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714bc4849c399f77ab82177e9b4f012e02f3a7d6191023e016334edde5b21050" +checksum = "2d49e572143755710377fda7cbd3f46e8523b912339759636ab2770abb16c4c3" dependencies = [ "num-traits", "smallvec", @@ -2955,13 +3012,14 @@ checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68" [[package]] name = "rasn" -version = "0.26.6" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7863f4e3d3cbbe0d3a427aa48447c42b5a74a579cbfa7afa63735b0c10879c44" +checksum = "f6826672fcb973bda1fbc24f26c44f310d5a3a94e2203c65b431a7129c98d045" dependencies = [ "bitvec", "bitvec-nom2", "bytes", + "cfg-if", "chrono", "either", "nom 7.1.3", @@ -2977,9 +3035,9 @@ dependencies = [ [[package]] name = "rasn-cms" -version = "0.26.6" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffab95fefca87ed16fa9501141bebd99643f51d46c7e19f3c0a2c321ae5c27d2" +checksum = "63663a1b4e04736a7d30b382afcb850e04252a0fdfc27df64355ed7bb89979b6" dependencies = [ "rasn", "rasn-pkix", @@ -2987,9 +3045,9 @@ dependencies = [ [[package]] name = "rasn-derive" -version = "0.26.6" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a16f695759320ec969864fe5e7aa8e2a9c5665469565b100b8c8c1a36cd5484" +checksum = "fb0bd5a6f3cca9813e59b84dcddd9fa801fb8f8fb2ac00b4dcfa3d2fcf551549" dependencies = [ "proc-macro2", "rasn-derive-impl", @@ -2998,9 +3056,9 @@ dependencies = [ [[package]] name = "rasn-derive-impl" -version = "0.26.6" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14454245fd76215b830d083b6b6c6842047e50cb7ee73ce1e769d4b099c89fd" +checksum = "3d556b967fead7bbcd6b95a70a688c9edd46a4b2868409aaa49295c6583a27af" dependencies = [ "either", "itertools 0.13.0", @@ -3012,9 +3070,9 @@ dependencies = [ [[package]] name = "rasn-ocsp" -version = "0.26.6" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5252a65c8d5c8435420db5417b6a881f907c75a394c5f88cd392118f273ddc55" +checksum = "bfec303ac3a04490191e4cd032eb33eb0a04e5b6ce1ce9f63d537b4d142e9365" dependencies = [ "rasn", "rasn-pkix", @@ -3022,9 +3080,9 @@ dependencies = [ [[package]] name = "rasn-pkix" -version = "0.26.6" +version = "0.28.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c902bfc1add6e7471323cdb879fe6a3c3122b1cb0247937c0940b28e2334252" +checksum = "5ad9d81988559e392ac2feab9b4a8731eff8e6176e8339ae930a949ae265a1d0" dependencies = [ "rasn", ] @@ -3488,7 +3546,7 @@ version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "indexmap 2.10.0", + "indexmap 2.13.0", "itoa", "memchr", "ryu", @@ -3505,6 +3563,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +dependencies = [ + "serde_core", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3527,7 +3594,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.10.0", + "indexmap 2.13.0", "schemars 0.9.0", "schemars 1.0.4", "serde_core", @@ -3823,7 +3890,7 @@ dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml", + "toml 0.8.23", "version-compare", ] @@ -3863,15 +3930,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.69" @@ -4026,11 +4084,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", "toml_edit", ] +[[package]] +name = "toml" +version = "0.9.11+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" +dependencies = [ + "indexmap 2.13.0", + "serde_core", + "serde_spanned 1.0.4", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "toml_writer", + "winnow", +] + [[package]] name = "toml_datetime" version = "0.6.11" @@ -4040,26 +4113,50 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.7.5+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +dependencies = [ + "serde_core", +] + [[package]] name = "toml_edit" version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.10.0", + "indexmap 2.13.0", "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", "toml_write", "winnow", ] +[[package]] +name = "toml_parser" +version = "1.0.6+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +dependencies = [ + "winnow", +] + [[package]] name = "toml_write" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" +[[package]] +name = "toml_writer" +version = "1.0.6+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" + [[package]] name = "tower" version = "0.5.2" @@ -4161,6 +4258,12 @@ version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" +[[package]] +name = "typed-path" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7922f2cdc51280d47b491af9eafc41eb0cdab85eabcb390c854412fcbf26dbe8" + [[package]] name = "typenum" version = "1.18.0" @@ -4280,6 +4383,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "uuid" version = "1.18.1" @@ -4466,15 +4575,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -4714,9 +4814,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.12" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] @@ -4774,9 +4874,9 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +checksum = "eb3e137310115a65136898d2079f003ce33331a6c4b0d51f1531d1be082b6425" dependencies = [ "asn1-rs", "data-encoding", @@ -4785,7 +4885,7 @@ dependencies = [ "nom 7.1.3", "oid-registry", "rusticata-macros", - "thiserror 1.0.69", + "thiserror 2.0.17", "time", ] @@ -4931,8 +5031,20 @@ checksum = "eb2a05c7c36fde6c09b08576c9f7fb4cda705990f73b58fe011abf7dfb24168b" dependencies = [ "arbitrary", "crc32fast", - "indexmap 2.10.0", + "indexmap 2.13.0", + "memchr", +] + +[[package]] +name = "zip" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42e33efc22a0650c311c2ef19115ce232583abbe80850bc8b66509ebef02de0" +dependencies = [ + "crc32fast", + "indexmap 2.13.0", "memchr", + "typed-path", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 77b54ce..3595e94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] [dependencies] async-trait = "0.1.77" ciborium = "0.2.2" -c2pa = { version = "0.74.0", default-features = false, features = ["file_io", "pdf", "fetch_remote_manifests", "add_thumbnails", "rust_native_crypto", "default_http"] } +c2pa = { version = "0.75.6", default-features = false, features = ["file_io", "pdf", "fetch_remote_manifests", "add_thumbnails", "rust_native_crypto", "default_http"] } futures = "0.3" image = "0.25.6" neon = { version = "1.0.0", default-features = false, features = [ diff --git a/js-src/Reader.spec.ts b/js-src/Reader.spec.ts index c962bee..4ad3800 100644 --- a/js-src/Reader.spec.ts +++ b/js-src/Reader.spec.ts @@ -27,6 +27,7 @@ describe("Reader", () => { "manifests": { "contentauth:urn:uuid:c2677d4b-0a93-4444-876f-ed2f2d40b8cf": { "claim_generator": "make_test_images/0.33.1 c2pa-rs/0.33.1", + "claim_version": 1, "claim_generator_info": [ { "name": "make_test_images", @@ -169,6 +170,42 @@ describe("Reader", () => { }); const json = reader!.json(); expect(json.manifests).toEqual(manifestStore.manifests); + expect(json.validation_status![0].code).toEqual( + "signingCredential.untrusted", + ); + }); + + it("should read from manifest data and file with settings context", async () => { + const manifestData = await fs.readFile( + "./tests/fixtures/CA/manifest_data.c2pa", + ); + const buffer = await fs.readFile("./tests/fixtures/CA.jpg"); + + const settings = { + verify: { + verify_after_reading: false, + verify_trust: false, + }, + }; + + const reader = await Reader.fromManifestDataAndAsset( + manifestData, + { + buffer, + mimeType: "jpeg", + }, + settings, + ); + + expect(reader).not.toBeNull(); + const json = reader!.json(); + + // Settings should affect validation behavior + // With verify_after_reading: false, validation_status should be undefined + expect(json.validation_status).toBeUndefined(); + + expect(json.manifests).toBeDefined(); + expect(json.active_manifest).toEqual(manifestStore.active_manifest); }); it("should write to a file", async () => { diff --git a/src/neon_builder.rs b/src/neon_builder.rs index fb4f639..de1236d 100644 --- a/src/neon_builder.rs +++ b/src/neon_builder.rs @@ -293,14 +293,17 @@ impl NeonBuilder { .argument::(0) .and_then(|obj| parse_asset(&mut cx, obj))?; - // TODO: CAI-10614 This won't work until from_archive_with_context() is ready - let _context_opt = + let context_opt = parse_settings(&mut cx, 1, "Builder").or_else(|err| cx.throw_error(err.to_string()))?; let promise = cx .task(move || { let source_stream = source.into_read_stream()?; - let builder = Builder::from_archive(source_stream)?; + let builder = if let Some(context) = context_opt { + Builder::from_context(context).with_archive(source_stream)? + } else { + Builder::from_archive(source_stream)? + }; Ok(builder) }) .promise( diff --git a/src/neon_reader.rs b/src/neon_reader.rs index 704169e..ce670a5 100644 --- a/src/neon_reader.rs +++ b/src/neon_reader.rs @@ -110,7 +110,7 @@ impl NeonReader { // Parse optional settings parameter (argument 2) - note: settings are not currently used // for from_manifest_data_and_asset as the c2pa-rs API doesn't support context for this method yet - let _context_opt = + let context_opt = parse_settings(&mut cx, 2, "Reader").or_else(|err| cx.throw_error(err.to_string()))?; let c2pa_data = manifest_data.as_slice(&cx).to_vec(); @@ -125,11 +125,13 @@ impl NeonReader { .to_owned(); let stream = asset.into_read_stream()?; - // TODO: CAI-10614 c2pa-rs currently does not support passing Context to - // from_manifest_data_and_stream_async - let reader = - Reader::from_manifest_data_and_stream_async(&c2pa_data, &format, stream) - .await?; + let reader = if let Some(context) = context_opt { + Reader::from_context(context) + .with_manifest_data_and_stream_async(&c2pa_data, &format, stream) + .await? + } else { + Reader::from_manifest_data_and_stream_async(&c2pa_data, &format, stream).await? + }; Ok(reader) }