1*86ee64e7SAndroid Build Coastguard Workercommit f3ace98803035b8425d127fb3d874dafe0b9475a 2*86ee64e7SAndroid Build Coastguard WorkerAuthor: Che-yu Wu <[email protected]> 3*86ee64e7SAndroid Build Coastguard WorkerDate: Mon Aug 6 14:09:22 2018 +0000 4*86ee64e7SAndroid Build Coastguard Worker 5*86ee64e7SAndroid Build Coastguard Worker Enable traditional PKWARE decryption in zlib/contrib/minizip. 6*86ee64e7SAndroid Build Coastguard Worker 7*86ee64e7SAndroid Build Coastguard Worker Remove the #define which enables NOUNCRYPT by default. 8*86ee64e7SAndroid Build Coastguard Worker Correct the value of rest_read_compressed when decompressing an encrypted zip. 9*86ee64e7SAndroid Build Coastguard Worker 10*86ee64e7SAndroid Build Coastguard Worker Bug: crbug.com/869541 11*86ee64e7SAndroid Build Coastguard Worker Change-Id: Ia86c1d234a8193f405147d35ad05c29fe86f812d 12*86ee64e7SAndroid Build Coastguard Worker Reviewed-on: https://chromium-review.googlesource.com/1161109 13*86ee64e7SAndroid Build Coastguard Worker Reviewed-by: Chris Blume <[email protected]> 14*86ee64e7SAndroid Build Coastguard Worker Commit-Queue: Che-yu Wu <[email protected]> 15*86ee64e7SAndroid Build Coastguard Worker Cr-Commit-Position: refs/heads/master@{#580862} 16*86ee64e7SAndroid Build Coastguard Worker 17*86ee64e7SAndroid Build Coastguard Workerdiff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c 18*86ee64e7SAndroid Build Coastguard Workerindex 82275d6c1775d..c8a01b23efd42 100644 19*86ee64e7SAndroid Build Coastguard Worker--- a/third_party/zlib/contrib/minizip/unzip.c 20*86ee64e7SAndroid Build Coastguard Worker+++ b/third_party/zlib/contrib/minizip/unzip.c 21*86ee64e7SAndroid Build Coastguard Worker@@ -68,10 +68,6 @@ 22*86ee64e7SAndroid Build Coastguard Worker #include <stdlib.h> 23*86ee64e7SAndroid Build Coastguard Worker #include <string.h> 24*86ee64e7SAndroid Build Coastguard Worker 25*86ee64e7SAndroid Build Coastguard Worker-#ifndef NOUNCRYPT 26*86ee64e7SAndroid Build Coastguard Worker- #define NOUNCRYPT 27*86ee64e7SAndroid Build Coastguard Worker-#endif 28*86ee64e7SAndroid Build Coastguard Worker- 29*86ee64e7SAndroid Build Coastguard Worker #include "zlib.h" 30*86ee64e7SAndroid Build Coastguard Worker #include "unzip.h" 31*86ee64e7SAndroid Build Coastguard Worker 32*86ee64e7SAndroid Build Coastguard Worker@@ -1502,6 +1498,7 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method, 33*86ee64e7SAndroid Build Coastguard Worker zdecode(s->keys,s->pcrc_32_tab,source[i]); 34*86ee64e7SAndroid Build Coastguard Worker 35*86ee64e7SAndroid Build Coastguard Worker s->pfile_in_zip_read->pos_in_zipfile+=12; 36*86ee64e7SAndroid Build Coastguard Worker+ s->pfile_in_zip_read->rest_read_compressed-=12; 37*86ee64e7SAndroid Build Coastguard Worker s->encrypted=1; 38*86ee64e7SAndroid Build Coastguard Worker } 39*86ee64e7SAndroid Build Coastguard Worker # endif 40