c2pa-rs

commit 31460ce6e02d64d387e18d168390eb8387e567a3
parent 6435f2b4df45140356b445bbd360d6f5575a93b7
Author: Gavin  Peacock <gpeacock@adobe.com>
Date:   Fri, 29 Jul 2022 17:14:53 -0700

Update `make_test_images` to use timestamp authority (#90)

make_test_images was not using tsa_url
Diffstat:
M
make_test_images/src/make_test_images.rs
 | 
25
++++++++++++++-----------

1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/make_test_images/src/make_test_images.rs b/make_test_images/src/make_test_images.rs
@@ -31,16 +31,6 @@ use twoway::find_bytes;
 const IMAGE_WIDTH: u32 = 2048;
 const IMAGE_HEIGHT: u32 = 1365;
 
-fn get_signer_with_alg(alg: &str) -> c2pa::Result<Box<dyn Signer>> {
-    // sign and embed into the target file
-    let mut signcert_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    signcert_path.push(format!("../sdk/tests/fixtures/certs/{}.pub", alg));
-    let mut pkey_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    pkey_path.push(format!("../sdk/tests/fixtures/certs/{}.pem", alg));
-    let alg: SigningAlg = alg.parse().map_err(|_| c2pa::Error::UnsupportedType)?;
-    create_signer::from_files(signcert_path, pkey_path, alg, None)
-}
-
 /// Defines an operation for creating a test image
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
@@ -81,6 +71,19 @@ pub struct Config {
     pub recipes: Vec<Recipe>,
 }
 
+impl Config {
+    pub fn get_signer(&self) -> c2pa::Result<Box<dyn Signer>> {
+        // sign and embed into the target file
+        let alg: SigningAlg = self.alg.parse().map_err(|_| c2pa::Error::UnsupportedType)?;
+        let tsa_url = self.tsa_url.as_ref().map(|s| s.to_owned());
+        let mut signcert_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        signcert_path.push(format!("../sdk/tests/fixtures/certs/{}.pub", self.alg));
+        let mut pkey_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        pkey_path.push(format!("../sdk/tests/fixtures/certs/{}.pem", alg));
+        create_signer::from_files(signcert_path, pkey_path, alg, tsa_url)
+    }
+}
+
 // Defaults for Config
 impl Default for Config {
     fn default() -> Self {
@@ -297,7 +300,7 @@ impl MakeTestImages {
         manifest.add_assertion(&actions)?; // extra get required here, since actions is an array
 
         // now sign manifest and embed in target
-        let signer = get_signer_with_alg(&self.config.alg)?;
+        let signer = self.config.get_signer()?;
 
         manifest.embed(&dst_path, &dst_path, signer.as_ref())?;