fix: Bring `claim_v2` branch up to date with `main` branch #809

scouten-adobe · 2024-12-30T22:17:37Z

No description provided.

* Change in command line parameters for adding manifests, please review README * Support for external/remote manifests * update c2pa version * Updated Readme with new options * Change in command line parameters for adding manifests, please review README ** source file must now always be passed on command line ** manifest config now requires a -m --manifest option ** won't overwrite files without -force flag Code restructure Co-authored-by: Maurice Fisher <mfisher@adobe.com> Co-authored-by: Eric Scouten <scouten@adobe.com>

…patool#58) Co-authored-by: Jack Farzan <jfarzan@adobe.com> Co-authored-by: Eric Scouten <scouten@adobe.com>

* Update README.md Co-authored-by: Rand McKinney <rmckinne@adobe.com>

* reduce release binary size * Add -info option, improve error handling * improve error reporting

* Better message when fail to fetch remote manifest * Add info integration tests * Update sdk to get remote manifest data * info not found integration test * fix manifest size report for remote

…ntauth/c2patool#76) * treat source with claim as default parent ingredient

authored-by: Rand McKinney <crandmck@yahoo.com>

…+c2pa_crypto

…_crypto` (#796)

…aim.rs` (#799)

…+c2pa_crypto

) (When OpenSSL is used, it's just a wrapper around the synchronous code path.)

codecov · 2024-12-30T22:22:08Z

Codecov Report

Attention: Patch coverage is 66.08626% with 1266 lines in your changes missing coverage. Please review.

Project coverage is 80.25%. Comparing base (2b727cd) to head (9d3400a).
Report is 74 commits behind head on claim_v2.

Files with missing lines	Patch %	Lines
cli/src/main.rs	27.24%	283 Missing ⚠️
internal/crypto/src/cose/certificate_profile.rs	49.85%	178 Missing ⚠️
sdk/src/signer.rs	14.93%	131 Missing ⚠️
cli/src/callback_signer.rs	69.74%	82 Missing ⚠️
internal/crypto/src/cose/ocsp.rs	23.07%	70 Missing ⚠️
internal/crypto/src/cose/verifier.rs	72.67%	50 Missing ⚠️
internal/crypto/src/cose/sign.rs	78.30%	46 Missing ⚠️
internal/crypto/src/cose/sigtst.rs	74.80%	33 Missing ⚠️
sdk/src/asset_handlers/tiff_io.rs	61.62%	33 Missing ⚠️
sdk/src/error.rs	19.51%	33 Missing ⚠️
... and 28 more

Additional details and impacted files

@@             Coverage Diff              @@
##           claim_v2     #809      +/-   ##
============================================
- Coverage     81.52%   80.25%   -1.27%     
============================================
  Files            93      120      +27     
  Lines         30528    32932    +2404     
============================================
+ Hits          24889    26431    +1542     
- Misses         5639     6501     +862

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

* Apply changes from merge commit 13889dd * Introduce `cose::TimeStampStorage` enum * Plumb TimeStampStorage through first layers of SDK * Port `sigTst2` changes from `claim_v2` branch. See 6028853 * Port `sigTst2` validation changes from claim_v2 branch. See 6028853 * Move P1363 format check earlier in validation. See 6028853 * Pick up `claim_v2` changes to ContentInfo parsing. See bfdadc1

# Conflicts: # internal/crypto/src/time_stamp/mod.rs # sdk/src/cose_sign.rs # sdk/src/store.rs # sdk/src/utils/test.rs

…812) (Will allow me to make some other things private.)

sdk/src/cose_sign.rs

sdk/src/ingredient.rs

mauricefisher64

approved

gpeacock and others added 30 commits August 18, 2022 13:05

Prepare 0.3.0 release

18f7874

