PyPI - c2pa-python - Versions diffs - 0.2.2__tar.gz → 0.3.0__tar.gz - Mend

c2pa-python 0.2.2tar.gz → 0.3.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

{c2pa_python-0.2.2 → c2pa_python-0.3.0}/Cargo.lock RENAMED Viewed

@@ -41,12 +41,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 [[package]]
 name = "askama"
 version = "0.12.0"
@@ -118,6 +112,17 @@ dependencies = [
  "syn 1.0.109",
 ]
+[[package]]
+name = "async-generic"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86bc01d15ca67ec7653924057aa97c30de62d06a24e6834387eba6c72c8318e7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
 [[package]]
 name = "async-trait"
 version = "0.1.73"
@@ -193,12 +198,6 @@ dependencies = [
  "serde",
 ]
-[[package]]
-name = "bit_field"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -218,8 +217,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq 0.1.5",
+ "arrayvec",
+ "constant_time_eq",
 ]
 [[package]]
@@ -229,21 +228,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2"
 dependencies = [
  "arrayref",
- "arrayvec 0.5.2",
- "constant_time_eq 0.1.5",
-]
-[[package]]
-name = "blake3"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
-dependencies = [
- "arrayref",
- "arrayvec 0.7.4",
- "cc",
- "cfg-if",
- "constant_time_eq 0.3.0",
+ "arrayvec",
+ "constant_time_eq",
 ]
 [[package]]
@@ -306,16 +292,16 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 [[package]]
 name = "c2pa"
-version = "0.26.0"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aa352b27c99f142a8fb16466b36c7d5db933ba11c0898bfce1a622a97bf0437"
+checksum = "cf260678ddf02ac49b8375a1b22192cc375a05ce9ce700f473acc86945f113e7"
 dependencies = [
  "asn1-rs",
+ "async-generic",
  "async-trait",
  "atree",
  "base64 0.21.4",
  "bcder",
- "blake3",
  "byteorder",
  "byteordered",
  "bytes",
@@ -327,11 +313,12 @@ dependencies = [
  "extfmt",
  "fast-xml",
  "getrandom",
- "half 2.2.1",
  "hex",
+ "id3",
  "image",
  "img-parts",
  "instant",
+ "jfifdump",
  "js-sys",
  "lazy_static",
  "log",
@@ -370,14 +357,26 @@ dependencies = [
 ]
 [[package]]
-name = "c2pa-python"
-version = "0.2.2"
+name = "c2pa-c"
+version = "0.1.0"
+source = "git+https://github.com/contentauth/c2pa-c.git?branch=gpeacock/rlib#c2f116800bcde9900f8c02ca09bdf65a31191d1a"
 dependencies = [
  "c2pa",
  "serde",
  "serde_derive",
  "serde_json",
  "thiserror",
+]
+[[package]]
+name = "c2pa-python"
+version = "0.3.0"
+dependencies = [
+ "c2pa-c",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "thiserror",
  "uniffi",
 ]
@@ -467,7 +466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
 dependencies = [
  "ciborium-io",
- "half 1.8.2",
+ "half",
 ]
 [[package]]
@@ -505,12 +504,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-[[package]]
-name = "constant_time_eq"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 [[package]]
 name = "conv"
 version = "0.3.3"
@@ -554,45 +547,6 @@ dependencies = [
  "cfg-if",
 ]
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 [[package]]
 name = "crypto-bigint"
 version = "0.3.2"
@@ -725,12 +679,6 @@ dependencies = [
  "syn 2.0.37",
 ]
-[[package]]
-name = "either"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 [[package]]
 name = "errno"
 version = "0.3.3"
@@ -752,22 +700,6 @@ dependencies = [
  "libc",
 ]
-[[package]]
-name = "exr"
-version = "1.71.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8"
-dependencies = [
- "bit_field",
- "flume",
- "half 2.2.1",
- "lebe",
- "miniz_oxide 0.7.1",
- "rayon-core",
- "smallvec",
- "zune-inflate",
-]
 [[package]]
 name = "extfmt"
 version = "0.1.1"
@@ -808,15 +740,6 @@ dependencies = [
  "miniz_oxide 0.7.1",
 ]
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "spin 0.9.8",
-]
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -870,16 +793,6 @@ dependencies = [
  "wasm-bindgen",
 ]
-[[package]]
-name = "gif"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
-dependencies = [
- "color_quant",
- "weezl",
-]
 [[package]]
 name = "glob"
 version = "0.3.1"
@@ -903,15 +816,6 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-[[package]]
-name = "half"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
-dependencies = [
- "crunchy",
-]
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -947,6 +851,17 @@ dependencies = [
  "cc",
 ]
+[[package]]
+name = "id3"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf8550abe8a02c044e8f4162c8ddb4020fc65b5e7771ad9b80c25e13ed4536b6"
+dependencies = [
+ "bitflags 2.4.0",
+ "byteorder",
+ "flate2",
+]
 [[package]]
 name = "idna"
 version = "0.4.0"
@@ -966,14 +881,10 @@ dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
- "exr",
- "gif",
  "jpeg-decoder",
  "num-rational",
  "num-traits",
  "png",
- "qoi",
- "tiff",
 ]
 [[package]]
