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

Consider AES overhead when testing encrypted folder entries #503

Merged
merged 2 commits into from
Aug 16, 2020

Conversation

Numpsy
Copy link
Contributor

@Numpsy Numpsy commented Aug 8, 2020

refs my last comment in #317 - TestArchive doesn't seem to consider AES encryption when testing encrypted directory entries (it always uses ZipConstants.CryptoHeaderSize).

This is just a simple change to use the newly added EncryptionOverheadSize instead.

I'm not sure what the '+ 2' is allowing for? (empty compressed data overhead? I'm not sure what the comment in the non-encrypted case about not knowing the true size refers to, when directories don't really have a size?)

I certify that I own, and have sufficient rights to contribute, all source code and related material intended to be compiled or integrated with the source code for the SharpZipLib open source product (the "Contribution"). My Contribution is licensed under the MIT License.

@Numpsy
Copy link
Contributor Author

Numpsy commented Aug 8, 2020

(tests presently fail on master because of #353 - might need to finish that one first for testing purposes, or merge the PRs together)

@piksel piksel merged commit 61d3a21 into icsharpcode:master Aug 16, 2020
@Numpsy Numpsy deleted the rw/zos/test_aes_folder branch August 16, 2020 13:46
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