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.

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

fix: Decrypt the read bytes in ZipCrypto instead of entire buffer #39

Merged
merged 12 commits into from
Apr 30, 2024

Conversation

awaken1ng
Copy link

Resend of zip-rs#431.

Fixes corrupt deflate stream error when decompressing an encrypted archive with buffered reader (zip-rs#280).

@Pr0methean
Copy link
Member

Pr0methean commented Apr 28, 2024

Sorry for all the updates; I've been trying to troubleshoot https://github.com/zip-rs/zip2/actions/workflows/auto_merge_prs.yml, which somehow broke when I transferred this repo to be organization-owned in order to enable merge queues (issue now tracked at #40).

@Pr0methean Pr0methean added this pull request to the merge queue Apr 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Apr 29, 2024
@Pr0methean Pr0methean added this pull request to the merge queue Apr 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 29, 2024
@awaken1ng
Copy link
Author

Understandable, good old CI whack-a-mole.

Looked at the fuzz_write_with_no_features failure, originates from CentralDirectoryEnd here, unrelated to PR changes.

Should I rebase to clean up the merge branch commits?

@Pr0methean
Copy link
Member

You can if you like; meanwhile I'll look into the fuzz failure today.

@Pr0methean Pr0methean added this pull request to the merge queue Apr 29, 2024
@Pr0methean
Copy link
Member

Found the cause of the fuzz failure; 4297229 should fix it.

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 29, 2024
@Pr0methean Pr0methean added this pull request to the merge queue Apr 29, 2024
@Pr0methean
Copy link
Member

Update: merge-queue checks may fail again because of a missing DevSkim check, but fd0a113 should fix that.

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Apr 30, 2024
@Pr0methean Pr0methean added this pull request to the merge queue Apr 30, 2024
@Pr0methean
Copy link
Member

Pr0methean commented Apr 30, 2024

Merge-queue checks timed out again; decreased the amount of fuzz testing so that the GitHub Actions workers can catch up with the backlog.

@Pr0methean Pr0methean removed this pull request from the merge queue due to a manual request Apr 30, 2024
@Pr0methean Pr0methean added this pull request to the merge queue Apr 30, 2024
Merged via the queue into zip-rs:master with commit b3991bb Apr 30, 2024
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants