diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/zip/lib/zip_source_pkware.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/zip/lib/zip_source_pkware.c')
| -rw-r--r-- | ext/zip/lib/zip_source_pkware.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/zip/lib/zip_source_pkware.c b/ext/zip/lib/zip_source_pkware.c index f6cbf1d2d5..905dbc1d26 100644 --- a/ext/zip/lib/zip_source_pkware.c +++ b/ext/zip/lib/zip_source_pkware.c @@ -17,7 +17,7 @@ 3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -31,7 +31,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + #include <stdlib.h> #include <string.h> @@ -49,7 +49,7 @@ struct trad_pkware { #define KEY1 591751049 #define KEY2 878082192 - + static void decrypt(struct trad_pkware *, zip_uint8_t *, const zip_uint8_t *, zip_uint64_t, int); @@ -58,7 +58,7 @@ static zip_int64_t pkware_decrypt(struct zip_source *, void *, void *, zip_uint64_t, enum zip_source_cmd); static void pkware_free(struct trad_pkware *); - + struct zip_source * zip_source_pkware(struct zip *za, struct zip_source *src, @@ -96,7 +96,7 @@ zip_source_pkware(struct zip *za, struct zip_source *src, return s2; } - + static void decrypt(struct trad_pkware *ctx, zip_uint8_t *out, const zip_uint8_t *in, @@ -128,7 +128,7 @@ decrypt(struct trad_pkware *ctx, zip_uint8_t *out, const zip_uint8_t *in, } } - + static int decrypt_header(struct zip_source *src, struct trad_pkware *ctx) @@ -142,7 +142,7 @@ decrypt_header(struct zip_source *src, struct trad_pkware *ctx) zip_source_error(src, ctx->e, ctx->e+1); return -1; } - + if (n != HEADERLEN) { ctx->e[0] = ZIP_ER_EOF; ctx->e[1] = 0; @@ -168,7 +168,7 @@ decrypt_header(struct zip_source *src, struct trad_pkware *ctx) return 0; } - + static zip_int64_t pkware_decrypt(struct zip_source *src, void *ud, void *data, @@ -225,7 +225,7 @@ pkware_decrypt(struct zip_source *src, void *ud, void *data, } } - + static void pkware_free(struct trad_pkware *ctx) |