Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 275123c

Browse files
committed
Auto merge of #106686 - pietroalbini:pa-cve-beta, r=pietroalbini
[beta] Fix CVE-2022-46176 See https://blog.rust-lang.org/2023/01/10/cve-2022-46176.html r? `@ghost`
2 parents 51b0345 + 7c58986 commit 275123c

File tree

4 files changed

+60
-20
lines changed

4 files changed

+60
-20
lines changed

‎Cargo.lock‎

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@ dependencies = [
188188
"rustc-demangle",
189189
]
190190

191+
[[package]]
192+
name = "base64"
193+
version = "0.13.1"
194+
source = "registry+https://github.com/rust-lang/crates.io-index"
195+
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
196+
191197
[[package]]
192198
name = "bitflags"
193199
version = "1.3.2"
@@ -297,6 +303,7 @@ name = "cargo"
297303
version = "0.68.0"
298304
dependencies = [
299305
"anyhow",
306+
"base64",
300307
"bytesize",
301308
"cargo-platform 0.1.2",
302309
"cargo-test-macro",
@@ -314,6 +321,7 @@ dependencies = [
314321
"git2-curl",
315322
"glob",
316323
"hex 0.4.2",
324+
"hmac",
317325
"home",
318326
"http-auth",
319327
"humantime 2.0.1",
@@ -343,6 +351,7 @@ dependencies = [
343351
"serde-value",
344352
"serde_ignored",
345353
"serde_json",
354+
"sha1",
346355
"shell-escape",
347356
"snapbox",
348357
"strip-ansi-escapes",
@@ -1000,11 +1009,12 @@ dependencies = [
10001009

10011010
[[package]]
10021011
name = "crypto-common"
1003-
version = "0.1.2"
1012+
version = "0.1.6"
10041013
source = "registry+https://github.com/rust-lang/crates.io-index"
1005-
checksum = "a4600d695eb3f6ce1cd44e6e291adceb2cc3ab12f20a33777ecd0bf6eba34e06"
1014+
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
10061015
dependencies = [
10071016
"generic-array",
1017+
"typenum",
10081018
]
10091019

10101020
[[package]]
@@ -1107,12 +1117,13 @@ checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
11071117

11081118
[[package]]
11091119
name = "digest"
1110-
version = "0.10.2"
1120+
version = "0.10.6"
11111121
source = "registry+https://github.com/rust-lang/crates.io-index"
1112-
checksum = "8cb780dce4f9a8f5c087362b3a4595936b2019e7c8b30f2c3e9a7e94e6ae9837"
1122+
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
11131123
dependencies = [
11141124
"block-buffer",
11151125
"crypto-common",
1126+
"subtle",
11161127
]
11171128

11181129
[[package]]
@@ -1631,9 +1642,9 @@ dependencies = [
16311642

16321643
[[package]]
16331644
name = "git2"
1634-
version = "0.15.0"
1645+
version = "0.16.0"
16351646
source = "registry+https://github.com/rust-lang/crates.io-index"
1636-
checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
1647+
checksum = "be36bc9e0546df253c0cc41fd0af34f5e92845ad8509462ec76672fac6997f5b"
16371648
dependencies = [
16381649
"bitflags",
16391650
"libc",
@@ -1646,9 +1657,9 @@ dependencies = [
16461657

16471658
[[package]]
16481659
name = "git2-curl"
1649-
version = "0.16.0"
1660+
version = "0.17.0"
16501661
source = "registry+https://github.com/rust-lang/crates.io-index"
1651-
checksum = "ed817a00721e2f8037ba722e60358d4956dae9cca10315fc982f967907d3b0cd"
1662+
checksum = "7577f4e6341ba7c90d883511130a45b956c274ba5f4d205d9f9da990f654cd33"
16521663
dependencies = [
16531664
"curl",
16541665
"git2",
@@ -1749,6 +1760,15 @@ version = "0.4.2"
17491760
source = "registry+https://github.com/rust-lang/crates.io-index"
17501761
checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
17511762

1763+
[[package]]
1764+
name = "hmac"
1765+
version = "0.12.1"
1766+
source = "registry+https://github.com/rust-lang/crates.io-index"
1767+
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
1768+
dependencies = [
1769+
"digest",
1770+
]
1771+
17521772
[[package]]
17531773
name = "home"
17541774
version = "0.5.3"
@@ -2133,9 +2153,9 @@ dependencies = [
21332153

21342154
[[package]]
21352155
name = "libgit2-sys"
2136-
version = "0.14.0+1.5.0"
2156+
version = "0.14.1+1.5.0"
21372157
source = "registry+https://github.com/rust-lang/crates.io-index"
2138-
checksum = "47a00859c70c8a4f7218e6d1cc32875c4b55f6799445b842b0d8ed5e4c3d959b"
2158+
checksum = "4a07fb2692bc3593bda59de45a502bb3071659f2c515e28c71e728306b038e17"
21392159
dependencies = [
21402160
"cc",
21412161
"libc",
@@ -4779,6 +4799,17 @@ dependencies = [
47794799
"digest",
47804800
]
47814801

4802+
[[package]]
4803+
name = "sha1"
4804+
version = "0.10.5"
4805+
source = "registry+https://github.com/rust-lang/crates.io-index"
4806+
checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
4807+
dependencies = [
4808+
"cfg-if 1.0.0",
4809+
"cpufeatures",
4810+
"digest",
4811+
]
4812+
47824813
[[package]]
47834814
name = "sha2"
47844815
version = "0.10.1"
@@ -5036,6 +5067,12 @@ dependencies = [
50365067
"syn",
50375068
]
50385069

5070+
[[package]]
5071+
name = "subtle"
5072+
version = "2.4.1"
5073+
source = "registry+https://github.com/rust-lang/crates.io-index"
5074+
checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
5075+
50395076
[[package]]
50405077
name = "syn"
50415078
version = "1.0.102"
@@ -5403,9 +5440,9 @@ dependencies = [
54035440

54045441
[[package]]
54055442
name = "typenum"
5406-
version = "1.12.0"
5443+
version = "1.16.0"
54075444
source = "registry+https://github.com/rust-lang/crates.io-index"
5408-
checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
5445+
checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
54095446

54105447
[[package]]
54115448
name = "ucd-parse"

‎src/ci/scripts/checkout-submodules.sh‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ function fetch_github_commit_archive {
3636
rm $cached
3737
}
3838

39-
included="src/llvm-project src/doc/book src/doc/rust-by-example"
39+
#included="src/llvm-project src/doc/book src/doc/rust-by-example"
40+
included=""
4041
modules="$(git config --file .gitmodules --get-regexp '\.path$' | cut -d' ' -f2)"
4142
modules=($modules)
4243
use_git=""
@@ -60,9 +61,9 @@ done
6061
retry sh -c "git submodule deinit -f $use_git && \
6162
git submodule sync && \
6263
git submodule update -j 16 --init --recursive --depth 1 $use_git"
63-
STATUS=0
64-
for pid in ${bg_pids[*]}
65-
do
66-
wait $pid || STATUS=1
67-
done
68-
exit ${STATUS}
64+
#STATUS=0
65+
#for pid in ${bg_pids[*]}
66+
#do
67+
# wait $pid || STATUS=1
68+
#done
69+
#exit ${STATUS}

‎src/tools/tidy/src/deps.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ const EXCEPTIONS: &[(&str, &str)] = &[
5050
("similar", "Apache-2.0"), // cargo (dev dependency)
5151
("normalize-line-endings", "Apache-2.0"), // cargo (dev dependency)
5252
("dissimilar", "Apache-2.0"), // rustdoc, rustc_lexer (few tests) via expect-test, (dev deps)
53+
("subtle", "BSD-3-Clause"), // cargo
5354
];
5455

5556
const EXCEPTIONS_CRANELIFT: &[(&str, &str)] = &[
@@ -219,6 +220,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
219220
"snap",
220221
"stable_deref_trait",
221222
"stacker",
223+
"subtle",
222224
"syn",
223225
"synstructure",
224226
"tempfile",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /