C2PA-383: Merge in main #45
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
this gives a client a way to view the thumbnail, while still reusing the embedded one.
* Push to keep things moving * Add ManifestStoreOptions to async bytes functions ManifestStore::from_bytes_async() ManifestStore::from_manifest_and_asset_bytes_async Also some fmt/clippy fixes Builds but unit tests do not run yet * WASM build * WASM fix * Expose ManifestStoreOptions * Fix missing anchors * Fix misspelled var * remove check that may be wrong * remove issuer check * switch to x509_parser because x509-certificate has issues * Add support DER encoded EC signatures when validating trust lists * Update Adobe trust root * Small fixes for Wasm building (contentauth#354) * Remove trust anchors from build, only leave the test certs * Add ManifestStore::from_file_with_options * Minor fixes * Trust fixes * Wasm compiler fixes * Restored more tests * EC sig fix * Add ARW & NEF support * Fix for wrong sig algoritm * Support for allowed list * Add Wasm compilation fixes for trust_support branch (contentauth#401) * Fix wasm trust handler * Fix reading lines inside PEM certificate blocks * Wire in settings support Remove feature flags covered by settings * Build fixes simplified check_trust * Build fixes * Test fixes * Build fix * another try to fix build issue * Build fixes Cleanup * Fix preflight check * Remove wrong cert from test anchors bundle * Remove trust feature flag * simplify manifest_store changes * revert unintended change * Remove ManifestStore changes Update integration example to use loading settings from JSON * Change feature flag setting * Change more feature flags * enhance trust pass through to support configuration of allowed_list and EKU config Check signing cert before signing so that it gets checked independent of whether we validate after signing * A little code cleanup * Make sure ED25519 tests are disabled for WASM * Remove Ed25519 from trust list until we can get it working in WASM * Enable Ed25519 support * Added debug logging for ed25519 * wasm build fix * fix broken check * Fixes for wasm * Fix build failure * Fix comment * Code cleanup * OCSP fix --------- Co-authored-by: Gavin Peacock <[email protected]> Co-authored-by: Dave Kozma <[email protected]>
…tauth#421) Fix build error when building from crates.io with openssl_sign feature
* Adds ComposableManifest support to c2pa_io * Adds Manifest::composed_manifest() Provides a way to pre-format a manifest store for injection into a given file format. * Remove self from Store::get_composed_manifest
|
Converting to draft until we see what's going on with |
adds Send trait to TrustHandlerConfig Co-authored-by: Dylan Ross <[email protected]>
brogdonm
requested changes
Mar 13, 2024
Good call - merged in |
brogdonm
approved these changes
Mar 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes in this pull request
This PR catches up our
monotype/fontSupportbranch with recent changes toc2pa-rs'smainbranch. Necessary as current github actions are failing.Pulled in extra changes from last night which updated the
rasn-*crate dependencies, was the cause of our failures yesterday.Checklist
TO DOitems (or similar) have been entered as GitHub issues and the link to that issue has been included in a comment.