@@ -1005,14 +916,20 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+[[package]]
+name = "jfifdump"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b56eea9f2724de66d5f44cbc4b45e716a32c83a581d163cee2b767ddc220426"
+dependencies = [
+ "json",
+]
 [[package]]
 name = "jpeg-decoder"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
-dependencies = [
- "rayon",
-]
 [[package]]
 name = "js-sys"
@@ -1023,6 +940,12 @@ dependencies = [
  "wasm-bindgen",
 ]
+[[package]]
+name = "json"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
 [[package]]
 name = "keccak"
 version = "0.1.4"
@@ -1038,15 +961,9 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 dependencies = [
- "spin 0.5.2",
+ "spin",
 ]
-[[package]]
-name = "lebe"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 [[package]]
 name = "libc"
 version = "0.2.148"
@@ -1065,16 +982,6 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
-[[package]]
-name = "lock_api"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
 [[package]]
 name = "log"
 version = "0.4.20"
@@ -1087,15 +994,6 @@ version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -1446,15 +1344,6 @@ dependencies = [
  "unicode-ident",
 ]
-[[package]]
-name = "qoi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
-dependencies = [
- "bytemuck",
-]
 [[package]]
 name = "quote"
 version = "1.0.33"
@@ -1504,26 +1393,6 @@ dependencies = [
  "smallvec",
 ]
-[[package]]
-name = "rayon"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
-dependencies = [
- "either",
- "rayon-core",
-]
-[[package]]
-name = "rayon-core"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
 [[package]]
 name = "redox_syscall"
 version = "0.3.5"
