Skip to content

Commit e10de81

Browse files
committed
deps: update zlib to upstream 8bbd6c31
Updated as described in doc/contributing/maintaining-zlib.md.
1 parent da44fd8 commit e10de81

File tree

110 files changed

+18311
-3454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+18311
-3454
lines changed

deps/zlib/BUILD.gn

Lines changed: 223 additions & 82 deletions
Large diffs are not rendered by default.

deps/zlib/DIR_METADATA

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
monorail: {
2+
component: "Internals"
3+
}

deps/zlib/LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version 1.2.11, January 15th, 2017
1+
version 1.2.12, March 27th, 2022
22

3-
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
3+
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
44

55
This software is provided 'as-is', without any express or implied
66
warranty. In no event will the authors be held liable for any damages

deps/zlib/OWNERS

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
22
33
4-
5-
6-
7-
# COMPONENT: Internals
4+
5+

deps/zlib/README.chromium

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Name: zlib
22
Short Name: zlib
33
URL: http://zlib.net/
4-
Version: 1.2.11
4+
Version: 1.2.13
5+
CPEPrefix: cpe:/a:zlib:zlib:1.2.13
56
Security Critical: yes
67
License: Custom license
78
License File: LICENSE
@@ -26,3 +27,6 @@ Local Modifications:
2627
- Plus the changes in 'patches' folder.
2728
- Code in contrib/ other than contrib/minizip was added to match zlib's
2829
contributor layout.
30+
- In sync with 1.2.13 official release
31+
- ZIP reader modified to allow for progress callbacks during extraction.
32+
- ZIP reader modified to add detection of AES encrypted content.

deps/zlib/adler32.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
5959
# define MOD63(a) a %= BASE
6060
#endif
6161

62-
#if defined(ADLER32_SIMD_SSSE3)
63-
#include "adler32_simd.h"
64-
#include "x86.h"
65-
#elif defined(ADLER32_SIMD_NEON)
62+
#include "cpu_features.h"
63+
#if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON)
6664
#include "adler32_simd.h"
6765
#endif
6866

@@ -76,10 +74,10 @@ uLong ZEXPORT adler32_z(adler, buf, len)
7674
unsigned n;
7775

7876
#if defined(ADLER32_SIMD_SSSE3)
79-
if (x86_cpu_enable_ssse3 && buf && len >= 64)
77+
if (buf != Z_NULL && len >= 64 && x86_cpu_enable_ssse3)
8078
return adler32_simd_(adler, buf, len);
8179
#elif defined(ADLER32_SIMD_NEON)
82-
if (buf && len >= 64)
80+
if (buf != Z_NULL && len >= 64)
8381
return adler32_simd_(adler, buf, len);
8482
#endif
8583

@@ -108,7 +106,7 @@ uLong ZEXPORT adler32_z(adler, buf, len)
108106
*/
109107
if (buf == Z_NULL) {
110108
if (!len) /* Assume user is calling adler32(0, NULL, 0); */
111-
x86_check_features();
109+
cpu_check_features();
112110
return 1L;
113111
}
114112
#else

deps/zlib/adler32_simd.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* adler32_simd.c
22
*
3-
* Copyright 2017 The Chromium Authors. All rights reserved.
3+
* Copyright 2017 The Chromium Authors
44
* Use of this source code is governed by a BSD-style license that can be
55
* found in the Chromium source repository LICENSE file.
66
*
@@ -50,13 +50,9 @@
5050
#define NMAX 5552
5151

5252
#if defined(ADLER32_SIMD_SSSE3)
53-
#ifndef __GNUC__
54-
#define __attribute__()
55-
#endif
5653

5754
#include <tmmintrin.h>
5855

59-
__attribute__((target("ssse3")))
6056
uint32_t ZLIB_INTERNAL adler32_simd_( /* SSSE3 */
6157
uint32_t adler,
6258
const unsigned char *buf,

deps/zlib/adler32_simd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* adler32_simd.h
22
*
3-
* Copyright 2017 The Chromium Authors. All rights reserved.
3+
* Copyright 2017 The Chromium Authors
44
* Use of this source code is governed by a BSD-style license that can be
55
* found in the Chromium source repository LICENSE file.
66
*/

deps/zlib/arm_features.c

Lines changed: 0 additions & 90 deletions
This file was deleted.

deps/zlib/arm_features.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)