Skip to content

refactor: change vendor_version#817

Merged
Its-Just-Nans merged 28 commits intomasterfrom
rewrite-aes-settings-3
May 5, 2026
Merged

refactor: change vendor_version#817
Its-Just-Nans merged 28 commits intomasterfrom
rewrite-aes-settings-3

Conversation

@Its-Just-Nans
Copy link
Copy Markdown
Member

@Its-Just-Nans Its-Just-Nans commented May 4, 2026

Following #814 and #815 (merge them first)

  • change the vendor_version

Diff with previous MR https://github.com/zip-rs/zip2/compare/rewrite-aes-settings-2...rewrite-aes-settings-3?expand=1

@Its-Just-Nans Its-Just-Nans self-assigned this May 4, 2026
@Its-Just-Nans Its-Just-Nans changed the base branch from rewrite-aes-settings-2 to master May 4, 2026 21:24
@amazon-q-developer
Copy link
Copy Markdown
Contributor

⚠️ Review Failed

I was unable to finalize my review because the pull request head or merge base was modified since I began my review. Please try again.

Request ID: 70d19b7d-fc9c-5e92-9be1-f90eec520486

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request enables support for reading encrypted ZIP files from a stream by introducing the read_zipfile_from_stream_with_compressed_size_and_options function and refactoring the crypto reader logic. Key changes include moving encryption-related metadata handling into AesVendorVersion and updating the streaming reader to support passwords and encryption flag overrides. Feedback was provided regarding src/read/stream.rs to avoid swallowing I/O errors during extra field parsing and to ensure that the user-provided compressed size takes precedence over local header metadata.

Comment thread src/read/stream.rs Outdated
Comment thread src/types.rs Fixed
@Pr0methean Pr0methean added this to the 9.0.0 milestone May 4, 2026
@Pr0methean Pr0methean mentioned this pull request May 4, 2026
2 tasks
@Pr0methean Pr0methean modified the milestones: 9.0.0, 9.0.0-pre1 May 4, 2026
@Its-Just-Nans Its-Just-Nans changed the title refactor: change vendor_version and allow AES in zip file stream refactor: change vendor_version May 5, 2026
@Its-Just-Nans Its-Just-Nans enabled auto-merge May 5, 2026 11:36
@Its-Just-Nans Its-Just-Nans added this pull request to the merge queue May 5, 2026
Merged via the queue into master with commit f3eeccf May 5, 2026
133 checks passed
@Its-Just-Nans Its-Just-Nans deleted the rewrite-aes-settings-3 branch May 5, 2026 15:28
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.

3 participants