@@ -1548,7 +1417,7 @@ dependencies = [
  "cc",
  "libc",
  "once_cell",
- "spin 0.5.2",
+ "spin",
  "untrusted",
  "web-sys",
  "winapi",
@@ -1634,12 +1503,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "scroll"
 version = "0.11.0"
@@ -1723,7 +1586,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
 dependencies = [
- "half 1.8.2",
+ "half",
  "serde",
 ]
@@ -1828,15 +1691,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
 [[package]]
 name = "spki"
 version = "0.5.4"
@@ -1945,17 +1799,6 @@ dependencies = [
  "syn 2.0.37",
 ]
-[[package]]
-name = "tiff"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
-dependencies = [
- "flate2",
- "jpeg-decoder",
- "weezl",
-]
 [[package]]
 name = "time"
 version = "0.3.29"
@@ -2354,12 +2197,6 @@ dependencies = [
  "nom",
 ]
-[[package]]
-name = "weezl"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -2497,12 +2334,3 @@ name = "zeroize"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
-[[package]]
-name = "zune-inflate"
-version = "0.2.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
-dependencies = [
- "simd-adler32",
-]

{c2pa_python-0.2.2 → c2pa_python-0.3.0}/Cargo.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "c2pa-python"
-version = "0.2.2"
+version = "0.3.0"
 edition = "2021"
 authors = ["Gavin Peacock <gpeacock@adobe.com"]
@@ -10,7 +10,8 @@ name = "c2pa_python"
 crate-type = ["cdylib"]
 [dependencies]
-c2pa = {version="0.26.0", features = ["file_io", "add_thumbnails", "fetch_remote_manifests"]}
+c2pa-c = { git = "https://github.com/contentauth/c2pa-c.git", branch = "gpeacock/rlib"}
+#c2pa = {version="0.26.0", features = ["file_io", "add_thumbnails", "fetch_remote_manifests"]}
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"

{c2pa_python-0.2.2 → c2pa_python-0.3.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2pa-python
-Version: 0.2.2
+Version: 0.3.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
@@ -12,7 +12,7 @@ License-File: LICENSE-APACHE
 Summary: Python bindings for the C2PA Content Authenticity Initiative (CAI) library
 Keywords: C2PA,CAI,content credentials,metadata,provenance
 Author: Gavin Peacock <gpeacock@adobe.com
-Author-email: Gavin Peacock <gpeacock@adobe.com
+Author-email: Gavin Peacock <gpeacock@adobe.com>
 Maintainer-email: Gavin Peacock <gpeacock@adobe.com>
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
@@ -25,6 +25,8 @@ Python bindings for the C2PA Content Authenticity Initiative (CAI) library.
 This library enables you to read and validate C2PA data in supported media files and add signed manifests to supported media files.
+**WARNING**: This is an early prerelease version of this library.  There may be bugs and unimplemented features, and the API is subject to change.
 ## Installation
 Install from PyPI by entering this command:
@@ -45,10 +47,10 @@ import c2pa_python as c2pa
 ### Read and validate C2PA data in a file
-Use the `verify_from_file_json` function to read C2PA data from the specified file:
+Use the `read_file` function to read C2PA data from the specified file:
 ```py
-json_store = c2pa.verify_from_file_json("path/to/media_file.jpg", "path/to/data_dir")
+json_store = c2pa.read_file("path/to/media_file.jpg", "path/to/data_dir")
 ```
 This function examines the specified media file for C2PA data and generates a JSON report of any data it finds. If there are validation errors, the report includes a `validation_status` field.  For a summary of supported media types, see [Supported file formats](#supported-file-formats).
@@ -59,6 +61,25 @@ If the optional `data_dir` is provided, the function extracts any binary resourc
 NOTE: For a comprehensive reference to the JSON manifest structure, see the [CAI manifest store reference](https://contentauth.github.io/json-manifest-reference/manifest-reference).
+### Add a signed manifest to a media file
+Use the `sign_file` function to add a signed manifest to a media file.
+```py
+result = c2pa.sign_file("path/to/source.jpg",
+                                        "path/to/dest.jpg",
+                                        manifest_json,
+                                        sign_info,
+                                        data_dir)
+```
+The parameters (in order) are:
+- The source (original) media file.
+- The destination file that will contain a copy of the source file with the manifest data added.
+- `manifest_json`, a JSON-formatted string containing the manifest data you want to add; see [Creating a manifest JSON definition file](#creating-a-manifest-json-definition-file) below.
+- `sign_info`, a `SignerInfo` object instance; see [Generating SignerInfo](#generating-signerinfo) below.
+- `data_dir` optionally specifies a directory path from which to load resource files referenced in the manifest JSON identifier fields; for example, thumbnails, icons, and manifest data for ingredients.
 ### Create a SignerInfo Instance
 A `SignerInfo` object contains information about a signature.  To create an instance of `SignerInfo`, first set up the signer information from the public and private key `.pem` files as follows:
@@ -71,12 +92,12 @@ prv_key = open("path/to/private_key.pem","rb").read()
 Then create a new `SignerInfo` instance using the keys as follows, specifying the signing algorithm used and optionally a time stamp authority URL:
 ```py
-sign_info = c2pa.SignerInfo(certs, priv_key, "es256", "http://timestamp.digicert.com")
+sign_info = c2pa.SignerInfo("es256", certs, priv_key, "http://timestamp.digicert.com")
 ```
 For the list of supported signing algorithms, see [Creating and using an X.509 certificate](https://opensource.contentauthenticity.org/docs/c2patool/x_509).
-### Creating a manifest JSON definition
+### Creating a manifest JSON definition file
 The manifest JSON string defines the C2PA manifest to add to the file.
@@ -99,27 +120,6 @@ manifest_json = json.dumps({
  })
 ```
-### Add a signed manifest to a media file
-Use the `add_manifest_to_file_json` function to add a signed manifest to a media file.
-```py
-result = c2pa.add_manifest_to_file_json("path/to/source.jpg",
-                                        "path/to/dest.jpg",
-                                        manifest_json,
-                                        sign_info,
-                                        data_dir)
-```
-The parameters (in order) are:
-- The source (original) media file.
-- The destination file that will contain a copy of the source file with the manifest data added.
-- `manifest_json`, a JSON-formatted string containing the manifest data you want to add; see [Creating a manifest JSON definition file](#creating-a-manifest-json-definition-file) below.
-- `sign_info`, a `SignerInfo` object instance; see [Generating SignerInfo](#generating-signerinfo) below.
-- `data_dir` optionally specifies a directory path from which to load resource files referenced in the manifest JSON identifier fields; for example, thumbnails, icons, and manifest data for ingredients.
-See [training.py](https://github.com/contentauth/c2pa-python/blob/main/tests/training.py) for an example.
 ## Development
 It is best to [set up a virtual environment](https://virtualenv.pypa.io/en/latest/installation.html) for development and testing.
@@ -142,8 +142,8 @@ pip install <path-to-whl> --force-reinstall
 We use [PyTest](https://docs.pytest.org/) for testing.
-With the venv virtual environment,
-run tests by entering these commands:
+Run tests by entering this command:
 ```
 source .venv/bin/activate
 maturin develop
@@ -151,6 +151,16 @@ pytest
 deactivate
 ```
+### Example
+Run the example code like this:
+```
+source .venv/bin/activate
+maturin develop
+python3 tests/training.py
+deactivate
+```
 ## Supported file formats
@@ -172,6 +182,19 @@ deactivate
  | `wav`         | `audio/x-wav`                                       |
  | `webp`        | `image/webp`                                        |
+## Change Notes:
+Version 0.3.0 changes:
+There are some breaking changes to align with future APIs:
+- `C2paSignerInfo` moves the `alg` to the first parameter from the 3rd.
+- `c2pa.verify_from_file_json` is now `c2pa.read_file`.
+- `c2pa.ingredient_from_file_json` is now `c2pa.read_ingredient_file`.
+- `c2pa.add_manifest_to_file_json` is now `c2pa.sign_file`.
+- There are many more specific errors types now, and Error messages always start with the name of the error i.e (str(err.value).startswith("ManifestNotFound")).
+- The ingredient thumbnail identifier may be jumbf uri reference if a valid thumb already exists in the active manifest.
+- Extracted file paths for read_file now use a folder structure and different naming conventions.
 ## License
 This package is distributed under the terms of both the [MIT license](https://github.com/contentauth/c2pa-rs/blob/main/LICENSE-MIT) and the [Apache License (Version 2.0)](https://github.com/contentauth/c2pa-rs/blob/main/LICENSE-APACHE).

{c2pa_python-0.2.2 → c2pa_python-0.3.0}/README.md RENAMED Viewed

@@ -4,6 +4,8 @@ Python bindings for the C2PA Content Authenticity Initiative (CAI) library.
 This library enables you to read and validate C2PA data in supported media files and add signed manifests to supported media files.
+**WARNING**: This is an early prerelease version of this library.  There may be bugs and unimplemented features, and the API is subject to change.
 ## Installation
 Install from PyPI by entering this command:
@@ -24,10 +26,10 @@ import c2pa_python as c2pa
 ### Read and validate C2PA data in a file
-Use the `verify_from_file_json` function to read C2PA data from the specified file:
+Use the `read_file` function to read C2PA data from the specified file:
 ```py
-json_store = c2pa.verify_from_file_json("path/to/media_file.jpg", "path/to/data_dir")
+json_store = c2pa.read_file("path/to/media_file.jpg", "path/to/data_dir")
 ```
 This function examines the specified media file for C2PA data and generates a JSON report of any data it finds. If there are validation errors, the report includes a `validation_status` field.  For a summary of supported media types, see [Supported file formats](#supported-file-formats).
@@ -38,6 +40,25 @@ If the optional `data_dir` is provided, the function extracts any binary resourc
 NOTE: For a comprehensive reference to the JSON manifest structure, see the [CAI manifest store reference](https://contentauth.github.io/json-manifest-reference/manifest-reference).
+### Add a signed manifest to a media file
+Use the `sign_file` function to add a signed manifest to a media file.
+```py
+result = c2pa.sign_file("path/to/source.jpg",
+                                        "path/to/dest.jpg",
+                                        manifest_json,
+                                        sign_info,
+                                        data_dir)
+```
+The parameters (in order) are:
+- The source (original) media file.
+- The destination file that will contain a copy of the source file with the manifest data added.
+- `manifest_json`, a JSON-formatted string containing the manifest data you want to add; see [Creating a manifest JSON definition file](#creating-a-manifest-json-definition-file) below.
+- `sign_info`, a `SignerInfo` object instance; see [Generating SignerInfo](#generating-signerinfo) below.
+- `data_dir` optionally specifies a directory path from which to load resource files referenced in the manifest JSON identifier fields; for example, thumbnails, icons, and manifest data for ingredients.
 ### Create a SignerInfo Instance
 A `SignerInfo` object contains information about a signature.  To create an instance of `SignerInfo`, first set up the signer information from the public and private key `.pem` files as follows:
@@ -50,12 +71,12 @@ prv_key = open("path/to/private_key.pem","rb").read()
 Then create a new `SignerInfo` instance using the keys as follows, specifying the signing algorithm used and optionally a time stamp authority URL:
 ```py
-sign_info = c2pa.SignerInfo(certs, priv_key, "es256", "http://timestamp.digicert.com")
+sign_info = c2pa.SignerInfo("es256", certs, priv_key, "http://timestamp.digicert.com")
 ```
 For the list of supported signing algorithms, see [Creating and using an X.509 certificate](https://opensource.contentauthenticity.org/docs/c2patool/x_509).
-### Creating a manifest JSON definition
+### Creating a manifest JSON definition file
 The manifest JSON string defines the C2PA manifest to add to the file.
@@ -78,27 +99,6 @@ manifest_json = json.dumps({
  })
 ```
-### Add a signed manifest to a media file
-Use the `add_manifest_to_file_json` function to add a signed manifest to a media file.
-```py
-result = c2pa.add_manifest_to_file_json("path/to/source.jpg",
-                                        "path/to/dest.jpg",
-                                        manifest_json,
-                                        sign_info,
-                                        data_dir)
-```
-The parameters (in order) are:
-- The source (original) media file.
-- The destination file that will contain a copy of the source file with the manifest data added.
-- `manifest_json`, a JSON-formatted string containing the manifest data you want to add; see [Creating a manifest JSON definition file](#creating-a-manifest-json-definition-file) below.
-- `sign_info`, a `SignerInfo` object instance; see [Generating SignerInfo](#generating-signerinfo) below.
-- `data_dir` optionally specifies a directory path from which to load resource files referenced in the manifest JSON identifier fields; for example, thumbnails, icons, and manifest data for ingredients.
-See [training.py](https://github.com/contentauth/c2pa-python/blob/main/tests/training.py) for an example.
 ## Development
 It is best to [set up a virtual environment](https://virtualenv.pypa.io/en/latest/installation.html) for development and testing.
@@ -121,8 +121,8 @@ pip install <path-to-whl> --force-reinstall
 We use [PyTest](https://docs.pytest.org/) for testing.
-With the venv virtual environment,
-run tests by entering these commands:
+Run tests by entering this command:
 ```
 source .venv/bin/activate
 maturin develop
@@ -130,6 +130,16 @@ pytest
 deactivate
 ```
+### Example
+Run the example code like this:
+```
+source .venv/bin/activate
+maturin develop
+python3 tests/training.py
+deactivate
+```
 ## Supported file formats
@@ -151,6 +161,19 @@ deactivate
  | `wav`         | `audio/x-wav`                                       |
  | `webp`        | `image/webp`                                        |
+## Change Notes:
+Version 0.3.0 changes:
+There are some breaking changes to align with future APIs:
+- `C2paSignerInfo` moves the `alg` to the first parameter from the 3rd.
+- `c2pa.verify_from_file_json` is now `c2pa.read_file`.
+- `c2pa.ingredient_from_file_json` is now `c2pa.read_ingredient_file`.
+- `c2pa.add_manifest_to_file_json` is now `c2pa.sign_file`.
+- There are many more specific errors types now, and Error messages always start with the name of the error i.e (str(err.value).startswith("ManifestNotFound")).
+- The ingredient thumbnail identifier may be jumbf uri reference if a valid thumb already exists in the active manifest.
+- Extracted file paths for read_file now use a folder structure and different naming conventions.
 ## License
 This package is distributed under the terms of both the [MIT license](https://github.com/contentauth/c2pa-rs/blob/main/LICENSE-MIT) and the [Apache License (Version 2.0)](https://github.com/contentauth/c2pa-rs/blob/main/LICENSE-APACHE).

{c2pa_python-0.2.2 → c2pa_python-0.3.0}/pyproject.toml RENAMED Viewed

@@ -15,6 +15,9 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
+authors = [
+  {name = "Gavin Peacock", email = "gpeacock@adobe.com"}
+]
 maintainers = [
   {name = "Gavin Peacock", email = "gpeacock@adobe.com"}
 ]

c2pa_python-0.3.0/src/c2pa.udl ADDED Viewed

@@ -0,0 +1,39 @@
+namespace c2pa {
+  string version();
+  string sdk_version();
+  [Throws=Error]
+  string read_file([ByRef] string path, string? data_dir);
+  [Throws=Error]
+  string read_ingredient_file([ByRef] string path, [ByRef] string data_dir);
+  [Throws=Error]
+  sequence<u8> sign_file([ByRef] string source, [ByRef] string dest, [ByRef] string manifest, [ByRef] SignerInfo signer_info, string? data_dir);
+};
+[Error]
+enum Error {
+  "Assertion",
+  "AssertionNotFound",
+  "Decoding",
+  "Encoding",
+  "FileNotFound",
+  "Io",
+  "Json",
+  "Manifest",
+  "ManifestNotFound",
+  "NotSupported",
+  "Other",
+  "NullParameter",
+  "RemoteManifest",
+  "ResourceNotFound",
+  "Signature",
+  "Verify"
+};
+dictionary SignerInfo {
+  string alg;
+  sequence<u8> sign_cert;
+  sequence<u8> private_key;
+  string? ta_url;
+};

{c2pa_python-0.2.2 → c2pa_python-0.3.0}/src/lib.rs RENAMED Viewed

@@ -13,22 +13,13 @@
 /// This module exports a C2PA library
 use std::env;
-mod error;
-mod json_api;
-mod signer_info;
-pub use error::{Error, Result};
-pub use json_api::*;
-pub use signer_info::SignerInfo;
+pub(crate) use c2pa_c::{
+    read_file, read_ingredient_file, sdk_version, sign_file, Error, SignerInfo,
+};
 /// Returns the version of this library
 fn version() -> String {
     String::from(env!("CARGO_PKG_VERSION"))
 }
-/// Returns the version of the c2pa SDK used in this library
-fn sdk_version() -> String {
-    String::from(c2pa::VERSION)
-}
 uniffi::include_scaffolding!("c2pa");

c2pa_python-0.3.0/tests/example.py ADDED Viewed

@@ -0,0 +1,34 @@
+# Copyright 2023 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License,
+# Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+# or the MIT license (http://opensource.org/licenses/MIT),
+# at your option.
+# Unless required by applicable law or agreed to in writing,
+# this software is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
+# implied. See the LICENSE-MIT and LICENSE-APACHE files for the
+# specific language governing permissions and limitations under
+# each license.
+# This example shows how to add a do not train assertion to an asset and then verify it
+import json
+import os
+import sys
+import c2pa_python as c2pa;
+# set up paths to the files we we are using
+PROJECT_PATH = os.getcwd()
+testFile = os.path.join(PROJECT_PATH,"tests","fixtures","A.jpg")
+pemFile = os.path.join(PROJECT_PATH,"tests","fixtures","es256_certs.pem")
+keyFile = os.path.join(PROJECT_PATH,"tests","fixtures","es256_private.key")
+testOutputFile = os.path.join(PROJECT_PATH,"target","dnt.jpg")
+# a little helper function to get a value from a nested dictionary
+from functools import reduce
+import operator
+def getitem(d, key):
+    return reduce(operator.getitem, key, d)
+print("version = " + c2pa.version())

{c2pa_python-0.2.2 → c2pa_python-0.3.0}/tests/test_c2pa.py RENAMED Viewed

@@ -24,24 +24,24 @@ def getitem(d, key):
     return reduce(operator.getitem, key, d)
 def test_version():
-    assert c2pa.version() == "0.2.2"
+    assert c2pa.version() == "0.3.0"
 def test_sdk_version():
-    assert c2pa.sdk_version() == "0.26.0"
+    assert c2pa.sdk_version() == "0.28.3"
 def test_verify_from_file():
-    json_store = c2pa.verify_from_file_json("tests/fixtures/C.jpg", None)
+    json_store = c2pa.read_file("tests/fixtures/C.jpg", None)
     assert not "validation_status" in json_store
 def test_verify_from_file_no_store():
-    with pytest.raises(c2pa.Error.Sdk) as err:
-        json_store = c2pa.verify_from_file_json("tests/fixtures/A.jpg", None)
-    assert str(err.value) == "no JUMBF data found"
+    with pytest.raises(c2pa.Error.ManifestNotFound) as err:
+        json_store = c2pa.read_file("tests/fixtures/A.jpg", None)
+    assert str(err.value).startswith("ManifestNotFound")
 def test_verify_from_file_get_thumbnail():
     with tempfile.TemporaryDirectory() as data_dir:
-        store_json = c2pa.verify_from_file_json("tests/fixtures/C.jpg", data_dir)
+        store_json = c2pa.read_file("tests/fixtures/C.jpg", data_dir)
         manifest_store = json.loads(store_json)
         manifest = manifest_store["manifests"][manifest_store["active_manifest"]]
         print (store_json)
@@ -67,18 +67,20 @@ def test_verify_from_file_get_thumbnail():
 def test_ingredient_from_file_get_thumbnail():
     with tempfile.TemporaryDirectory() as data_dir:
-        ingredient_json = c2pa.ingredient_from_file_json("tests/fixtures/C.jpg", data_dir)
+        ingredient_json = c2pa.read_ingredient_file("tests/fixtures/C.jpg", data_dir)
         ingredient = json.loads(ingredient_json)
         assert ingredient["title"]== "C.jpg"
         assert ingredient,["format"] == "image/jpeg"
         # read thumbnail data from file
         assert getitem(ingredient,("thumbnail","format")) == "image/jpeg"
         thumb_name = getitem(ingredient,("thumbnail","identifier"))
-        with open(data_dir + "/" + thumb_name, "rb") as thumb_file:
-            thumb_data = thumb_file.read()
-        assert len(thumb_data) == 31608
+        assert thumb_name.startswith("self#jumbf=")
+        # we won't get a thumbnail file generated if a valid one already exists in the store
+        # with open(data_dir + "/" + thumb_name, "rb") as thumb_file:
+        #     thumb_data = thumb_file.read()
+        # assert len(thumb_data) == 31608
         #read c2pa data from file
-        assert getitem(ingredient,("manifest_data","format")) == "c2pa"
+        assert getitem(ingredient,("manifest_data","format")) == "application/c2pa"
         data_name = getitem(ingredient,("manifest_data","identifier"))
         with open(data_dir + "/" + data_name, "rb") as c2pa_file:
             c2pa_data = c2pa_file.read()
@@ -88,9 +90,9 @@ def test_sign_info():
           # set up the signer info loading the pem and key files
         test_pem = open("tests/fixtures/es256_certs.pem","rb").read()
         test_key = open("tests/fixtures/es256_private.key","rb").read()
-        sign_info = c2pa.SignerInfo(test_pem, test_key, "es256", "http://timestamp.digicert.com")
+        sign_info = c2pa.SignerInfo("es256", test_pem, test_key, "http://timestamp.digicert.com")
         assert sign_info.alg == "es256"
-        assert sign_info.tsa_url == "http://timestamp.digicert.com"
+        assert sign_info.ta_url == "http://timestamp.digicert.com"
 def test_add_manifest_to_file():
     # define a source folder for any assets we need to read
@@ -124,14 +126,14 @@ def test_add_manifest_to_file():
         # set up the signer info loading the pem and key files
         test_pem = open("tests/fixtures/es256_certs.pem","rb").read()
         test_key = open("tests/fixtures/es256_private.key","rb").read()
-        sign_info = c2pa.SignerInfo(test_pem, test_key, "es256", "http://timestamp.digicert.com")
+        sign_info = c2pa.SignerInfo("es256", test_pem, test_key, "http://timestamp.digicert.com")
         # add the manifest to the asset
-        c2pa_data = c2pa.add_manifest_to_file_json(data_dir + "/A.jpg", output_dir+"/out.jpg", manifest_json, sign_info, data_dir)
+        c2pa_data = c2pa.sign_file(data_dir + "/A.jpg", output_dir+"/out.jpg", manifest_json, sign_info, data_dir)
         assert len(c2pa_data) == 75860 #check the size of returned c2pa_manifest data
         # verify the asset and check the manifest has what we expect
-        store_json = c2pa.verify_from_file_json(output_dir + "/out.jpg", output_dir)
+        store_json = c2pa.read_file(output_dir + "/out.jpg", output_dir)
         manifest_store = json.loads(store_json)
         manifest = manifest_store["manifests"][manifest_store["active_manifest"]]
         print (store_json)

{c2pa_python-0.2.2 → c2pa_python-0.3.0}/tests/training.py RENAMED Viewed

@@ -57,9 +57,9 @@ try:
     # set up the signer info loading the pem and key files
     test_pem = open(pemFile,"rb").read()
     test_key = open(keyFile,"rb").read()
-    sign_info = c2pa.SignerInfo(test_pem, test_key, "es256", "http://timestamp.digicert.com")
+    sign_info = c2pa.SignerInfo("es256", test_pem, test_key, "http://timestamp.digicert.com")
-    result = c2pa.add_manifest_to_file_json(testFile, testOutputFile, manifest_json, sign_info, None)
+    result = c2pa.sign_file(testFile, testOutputFile, manifest_json, sign_info, None)
 except Exception as err:
     sys.exit(err)
@@ -71,7 +71,7 @@ print("successfully added do not train manifest to file " + testOutputFile)
 allowed = True # opt out model, assume training is ok if the assertion doesn't exist
 try:
-    json_store = c2pa.verify_from_file_json(testOutputFile, None)
+    json_store = c2pa.read_file(testOutputFile, None)
     manifest_store = json.loads(json_store)
     manifest = manifest_store["manifests"][manifest_store["active_manifest"]]

c2pa_python-0.2.2/src/c2pa.udl DELETED Viewed

@@ -1,25 +0,0 @@
-namespace c2pa {
-  string version();
-  string sdk_version();
-  [Throws=Error]
-  string verify_from_file_json([ByRef] string path, string? data_dir);
-  [Throws=Error]
-  string ingredient_from_file_json([ByRef] string path, [ByRef] string data_dir);
-  [Throws=Error]
-  sequence<u8> add_manifest_to_file_json([ByRef] string source, [ByRef] string dest, [ByRef] string manifest, SignerInfo signer_info, string? data_dir);
-};
-[Error]
-enum Error {
-  "Json",
-  "Sdk"
-};
-dictionary SignerInfo {
-  sequence<u8> signcert;
-  sequence<u8> pkey;
-  string alg;
-  string? tsa_url;
-};

c2pa_python-0.2.2/src/error.rs DELETED Viewed

@@ -1,42 +0,0 @@
-// Copyright 2022 Adobe. All rights reserved.
-// This file is licensed to you under the Apache License,
-// Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-// or the MIT license (http://opensource.org/licenses/MIT),
-// at your option.
-// Unless required by applicable law or agreed to in writing,
-// this software is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
-// implied. See the LICENSE-MIT and LICENSE-APACHE files for the
-// specific language governing permissions and limitations under
-// each license.
-// Copyright 2023 Adobe. All rights reserved.
-// This file is licensed to you under the Apache License,
-// Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-// or the MIT license (http://opensource.org/licenses/MIT),
-// at your option.
-// Unless required by applicable law or agreed to in writing,
-// this software is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
-// implied. See the LICENSE-MIT and LICENSE-APACHE files for the
-// specific language governing permissions and limitations under
-// each license.
-use c2pa;
-use serde_json;
-use thiserror::Error;
-pub type Result<T> = std::result::Result<T, Error>;
-#[derive(Error, Debug)]
-/// Defines all possible errors that can occur in this library
-pub enum Error {
-    #[error(transparent)]
-    /// An error occurred while parsing a JSON string
-    Json(#[from] serde_json::Error),
-    #[error(transparent)]
-    /// An error occurred while using the c2pa SDK
-    Sdk(#[from] c2pa::Error),
-}

c2pa_python-0.2.2/src/json_api.rs DELETED Viewed

@@ -1,107 +0,0 @@
-// Copyright 2023 Adobe. All rights reserved.
-// This file is licensed to you under the Apache License,
-// Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-// or the MIT license (http://opensource.org/licenses/MIT),
-// at your option.
-// Unless required by applicable law or agreed to in writing,
-// this software is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
-// implied. See the LICENSE-MIT and LICENSE-APACHE files for the
-// specific language governing permissions and limitations under
-// each license.
-use c2pa::{Ingredient, Manifest, ManifestStore};
-use crate::{Error, Result, SignerInfo};
-/// Returns ManifestStore JSON string from a file path.
-///
-/// If data_dir is provided, any thumbnail or c2pa data will be written to that folder.
-/// Any Validation errors will be reported in the validation_status field.
-///
-pub fn verify_from_file_json(path: &str, data_dir: Option<String>) -> Result<String> {
-    Ok(match data_dir {
-        Some(dir) => ManifestStore::from_file_with_resources(path, &dir),
-        None => ManifestStore::from_file(path),
-    }
-    .map_err(Error::Sdk)?
-    .to_string())
-}
-/// Returns an Ingredient JSON string from a file path.
-///
-/// Any thumbnail or c2pa data will be written to data_dir if provided
-pub fn ingredient_from_file_json(path: &str, data_dir: &str) -> Result<String> {
-    Ok(Ingredient::from_file_with_folder(path, data_dir)
-        .map_err(Error::Sdk)?
-        .to_string())
-}
-/// Adds a manifest to the source file and writes the result to the destination file.
-/// Also returns the binary manifest data for optional cloud storage
-/// A manifest definition must be supplied
-/// Signer information must also be supplied
-///
-/// Any file paths in the manifest will be read relative to the source file
-pub fn add_manifest_to_file_json(
-    source: &str,
-    dest: &str,
-    manifest_info: &str,
-    signer_info: SignerInfo,
-    data_dir: Option<String>,
-) -> Result<Vec<u8>> {
-    let mut manifest = Manifest::from_json(manifest_info).map_err(Error::Sdk)?;
-    // if data_dir is provided, set the base path for the manifest
-    if let Some(path) = data_dir {
-        manifest.with_base_path(path).map_err(Error::Sdk)?;
-    }
-    // If the source file has a manifest store, and no parent is specified, treat the source's manifest store as the parent.
-    if manifest.parent().is_none() {
-        let source_ingredient = Ingredient::from_file(source).map_err(Error::Sdk)?;
-        if source_ingredient.manifest_data().is_some() {
-            manifest.set_parent(source_ingredient).map_err(Error::Sdk)?;
-        }
-    }
-    let signer = signer_info.signer()?;
-    manifest.embed(&source, &dest, &*signer).map_err(Error::Sdk)
-}
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::{fs::remove_dir_all, path::PathBuf};
-    /// returns a path to a file in the fixtures folder
-    pub fn test_path(path: &str) -> String {
-        let base = env!("CARGO_MANIFEST_DIR");
-        format!("{}/{}", base, path)
-    }
-    #[test]
-    fn test_verify_from_file_no_base() {
-        let path = test_path("tests/fixtures/C.jpg");
-        let result = verify_from_file_json(&path, None);
-        assert!(result.is_ok());
-        let json_report = result.unwrap();
-        println!("{}", json_report);
-        assert!(json_report.contains("C.jpg"));
-        //assert!(!json_report.contains("validation_status"));
-    }
-    #[test]
-    fn test_verify_from_file_with_base() {
-        let path = test_path("tests/fixtures/C.jpg");
-        let data_dir = "target/data_dir";
-        remove_dir_all(data_dir).unwrap();
-        let result = verify_from_file_json(&path, Some(data_dir.to_owned()));
-        assert!(result.is_ok());
-        let json_report = result.unwrap();
-        println!("{}", json_report);
-        assert!(json_report.contains("C.jpg"));
-        assert!(PathBuf::from(data_dir).exists());
-        assert!(json_report.contains("thumbnail"));
-    }
-}

c2pa_python-0.2.2/src/signer_info.rs DELETED Viewed

@@ -1,58 +0,0 @@
-// Copyright 2023 Adobe. All rights reserved.
-// This file is licensed to you under the Apache License,
-// Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-// or the MIT license (http://opensource.org/licenses/MIT),
-// at your option.
-// Unless required by applicable law or agreed to in writing,
-// this software is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR REPRESENTATIONS OF ANY KIND, either express or
-// implied. See the LICENSE-MIT and LICENSE-APACHE files for the
-// specific language governing permissions and limitations under
-// each license.
-use c2pa::{create_signer, Signer, SigningAlg};
-use serde::Deserialize;
-use crate::{Error, Result};
-/// SignerInfo provides the information needed to create a signer
-/// and sign a manifest.
-///
-/// The signer is created from the signcert and pkey fields.
-///
-/// The alg field is used to determine the signing algorithm.
-///
-/// The tsa_url field is optional and is used to specify a timestamp server.
-///
-#[derive(Clone, Debug, Deserialize)]
-pub struct SignerInfo {
-    pub signcert: Vec<u8>,
-    pub pkey: Vec<u8>,
-    pub alg: String,
-    pub tsa_url: Option<String>,
-}
-impl SignerInfo {
-    /// Create a SignerInfo from a JSON formatted SignerInfo string
-    pub fn from_json(json: &str) -> Result<Self> {
-        serde_json::from_str(json).map_err(Error::Json)
-    }
-    // Returns the signing algorithm converted from string format
-    fn alg(&self) -> Result<SigningAlg> {
-        self.alg
-            .to_lowercase()
-            .parse()
-            .map_err(|_| Error::Sdk(c2pa::Error::UnsupportedType))
-    }
-    /// Create a signer from the SignerInfo
-    pub fn signer(&self) -> Result<Box<dyn Signer>> {
-        create_signer::from_keys(
-            &self.signcert,
-            &self.pkey,
-            self.alg()?,
-            self.tsa_url.clone(),
-        )
-        .map_err(Error::Sdk)
-    }
-}