Fix Make release script & update readme (contentauth/c2patool#55)

c4a06bf

Updates publish workflow to upload binaries to github (contentauth/c2…

bf8ce46

…patool#58) Co-authored-by: Jack Farzan <jfarzan@adobe.com> Co-authored-by: Eric Scouten <scouten@adobe.com>

chore: Update README.md (contentauth/c2patool#54)

f9dbb15

* Update README.md Co-authored-by: Rand McKinney <rmckinne@adobe.com>

Add --info option (contentauth/c2patool#65)

d909a28

* reduce release binary size * Add -info option, improve error handling * improve error reporting

chore: Fix publish CI workflow (contentauth/c2patool#67)

8d82e74

chore: Fix a couple more spots where step renaming was missed

8abf901

chore: Also, we need an admin token to later push back to the repo

2a631d5

chore: Move GitHub release step into repo-prep workflow

2915d66

chore: Fix tagging step

3619651

Prepare 0.3.1 release

0efb134

chore: Publish from the newly-created commit

8d8a658

Upgrade cpufeatures to non-yanked version (contentauth/c2patool#68)

70bf13e

Prepare 0.3.2 release

8206eb9

Fix name mismatch that caused binary publish to fail

0897e8f

Prepare 0.3.3 release

240f995

Put the binary outputs in the correct release

d02191e

Prepare 0.3.4 release

6c5eb57

Fix reference to previous version tag

b05130d

Prepare 0.3.5 release

9c7995a

chore: Remove changelog history for partial releases

69e4507

Update Cargo.lock to 0.3.5

ad8abc9

chore: update readme --info (contentauth/c2patool#70)

c8dc171

Update Cargo.lock when publishing crate (contentauth/c2patool#71)

c0d46c3

Prepare 0.3.6 release

25dd9aa

Fetch remote manifests for --info (contentauth/c2patool#75)

b12a5a0

* Better message when fail to fetch remote manifest * Add info integration tests * Update sdk to get remote manifest data * info not found integration test * fix manifest size report for remote

Treat a source asset with a manifest store as a default parent (conte…

a267c1c

…ntauth/c2patool#76) * treat source with claim as default parent ingredient

Prepare 0.3.7 release

f74f656

Readme updates (contentauth/c2patool#62)

a2fc69a

authored-by: Rand McKinney <crandmck@yahoo.com>

scouten-adobe added 13 commits December 19, 2024 20:07

Merge commit '5b13bb271f1c052dadf2168e9f88df8e6441492f' into claim_v2…

d8ce409

…+c2pa_crypto

feat: Move COSE OCSP support into c2pa-crypto (#793)

eea9068

feat: Move get_cose_sign1 into c2pa-crypto crate (#794)

f8ba3fb

feat: Move signing_alg_from_sign1 into c2pa-crypto (#795)

fed4478

feat: Consolidate implementations of cert_chain_from_sign1 in `c2pa…

5b13bb2

…_crypto` (#796)

feat: Introduce c2pa_crypto::cose::Verifier (#797)

f1f356b

feat: Introduce c2pa_crypto::Verifier::verify_trust (#798)

be23bdc

chore: Move check_ocsp_response (the one that uses settings) to `cl…

690ed5c

…aim.rs` (#799)

Merge commit '690ed5cf7265d1734d889e63474788c39e799ca5' into claim_v2…

d7e2978

…+c2pa_crypto

feat: Make AsyncRawSignatureValidator available on all platforms (#800

1ca698d

) (When OpenSSL is used, it's just a wrapper around the synchronous code path.)

feat: Move COSE signature verification into c2pa_crypto (#801)

66b57b5

feat: Move COSE timestamp generation into c2pa_crypto (#803)

25c89ed

feat: Move COSE signing into c2pa_crypto crate (#807)

34b7139

scouten-adobe self-assigned this Dec 30, 2024

scouten-adobe added 2 commits January 2, 2025 13:29

Merge branch 'main' into claim_v2+c2pa_crypto

cac55ab

# Conflicts: # internal/crypto/src/time_stamp/mod.rs # sdk/src/cose_sign.rs # sdk/src/store.rs # sdk/src/utils/test.rs

scouten-adobe requested a review from mauricefisher64 January 2, 2025 21:45

scouten-adobe and others added 4 commits January 2, 2025 14:31

feat: Add new function c2pa_crypto::cose::signing_time_from_sign1 (#…

1c861b9

…812) (Will allow me to make some other things private.)

feat: Review c2pa-crypto crate API (#813)

7a87e11

Merge branch 'main' into claim_v2+c2pa_crypto

d42f488

Merge branch 'claim_v2' into claim_v2+c2pa_crypto

ea9a3e8

mauricefisher64 reviewed Jan 10, 2025

View reviewed changes

sdk/src/cose_sign.rs Outdated Show resolved Hide resolved

mauricefisher64 reviewed Jan 10, 2025

View reviewed changes

sdk/src/ingredient.rs Show resolved Hide resolved

mauricefisher64 approved these changes Jan 10, 2025

View reviewed changes

gpeacock added 5 commits January 14, 2025 10:52

Merge branch 'claim_v2' into claim_v2+c2pa_crypto

f86a101

Merge branch 'claim_v2' into claim_v2+c2pa_crypto

f562600

fix: c2patool upgrades to API change in Ingredient.title()

eef13c5

chore: PR comment cleanup

a022505

chore: clippy fixes

9d3400a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Bring `claim_v2` branch up to date with `main` branch #809

fix: Bring `claim_v2` branch up to date with `main` branch #809

scouten-adobe commented Dec 30, 2024

codecov bot commented Dec 30, 2024 •

edited

Loading

mauricefisher64 left a comment

fix: Bring claim_v2 branch up to date with main branch #809

Are you sure you want to change the base?

fix: Bring claim_v2 branch up to date with main branch #809

Conversation

scouten-adobe commented Dec 30, 2024

codecov bot commented Dec 30, 2024 • edited Loading

Codecov Report

mauricefisher64 left a comment

Choose a reason for hiding this comment

fix: Bring `claim_v2` branch up to date with `main` branch #809

fix: Bring `claim_v2` branch up to date with `main` branch #809

codecov bot commented Dec 30, 2024 •

edited

Loading