Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add ZIP support (+ EPUB, Office Open XML, Open Document, and OpenXPS) and Collection Data Hash assertion #499

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

feat: Add ZIP support (+ EPUB, Office Open XML, Open Document, and OpenXPS) and Collection Data Hash assertion #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2c22931
Foundation for ZIP support
ok-nick Jul 8, 2024
a84411a
Foundation for collection data hash assertion
ok-nick Jul 8, 2024
c03d653
Collection assertion hash resolver
ok-nick Jul 9, 2024
9e4af21
Rework collection hash assertion
ok-nick Jul 9, 2024
6559e6f
More collection assertion validation
ok-nick Jul 9, 2024
ac1a12d
Fix ZIP unit tests
ok-nick Jul 9, 2024
d1f3eab
Update memchr dep
ok-nick Jul 9, 2024
9b5be12
Update memchr dep in make_test_images
ok-nick Jul 9, 2024
f57b832
Add ZIP unit tests
ok-nick Jul 9, 2024
5cf73e0
Merge branch 'main' into ok-nick/zip
ok-nick Jul 9, 2024
7700453
Collection Hash Assertion relative path validation
ok-nick Jul 10, 2024
7994817
Add collection hash unit tests
ok-nick Jul 10, 2024
484cca8
Pass CI for collection hash
ok-nick Jul 10, 2024
32fc674
Fix ZIP offsets/lens
ok-nick Jul 10, 2024
d668888
Collection assertion docs, optimizations, and cleanup
ok-nick Jul 11, 2024
11bef80
Cleanup collection hash errors
ok-nick Jul 12, 2024
d383ce8
Rework collection hash and add better validation
ok-nick Jul 12, 2024
744045d
More file types for ZIP unit tests
ok-nick Jul 12, 2024
d0704e9
Merge remote-tracking branch 'origin' into ok-nick/zip
ok-nick Aug 8, 2024
db83807
Hash central directory and add unit tests
ok-nick Aug 8, 2024
c2feb82
Fix thiserror dependency conflict
ok-nick Aug 8, 2024
97ebd56
Use latest zip crate (with fix)
ok-nick Aug 29, 2024
e29fe8b
Merge remote-tracking branch 'origin' into ok-nick/zip
ok-nick Aug 29, 2024
a5d0533
Update log crate to fix dependency conflict
ok-nick Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions make_test_images/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ c2pa = { path = "../sdk", default-features = false, features = [
"file_io",
] }
env_logger = "0.11"
log = "0.4.8"
log = "0.4.22"
image = { version = "0.25.2", default-features = false, features = [
"jpeg",
"png",
] }
memchr = "2.7.1"
memchr = "2.7.4"
nom = "7.1.3"
regex = "1.5.6"
serde = "1.0.197"
Expand Down
10 changes: 5 additions & 5 deletions sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ hex = "0.4.3"
id3 = "=1.12.0"
img-parts = "0.3.0"
jfifdump = "0.5.1"
log = "0.4.8"
log = "0.4.22"
lopdf = { version = "0.31.0", optional = true }
lazy_static = "1.4.0"
memchr = "2.7.1"
memchr = "2.7.4"
multibase = "0.9.0"
multihash = "0.11.4"
mp4 = "0.13.0"
Expand All @@ -121,13 +121,13 @@ serde_with = "3.4.0"
serde-transcode = "1.1.1"
sha2 = "0.10.6"
tempfile = "3.10.1"
thiserror = "1.0.61"
thiserror = "1.0.63"
treeline = "0.1.0"
url = "2.2.2, <2.5.1" # Can't use 2.5.1 or newer until new license is reviewed.
url = "2.2.2, <2.5.1" # Can't use 2.5.1 or newer until new license is reviewed.
uuid = { version = "1.7.0", features = ["serde", "v4", "js"] }
x509-parser = "0.15.1"
x509-certificate = "0.21.0"
zip = { version = "0.6.6", default-features = false }
zip = "2.2.0"


[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand Down
Loading
Loading