Allow ZipFile to accept empty strings as passwords when decrypting AES entries #472
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Updated to remove accidental test dependency on line ednding settings. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
refs #471
Two changes:
In the current setter for
ZipFile.Password, it only updates therawPassword_member if the new value isn't null or empty.That seems wrong to me in general, as it means that setting the password to a value and then setting it to null would leave the member set to the old value?
This PR changes it to always just save the new value in
rawPassword_.In CreateAndInitDecryptionStream, throw if the string password is null, but proceed to try to use it if the string is empty.
The current code uses
HasKeysto check that it has the keys, but then uses the password instead, which doesn't sound quite right? (though looking at the wayKeysRequired/OnKeysRequiredI'm not sure if it works to get the password (rather than the keys') for decrypting AES entries?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.