| commit | f64d6137af9719901f9399f446deb56945b25789 | [log] [tgz] |
|---|---|---|
| author | Thomas Klausner <tk@giga.or.at> | Fri Apr 17 11:12:28 2020 +0200 |
| committer | Thomas Klausner <tk@giga.or.at> | Fri Apr 17 11:12:28 2020 +0200 |
| tree | c1b47cd50a73013247eb7b7d726fc9ea8f0d8cd4 | |
| parent | 5487dcae97291c5eb598ea129aff045e1e2eeb65 [diff] |
Set version-needed correctly when using AES encryption.
diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c index 2bbb63d..340c70b 100644 --- a/lib/zip_dirent.c +++ b/lib/zip_dirent.c
@@ -1099,6 +1099,11 @@ return; } + if (de->encryption_method == ZIP_EM_AES_128 || de->encryption_method == ZIP_EM_AES_192 || de->encryption_method == ZIP_EM_AES_256) { + de->version_needed = 51; + return; + } + if (de->comp_method == ZIP_CM_BZIP2) { de->version_needed = 46; return;
diff --git a/regress/encrypt-aes128-noentropy.zip b/regress/encrypt-aes128-noentropy.zip index c588fc9..333f031 100644 --- a/regress/encrypt-aes128-noentropy.zip +++ b/regress/encrypt-aes128-noentropy.zip Binary files differ
diff --git a/regress/encrypt-aes192-noentropy.zip b/regress/encrypt-aes192-noentropy.zip index 59605a0..6ada818 100644 --- a/regress/encrypt-aes192-noentropy.zip +++ b/regress/encrypt-aes192-noentropy.zip Binary files differ
diff --git a/regress/encrypt-aes256-noentropy.zip b/regress/encrypt-aes256-noentropy.zip index 742ada6..ff3be84 100644 --- a/regress/encrypt-aes256-noentropy.zip +++ b/regress/encrypt-aes256-noentropy.zip Binary files differ