gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Temporarily ignore prost-types advisory (backport #18525) (#18527)

Browse Source 
* Temporarily ignore prost-types audit (#18525)

(cherry picked from commit 6188283ba6)

* Bump tokio

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
mergify[bot]
2021-07-08 13:49:33 -06:00
committed by GitHub
parent c40e71dc03
commit 030a97d098
3 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Cargo.lock generated
View File

@ -183,7 +183,7 @@ dependencies = [
"instant", "instant",
"pin-project 1.0.1", "pin-project 1.0.1",
"rand 0.8.3", "rand 0.8.3",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -1604,7 +1604,7 @@ dependencies = [
"simpl", "simpl",
"smpl_jwt", "smpl_jwt",
"time 0.2.25", "time 0.2.25",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -1651,7 +1651,7 @@ dependencies = [
"http", "http",
"indexmap", "indexmap",
"slab", "slab",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-util 0.6.3", "tokio-util 0.6.3",
"tracing", "tracing",
"tracing-futures", "tracing-futures",
@ -1883,7 +1883,7 @@ dependencies = [
"itoa", "itoa",
"pin-project-lite 0.2.4", "pin-project-lite 0.2.4",
"socket2", "socket2",
"tokio 1.1.1", "tokio 1.8.1",
"tower-service", "tower-service",
"tracing", "tracing",
"want", "want",
@ -1899,7 +1899,7 @@ dependencies = [
"hyper 0.14.3", "hyper 0.14.3",
"log 0.4.11", "log 0.4.11",
"rustls", "rustls",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-rustls", "tokio-rustls",
"webpki", "webpki",
] ]
@ -1913,7 +1913,7 @@ dependencies = [
"bytes 1.0.1", "bytes 1.0.1",
"hyper 0.14.3", "hyper 0.14.3",
"native-tls", "native-tls",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-native-tls", "tokio-native-tls",
] ]
@ -3452,7 +3452,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-native-tls", "tokio-native-tls",
"tokio-rustls", "tokio-rustls",
"url 2.2.0", "url 2.2.0",
@ -4018,7 +4018,7 @@ dependencies = [
"solana-runtime", "solana-runtime",
"solana-sdk", "solana-sdk",
"tarpc", "tarpc",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-serde", "tokio-serde",
] ]
@ -4030,7 +4030,7 @@ dependencies = [
"serde", "serde",
"solana-sdk", "solana-sdk",
"tarpc", "tarpc",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -4046,7 +4046,7 @@ dependencies = [
"solana-runtime", "solana-runtime",
"solana-sdk", "solana-sdk",
"tarpc", "tarpc",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-serde", "tokio-serde",
"tokio-stream", "tokio-stream",
] ]
@ -4286,7 +4286,7 @@ dependencies = [
"solana-version", "solana-version",
"solana-vote-program", "solana-vote-program",
"thiserror", "thiserror",
"tokio 1.1.1", "tokio 1.8.1",
"tungstenite", "tungstenite",
"url 2.2.0", "url 2.2.0",
] ]
@ -4481,7 +4481,7 @@ dependencies = [
"solana-version", "solana-version",
"spl-memo", "spl-memo",
"thiserror", "thiserror",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -4717,7 +4717,7 @@ dependencies = [
"solana-vote-program", "solana-vote-program",
"tempfile", "tempfile",
"thiserror", "thiserror",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-stream", "tokio-stream",
"trees", "trees",
] ]
@ -4754,7 +4754,7 @@ dependencies = [
"solana-version", "solana-version",
"solana-vote-program", "solana-vote-program",
"tempfile", "tempfile",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -4895,7 +4895,7 @@ dependencies = [
"solana-logger 1.7.5", "solana-logger 1.7.5",
"solana-sdk", "solana-sdk",
"solana-version", "solana-version",
"tokio 1.1.1", "tokio 1.8.1",
"url 2.2.0", "url 2.2.0",
] ]
@ -5078,7 +5078,7 @@ dependencies = [
"solana-sdk", "solana-sdk",
"solana-vote-program", "solana-vote-program",
"thiserror", "thiserror",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -5151,7 +5151,7 @@ dependencies = [
"spl-token", "spl-token",
"symlink", "symlink",
"tokio 0.2.22", "tokio 0.2.22",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-util 0.3.1", "tokio-util 0.3.1",
] ]
@ -5821,7 +5821,7 @@ dependencies = [
"serde", "serde",
"static_assertions", "static_assertions",
"tarpc-plugins", "tarpc-plugins",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-serde", "tokio-serde",
"tokio-util 0.6.3", "tokio-util 0.6.3",
] ]
@ -6061,9 +6061,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.1.1" version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6714d663090b6b0acb0fa85841c6d66233d150cdb2602c8f9b8abb03370beb3f" checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985"
dependencies = [ dependencies = [
"autocfg 1.0.0", "autocfg 1.0.0",
"bytes 1.0.1", "bytes 1.0.1",
@ -6075,7 +6075,7 @@ dependencies = [
"parking_lot 0.11.0", "parking_lot 0.11.0",
"pin-project-lite 0.2.4", "pin-project-lite 0.2.4",
"signal-hook-registry", "signal-hook-registry",
"tokio-macros 1.0.0", "tokio-macros 1.3.0",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -6145,9 +6145,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "1.0.0" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42517d2975ca3114b22a16192634e8241dc5cc1f130be194645970cc1c371494" checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
dependencies = [ dependencies = [
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
"quote 1.0.6", "quote 1.0.6",
@ -6161,7 +6161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
dependencies = [ dependencies = [
"native-tls", "native-tls",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -6190,7 +6190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [ dependencies = [
"rustls", "rustls",
"tokio 1.1.1", "tokio 1.8.1",
"webpki", "webpki",
] ]
@ -6218,7 +6218,7 @@ checksum = "76066865172052eb8796c686f0b441a93df8b08d40a950b062ffb9a426f00edd"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"pin-project-lite 0.2.4", "pin-project-lite 0.2.4",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -6343,7 +6343,7 @@ dependencies = [
"futures-sink", "futures-sink",
"log 0.4.11", "log 0.4.11",
"pin-project-lite 0.2.4", "pin-project-lite 0.2.4",
"tokio 1.1.1", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -6375,7 +6375,7 @@ dependencies = [
"pin-project 1.0.1", "pin-project 1.0.1",
"prost", "prost",
"prost-derive", "prost-derive",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-rustls", "tokio-rustls",
"tokio-stream", "tokio-stream",
"tokio-util 0.6.3", "tokio-util 0.6.3",
@ -6397,7 +6397,7 @@ dependencies = [
"pin-project 1.0.1", "pin-project 1.0.1",
"rand 0.8.3", "rand 0.8.3",
"slab", "slab",
"tokio 1.1.1", "tokio 1.8.1",
"tokio-stream", "tokio-stream",
"tower-layer", "tower-layer",
"tower-service", "tower-service",

5
ci/do-audit.sh
View File

@ -39,5 +39,10 @@ cargo_audit_ignores=(
# https://github.com/paritytech/libsecp256k1/issues/66 # https://github.com/paritytech/libsecp256k1/issues/66
--ignore RUSTSEC-2020-0146 --ignore RUSTSEC-2020-0146
# prost-types: Conversion from `prost_types::Timestamp` to `SystemTime` can cause an overflow and panic
#
# Blocked on googleapi protobuf build errors
--ignore RUSTSEC-2021-0073
) )
scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}" scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"

32
programs/bpf/Cargo.lock generated
View File

@ -1218,7 +1218,7 @@ dependencies = [
"http", "http",
"indexmap", "indexmap",
"slab", "slab",
"tokio 1.4.0", "tokio 1.8.1",
"tokio-util", "tokio-util",
"tracing", "tracing",
] ]
@ -1375,7 +1375,7 @@ dependencies = [
"itoa", "itoa",
"pin-project", "pin-project",
"socket2", "socket2",
"tokio 1.4.0", "tokio 1.8.1",
"tower-service", "tower-service",
"tracing", "tracing",
"want", "want",
@ -1391,7 +1391,7 @@ dependencies = [
"hyper", "hyper",
"log", "log",
"rustls", "rustls",
"tokio 1.4.0", "tokio 1.8.1",
"tokio-rustls", "tokio-rustls",
"webpki", "webpki",
] ]
@ -2376,7 +2376,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"tokio 1.4.0", "tokio 1.8.1",
"tokio-rustls", "tokio-rustls",
"url", "url",
"wasm-bindgen", "wasm-bindgen",
@ -2763,7 +2763,7 @@ dependencies = [
"solana-program 1.7.5", "solana-program 1.7.5",
"solana-sdk", "solana-sdk",
"tarpc", "tarpc",
"tokio 1.4.0", "tokio 1.8.1",
"tokio-serde", "tokio-serde",
] ]
@ -2790,7 +2790,7 @@ dependencies = [
"solana-runtime", "solana-runtime",
"solana-sdk", "solana-sdk",
"tarpc", "tarpc",
"tokio 1.4.0", "tokio 1.8.1",
"tokio-serde", "tokio-serde",
"tokio-stream", "tokio-stream",
] ]
@ -3186,7 +3186,7 @@ dependencies = [
"solana-version", "solana-version",
"solana-vote-program", "solana-vote-program",
"thiserror", "thiserror",
"tokio 1.4.0", "tokio 1.8.1",
"tungstenite", "tungstenite",
"url", "url",
] ]
@ -3245,7 +3245,7 @@ dependencies = [
"solana-version", "solana-version",
"spl-memo", "spl-memo",
"thiserror", "thiserror",
"tokio 1.4.0", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -3365,7 +3365,7 @@ dependencies = [
"solana-logger 1.7.5", "solana-logger 1.7.5",
"solana-sdk", "solana-sdk",
"solana-version", "solana-version",
"tokio 1.4.0", "tokio 1.8.1",
"url", "url",
] ]
@ -3456,7 +3456,7 @@ dependencies = [
"solana-sdk", "solana-sdk",
"solana-vote-program", "solana-vote-program",
"thiserror", "thiserror",
"tokio 1.4.0", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -3850,7 +3850,7 @@ dependencies = [
"serde", "serde",
"static_assertions", "static_assertions",
"tarpc-plugins", "tarpc-plugins",
"tokio 1.4.0", "tokio 1.8.1",
"tokio-serde", "tokio-serde",
"tokio-util", "tokio-util",
] ]
@ -4006,9 +4006,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.4.0" version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"bytes 1.0.1", "bytes 1.0.1",
@ -4114,7 +4114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [ dependencies = [
"rustls", "rustls",
"tokio 1.4.0", "tokio 1.8.1",
"webpki", "webpki",
] ]
@ -4142,7 +4142,7 @@ checksum = "e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"pin-project-lite 0.2.4", "pin-project-lite 0.2.4",
"tokio 1.4.0", "tokio 1.8.1",
] ]
[[package]] [[package]]
@ -4242,7 +4242,7 @@ dependencies = [
"futures-sink", "futures-sink",
"log", "log",
"pin-project-lite 0.2.4", "pin-project-lite 0.2.4",
"tokio 1.4.0", "tokio 1.8.1",
] ]
[[package]] [[package]]