Skip to content

Commit 6cab4bb

Browse files
build(deps): bump boring from 1.1.6 to 2.0.0 (#1413)
Bumps [boring](https://github.com/cloudflare/boring) from 1.1.6 to 2.0.0. - [Release notes](https://github.com/cloudflare/boring/releases) - [Changelog](https://github.com/cloudflare/boring/blob/master/CHANGELOG.md) - [Commits](https://github.com/cloudflare/boring/commits) --- updated-dependencies: - dependency-name: boring dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oliver Gould <[email protected]>
1 parent dba2c73 commit 6cab4bb

File tree

3 files changed

+41
-139
lines changed

3 files changed

+41
-139
lines changed

Cargo.lock

Lines changed: 40 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ dependencies = [
2323
"memchr",
2424
]
2525

26-
[[package]]
27-
name = "ansi_term"
28-
version = "0.11.0"
29-
source = "registry+https://github.com/rust-lang/crates.io-index"
30-
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
31-
dependencies = [
32-
"winapi",
33-
]
34-
3526
[[package]]
3627
name = "ansi_term"
3728
version = "0.12.1"
@@ -88,17 +79,6 @@ dependencies = [
8879
"syn",
8980
]
9081

91-
[[package]]
92-
name = "atty"
93-
version = "0.2.14"
94-
source = "registry+https://github.com/rust-lang/crates.io-index"
95-
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
96-
dependencies = [
97-
"hermit-abi",
98-
"libc",
99-
"winapi",
100-
]
101-
10282
[[package]]
10383
name = "autocfg"
10484
version = "1.0.1"
@@ -113,25 +93,21 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
11393

11494
[[package]]
11595
name = "bindgen"
116-
version = "0.57.0"
96+
version = "0.59.2"
11797
source = "registry+https://github.com/rust-lang/crates.io-index"
118-
checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
98+
checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
11999
dependencies = [
120100
"bitflags",
121101
"cexpr",
122102
"clang-sys",
123-
"clap",
124-
"env_logger",
125103
"lazy_static",
126104
"lazycell",
127-
"log",
128105
"peeking_take_while",
129106
"proc-macro2",
130107
"quote",
131108
"regex",
132109
"rustc-hash",
133110
"shlex",
134-
"which 3.1.1",
135111
]
136112

137113
[[package]]
@@ -142,9 +118,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
142118

143119
[[package]]
144120
name = "boring"
145-
version = "1.1.6"
121+
version = "2.0.0"
146122
source = "registry+https://github.com/rust-lang/crates.io-index"
147-
checksum = "de45976d3e185902843f8ac67fcdc3f10f47cb96e275a545218273bf09a592f6"
123+
checksum = "6953f3fea6f9f20c15e81b3f4ef2217ea06cc05652a0db49c0abb35626b0fad1"
148124
dependencies = [
149125
"bitflags",
150126
"boring-sys",
@@ -155,9 +131,9 @@ dependencies = [
155131

156132
[[package]]
157133
name = "boring-sys"
158-
version = "1.1.1"
134+
version = "2.0.0"
159135
source = "registry+https://github.com/rust-lang/crates.io-index"
160-
checksum = "d2416bce1bcabf0d7995ce0338ec2425b8766a4d5a39d758a3638008911642fc"
136+
checksum = "9e43b1d5c3524929bc64d56e604f7362e357d509ff8b29903605fd72f4f41eae"
161137
dependencies = [
162138
"bindgen",
163139
"cmake",
@@ -189,11 +165,11 @@ checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
189165

190166
[[package]]
191167
name = "cexpr"
192-
version = "0.4.0"
168+
version = "0.6.0"
193169
source = "registry+https://github.com/rust-lang/crates.io-index"
194-
checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
170+
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
195171
dependencies = [
196-
"nom 5.1.2",
172+
"nom 7.1.0",
197173
]
198174

199175
[[package]]
@@ -213,21 +189,6 @@ dependencies = [
213189
"libloading",
214190
]
215191

216-
[[package]]
217-
name = "clap"
218-
version = "2.33.3"
219-
source = "registry+https://github.com/rust-lang/crates.io-index"
220-
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
221-
dependencies = [
222-
"ansi_term 0.11.0",
223-
"atty",
224-
"bitflags",
225-
"strsim",
226-
"textwrap",
227-
"unicode-width",
228-
"vec_map",
229-
]
230-
231192
[[package]]
232193
name = "cmake"
233194
version = "0.1.46"
@@ -302,19 +263,6 @@ dependencies = [
302263
"syn",
303264
]
304265

305-
[[package]]
306-
name = "env_logger"
307-
version = "0.8.4"
308-
source = "registry+https://github.com/rust-lang/crates.io-index"
309-
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
310-
dependencies = [
311-
"atty",
312-
"humantime",
313-
"log",
314-
"regex",
315-
"termcolor",
316-
]
317-
318266
[[package]]
319267
name = "fixedbitset"
320268
version = "0.4.0"
@@ -341,18 +289,30 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
341289

342290
[[package]]
343291
name = "foreign-types"
344-
version = "0.3.2"
292+
version = "0.5.0"
345293
source = "registry+https://github.com/rust-lang/crates.io-index"
346-
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
294+
checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
347295
dependencies = [
296+
"foreign-types-macros",
348297
"foreign-types-shared",
349298
]
350299

300+
[[package]]
301+
name = "foreign-types-macros"
302+
version = "0.2.1"
303+
source = "registry+https://github.com/rust-lang/crates.io-index"
304+
checksum = "63f713f8b2aa9e24fec85b0e290c56caee12e3b6ae0aeeda238a75b28251afd6"
305+
dependencies = [
306+
"proc-macro2",
307+
"quote",
308+
"syn",
309+
]
310+
351311
[[package]]
352312
name = "foreign-types-shared"
353-
version = "0.1.1"
313+
version = "0.3.0"
354314
source = "registry+https://github.com/rust-lang/crates.io-index"
355-
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
315+
checksum = "7684cf33bb7f28497939e8c7cf17e3e4e3b8d9a0080ffa4f8ae2f515442ee855"
356316

357317
[[package]]
358318
name = "form_urlencoded"
@@ -577,12 +537,6 @@ version = "1.0.1"
577537
source = "registry+https://github.com/rust-lang/crates.io-index"
578538
checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
579539

580-
[[package]]
581-
name = "humantime"
582-
version = "2.1.0"
583-
source = "registry+https://github.com/rust-lang/crates.io-index"
584-
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
585-
586540
[[package]]
587541
name = "hyper"
588542
version = "0.14.16"
@@ -1765,6 +1719,12 @@ version = "2.4.1"
17651719
source = "registry+https://github.com/rust-lang/crates.io-index"
17661720
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
17671721

1722+
[[package]]
1723+
name = "minimal-lexical"
1724+
version = "0.2.1"
1725+
source = "registry+https://github.com/rust-lang/crates.io-index"
1726+
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
1727+
17681728
[[package]]
17691729
name = "miniz_oxide"
17701730
version = "0.4.4"
@@ -1811,11 +1771,12 @@ checksum = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff"
18111771

18121772
[[package]]
18131773
name = "nom"
1814-
version = "5.1.2"
1774+
version = "7.1.0"
18151775
source = "registry+https://github.com/rust-lang/crates.io-index"
1816-
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
1776+
checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
18171777
dependencies = [
18181778
"memchr",
1779+
"minimal-lexical",
18191780
"version_check",
18201781
]
18211782

@@ -1997,7 +1958,7 @@ dependencies = [
19971958
"prost-types",
19981959
"regex",
19991960
"tempfile",
2000-
"which 4.2.2",
1961+
"which",
20011962
]
20021963

20031964
[[package]]
@@ -2257,9 +2218,9 @@ dependencies = [
22572218

22582219
[[package]]
22592220
name = "shlex"
2260-
version = "0.1.1"
2221+
version = "1.1.0"
22612222
source = "registry+https://github.com/rust-lang/crates.io-index"
2262-
checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
2223+
checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
22632224

22642225
[[package]]
22652226
name = "signal-hook-registry"
@@ -2309,12 +2270,6 @@ version = "0.5.2"
23092270
source = "registry+https://github.com/rust-lang/crates.io-index"
23102271
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
23112272

2312-
[[package]]
2313-
name = "strsim"
2314-
version = "0.8.0"
2315-
source = "registry+https://github.com/rust-lang/crates.io-index"
2316-
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
2317-
23182273
[[package]]
23192274
name = "syn"
23202275
version = "1.0.81"
@@ -2340,24 +2295,6 @@ dependencies = [
23402295
"winapi",
23412296
]
23422297

2343-
[[package]]
2344-
name = "termcolor"
2345-
version = "1.1.2"
2346-
source = "registry+https://github.com/rust-lang/crates.io-index"
2347-
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
2348-
dependencies = [
2349-
"winapi-util",
2350-
]
2351-
2352-
[[package]]
2353-
name = "textwrap"
2354-
version = "0.11.0"
2355-
source = "registry+https://github.com/rust-lang/crates.io-index"
2356-
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
2357-
dependencies = [
2358-
"unicode-width",
2359-
]
2360-
23612298
[[package]]
23622299
name = "thiserror"
23632300
version = "1.0.30"
@@ -2423,9 +2360,9 @@ dependencies = [
24232360

24242361
[[package]]
24252362
name = "tokio-boring"
2426-
version = "2.1.3"
2363+
version = "2.1.4"
24272364
source = "registry+https://github.com/rust-lang/crates.io-index"
2428-
checksum = "14a691f1783bcff212705a7be3ce90428511f7012d085b948741b40a81acb8dd"
2365+
checksum = "df04f2d29312e4f942f3ff9f7d3f6a6c0cf4a1f3f12c7266be888b9196eb36ec"
24292366
dependencies = [
24302367
"boring",
24312368
"boring-sys",
@@ -2663,7 +2600,7 @@ version = "0.3.3"
26632600
source = "registry+https://github.com/rust-lang/crates.io-index"
26642601
checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3"
26652602
dependencies = [
2666-
"ansi_term 0.12.1",
2603+
"ansi_term",
26672604
"lazy_static",
26682605
"matchers",
26692606
"parking_lot",
@@ -2751,12 +2688,6 @@ version = "1.8.0"
27512688
source = "registry+https://github.com/rust-lang/crates.io-index"
27522689
checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
27532690

2754-
[[package]]
2755-
name = "unicode-width"
2756-
version = "0.1.9"
2757-
source = "registry+https://github.com/rust-lang/crates.io-index"
2758-
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
2759-
27602691
[[package]]
27612692
name = "unicode-xid"
27622693
version = "0.2.2"
@@ -2781,12 +2712,6 @@ dependencies = [
27812712
"percent-encoding",
27822713
]
27832714

2784-
[[package]]
2785-
name = "vec_map"
2786-
version = "0.8.2"
2787-
source = "registry+https://github.com/rust-lang/crates.io-index"
2788-
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
2789-
27902715
[[package]]
27912716
name = "version_check"
27922717
version = "0.9.3"
@@ -2882,15 +2807,6 @@ dependencies = [
28822807
"untrusted",
28832808
]
28842809

2885-
[[package]]
2886-
name = "which"
2887-
version = "3.1.1"
2888-
source = "registry+https://github.com/rust-lang/crates.io-index"
2889-
checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
2890-
dependencies = [
2891-
"libc",
2892-
]
2893-
28942810
[[package]]
28952811
name = "which"
28962812
version = "4.2.2"
@@ -2924,15 +2840,6 @@ version = "0.4.0"
29242840
source = "registry+https://github.com/rust-lang/crates.io-index"
29252841
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
29262842

2927-
[[package]]
2928-
name = "winapi-util"
2929-
version = "0.1.5"
2930-
source = "registry+https://github.com/rust-lang/crates.io-index"
2931-
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
2932-
dependencies = [
2933-
"winapi",
2934-
]
2935-
29362843
[[package]]
29372844
name = "winapi-x86_64-pc-windows-gnu"
29382845
version = "0.4.0"

deny.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ highlight = "all"
4747
deny = [
4848
{ name = "rustls", wrappers = ["tokio-rustls"] }
4949
]
50-
skip = [
51-
# boring-sys pulls in an old version via bindgen. See
52-
# https://github.com/cloudflare/boring/pull/55.
53-
{ name = "ansi_term" },
54-
]
5550
skip-tree = [
5651
# Hasn't seen a new release since 2017. Pulls in an older version of nom.
5752
{ name = "procinfo" }

linkerd/meshtls/boring/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2018"
77
publish = false
88

99
[dependencies]
10-
boring = "1"
10+
boring = "2"
1111
futures = { version = "0.3", default-features = false }
1212
hex = "0.4" # used for debug logging
1313
linkerd-error = { path = "../../error" }

0 commit comments

Comments
 (0)