From 4b133509d9c5b11026a0f60a7158185a29d0c422 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Mon, 9 Aug 2021 18:22:28 -0600 Subject: [PATCH] v1.7: Handle new security advisories (#19131) * Update hyper 0.14 * Add audit ignores * Bump assert_cmd and remove audit ignore * Remove pin-project-lite warning --- Cargo.lock | 251 +++++++++++++++++++++------------------- ci/do-audit.sh | 23 +++- ledger-tool/Cargo.toml | 2 +- programs/bpf/Cargo.lock | 114 +++++++++--------- 4 files changed, 214 insertions(+), 176 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e05487141..185b5c530a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,7 +50,7 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" dependencies = [ - "memchr 2.3.3", + "memchr 2.4.0", ] [[package]] @@ -65,7 +65,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -106,10 +106,11 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "assert_cmd" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e" +checksum = "54f002ce7d0c5e809ebb02be78fd503aeed4a511fd0fcaff6e6914cbdabbfa33" dependencies = [ + "bstr", "doc-comment", "predicates", "predicates-core", @@ -163,7 +164,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -420,12 +421,12 @@ checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" [[package]] name = "bstr" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" dependencies = [ "lazy_static", - "memchr 2.3.3", + "memchr 2.4.0", "regex-automata", "serde", ] @@ -584,7 +585,7 @@ dependencies = [ "num-traits", "serde", "time 0.1.43", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -649,7 +650,7 @@ dependencies = [ "ascii", "byteorder", "either", - "memchr 2.3.3", + "memchr 2.4.0", "unreachable", ] @@ -666,7 +667,7 @@ dependencies = [ "terminal_size", "termios", "unicode-width", - "winapi 0.3.8", + "winapi 0.3.9", "winapi-util", ] @@ -682,7 +683,7 @@ dependencies = [ "regex", "terminal_size", "unicode-width", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -942,7 +943,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" dependencies = [ - "memchr 2.3.3", + "memchr 2.4.0", ] [[package]] @@ -952,7 +953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54dedab740bc412d514cfbc4a1d9d5d16fed02c4b14a7be129003c07fdc33b9b" dependencies = [ "nix 0.17.0", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1035,10 +1036,10 @@ dependencies = [ ] [[package]] -name = "difference" -version = "2.0.0" +name = "difflib" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" @@ -1085,7 +1086,7 @@ checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d" dependencies = [ "libc", "redox_users", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1103,7 +1104,7 @@ dependencies = [ "dlopen_derive", "lazy_static", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1290,7 +1291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1307,7 +1308,7 @@ checksum = "a71e83755e51aa52b9034f1986173783789e8e7d79c3c774adbbb63fb554f2cb" dependencies = [ "libc", "thiserror", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1319,7 +1320,7 @@ dependencies = [ "cfg-if 0.1.10", "libc", "redox_syscall", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1494,7 +1495,7 @@ dependencies = [ "futures-macro", "futures-sink", "futures-task", - "memchr 2.3.3", + "memchr 2.4.0", "pin-project 1.0.1", "pin-utils", "proc-macro-hack", @@ -1539,7 +1540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1640,9 +1641,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5" +checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" dependencies = [ "bytes 1.0.1", "fnv", @@ -1655,7 +1656,6 @@ dependencies = [ "tokio 1.8.1", "tokio-util 0.6.3", "tracing", - "tracing-futures", ] [[package]] @@ -1673,15 +1673,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "autocfg 1.0.0", -] - [[package]] name = "hashbrown" version = "0.9.1" @@ -1691,6 +1682,12 @@ dependencies = [ "ahash 0.4.6", ] +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + [[package]] name = "heck" version = "0.3.3" @@ -1812,14 +1809,14 @@ checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" dependencies = [ "bytes 1.0.1", "http", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "httpdate" @@ -1827,6 +1824,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +[[package]] +name = "httpdate" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" + [[package]] name = "humantime" version = "2.0.1" @@ -1866,10 +1869,10 @@ dependencies = [ "http", "http-body 0.3.1", "httparse", - "httpdate", + "httpdate 0.3.2", "itoa", "pin-project 1.0.1", - "socket2", + "socket2 0.3.17", "tokio 0.2.22", "tower-service", "tracing", @@ -1878,22 +1881,22 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.3" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee5fc98172988e4394a3094002a75125e8fb864a88318732e8b613ec5adbda3" +checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" dependencies = [ "bytes 1.0.1", "futures-channel", "futures-core", "futures-util", - "h2 0.3.0", + "h2 0.3.3", "http", "http-body 0.4.2", "httparse", - "httpdate", + "httpdate 1.0.1", "itoa", - "pin-project-lite 0.2.4", - "socket2", + "pin-project-lite 0.2.7", + "socket2 0.4.1", "tokio 1.8.1", "tower-service", "tracing", @@ -1907,7 +1910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "futures-util", - "hyper 0.14.3", + "hyper 0.14.11", "log 0.4.11", "rustls", "tokio 1.8.1", @@ -1921,8 +1924,8 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.3", - "pin-project-lite 0.2.4", + "hyper 0.14.11", + "pin-project-lite 0.2.7", "tokio 1.8.1", "tokio-io-timeout", ] @@ -1934,7 +1937,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.0.1", - "hyper 0.14.3", + "hyper 0.14.11", "native-tls", "tokio 1.8.1", "tokio-native-tls", @@ -1976,12 +1979,12 @@ checksum = "d480125acf340d6a6e59dab69ae19d6fca3a906e1eade277671272cc8f73794b" [[package]] name = "indexmap" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg 1.0.0", - "hashbrown 0.8.2", + "hashbrown 0.11.2", "rayon", ] @@ -2243,9 +2246,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" [[package]] name = "libc" -version = "0.2.81" +version = "0.2.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" [[package]] name = "libloading" @@ -2253,7 +2256,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2263,7 +2266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2400,9 +2403,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memmap2" @@ -2484,7 +2487,7 @@ dependencies = [ "log 0.4.11", "miow 0.3.6", "ntapi", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2508,7 +2511,7 @@ dependencies = [ "log 0.4.11", "mio 0.6.22", "miow 0.3.6", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2540,8 +2543,8 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ - "socket2", - "winapi 0.3.8", + "socket2 0.3.17", + "winapi 0.3.9", ] [[package]] @@ -2576,7 +2579,7 @@ checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" dependencies = [ "cfg-if 0.1.10", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2619,7 +2622,7 @@ version = "5.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" dependencies = [ - "memchr 2.3.3", + "memchr 2.4.0", "version_check 0.9.2", ] @@ -2629,7 +2632,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2808,7 +2811,7 @@ dependencies = [ "miow 0.3.6", "rand 0.7.3", "tokio 0.2.22", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2873,7 +2876,7 @@ dependencies = [ "redox_syscall", "rustc_version", "smallvec 0.6.14", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2887,7 +2890,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec 1.6.1", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2902,7 +2905,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec 1.6.1", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3031,9 +3034,9 @@ checksum = "f7505eeebd78492e0f6108f7171c4948dbb120ee8119d9d77d0afa5469bef67f" [[package]] name = "pin-project-lite" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -3061,11 +3064,12 @@ checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" [[package]] name = "predicates" -version = "1.0.4" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030" +checksum = "bc3d91237f5de3bcd9d927e24d03b495adb6135097b001cea7403e2d573d00a9" dependencies = [ - "difference", + "difflib", + "itertools 0.10.1", "predicates-core", ] @@ -3274,7 +3278,7 @@ dependencies = [ "libc", "rand_core 0.3.1", "rdrand", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3293,7 +3297,7 @@ dependencies = [ "rand_os", "rand_pcg 0.1.2", "rand_xorshift 0.1.1", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3429,7 +3433,7 @@ checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" dependencies = [ "libc", "rand_core 0.4.2", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3443,7 +3447,7 @@ dependencies = [ "libc", "rand_core 0.4.2", "rdrand", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3561,7 +3565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" dependencies = [ "aho-corasick", - "memchr 2.3.3", + "memchr 2.4.0", "regex-syntax", ] @@ -3586,7 +3590,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc5b3ce5d5ea144bb04ebd093a9e14e9765bcfec866aecda9b6dec43b3d1e24" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3602,7 +3606,7 @@ dependencies = [ "futures-util", "http", "http-body 0.4.2", - "hyper 0.14.3", + "hyper 0.14.11", "hyper-rustls", "hyper-tls", "ipnet", @@ -3612,7 +3616,7 @@ dependencies = [ "mime 0.3.16", "native-tls", "percent-encoding 2.1.0", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "rustls", "serde", "serde_json", @@ -3646,7 +3650,7 @@ dependencies = [ "spin", "untrusted", "web-sys", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3666,7 +3670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3761,7 +3765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4092,7 +4096,17 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "winapi 0.3.8", + "winapi 0.3.9", +] + +[[package]] +name = "socket2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +dependencies = [ + "libc", + "winapi 0.3.9", ] [[package]] @@ -4584,7 +4598,7 @@ dependencies = [ "syn 0.15.44", "syn 1.0.60", "tokio 0.1.22", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4832,7 +4846,7 @@ dependencies = [ "tar", "tempfile", "url 2.2.0", - "winapi 0.3.8", + "winapi 0.3.9", "winreg", ] @@ -5076,7 +5090,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "socket2", + "socket2 0.3.17", "solana-clap-utils", "solana-logger 1.7.10", "solana-sdk", @@ -5981,7 +5995,7 @@ dependencies = [ "libc", "nom 3.2.1", "time 0.1.43", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -6039,7 +6053,7 @@ dependencies = [ "rand 0.7.3", "redox_syscall", "remove_dir_all", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -6058,7 +6072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -6112,7 +6126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -6127,7 +6141,7 @@ dependencies = [ "stdweb", "time-macros", "version_check 0.9.2", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -6238,7 +6252,7 @@ dependencies = [ "iovec", "lazy_static", "libc", - "memchr 2.3.3", + "memchr 2.4.0", "mio 0.6.22", "mio-named-pipes", "mio-uds", @@ -6247,7 +6261,7 @@ dependencies = [ "signal-hook-registry", "slab", "tokio-macros 0.2.6", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -6259,15 +6273,15 @@ dependencies = [ "autocfg 1.0.0", "bytes 1.0.1", "libc", - "memchr 2.3.3", + "memchr 2.4.0", "mio 0.7.6", "num_cpus", "once_cell", "parking_lot 0.11.0", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "signal-hook-registry", "tokio-macros 1.3.0", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -6329,7 +6343,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" dependencies = [ - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "tokio 1.8.1", ] @@ -6418,7 +6432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76066865172052eb8796c686f0b441a93df8b08d40a950b062ffb9a426f00edd" dependencies = [ "futures-core", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "tokio 1.8.1", ] @@ -6543,7 +6557,7 @@ dependencies = [ "futures-core", "futures-sink", "log 0.4.11", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "tokio 1.8.1", ] @@ -6568,10 +6582,10 @@ dependencies = [ "bytes 1.0.1", "futures-core", "futures-util", - "h2 0.3.0", + "h2 0.3.3", "http", "http-body 0.4.2", - "hyper 0.14.3", + "hyper 0.14.11", "hyper-timeout", "percent-encoding 2.1.0", "pin-project 1.0.1", @@ -6634,21 +6648,22 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.18" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178" +checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "log 0.4.11", + "pin-project-lite 0.2.7", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.9" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b" +checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -6657,9 +6672,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.13" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d593f98af59ebc017c0648f0117525db358745a8894a8d684e185ba3f45954f9" +checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" dependencies = [ "lazy_static", ] @@ -6924,7 +6939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", - "winapi 0.3.8", + "winapi 0.3.9", "winapi-util", ] @@ -7100,9 +7115,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", @@ -7126,7 +7141,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -7141,7 +7156,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] diff --git a/ci/do-audit.sh b/ci/do-audit.sh index b6c1b86be1..cbe09be775 100755 --- a/ci/do-audit.sh +++ b/ci/do-audit.sh @@ -28,16 +28,29 @@ cargo_audit_ignores=( # Blocked on multiple crates updating `time` to >= 0.2.23 --ignore RUSTSEC-2020-0071 - # difference is unmaintained - # - # Blocked on predicates v1.0.6 removing its dependency on `difference` - --ignore RUSTSEC-2020-0095 - # generic-array: arr! macro erases lifetimes # # Blocked on libsecp256k1 releasing with upgraded dependencies # https://github.com/paritytech/libsecp256k1/issues/66 --ignore RUSTSEC-2020-0146 + # hyper: Lenient `hyper` header parsing of `Content-Length` could allow request smuggling + # + # Blocked on jsonrpc removing dependency on unmaintained `websocket` + # https://github.com/paritytech/jsonrpc/issues/605 + --ignore RUSTSEC-2021-0078 + + # hyper: Integer overflow in `hyper`'s parsing of the `Transfer-Encoding` header leads to data loss + # + # Blocked on jsonrpc removing dependency on unmaintained `websocket` + # https://github.com/paritytech/jsonrpc/issues/605 + --ignore RUSTSEC-2021-0079 + + # tar: Links in archive can create arbitrary directories + # + # Blocked on `tar` releasing safe upgrade + # https://github.com/alexcrichton/tar-rs/issues/238 + --ignore RUSTSEC-2021-0080 + ) scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}" diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index f64df3c467..01e3c007d7 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -39,7 +39,7 @@ tempfile = "3.1.0" tokio = { version = "1", features = ["full"] } [dev-dependencies] -assert_cmd = "1.0" +assert_cmd = "2.0" [target."cfg(unix)".dependencies] signal-hook = "0.1.15" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index b6230675b0..b96faae43c 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -54,7 +54,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -106,7 +106,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -382,7 +382,7 @@ dependencies = [ "num-traits", "serde", "time", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -444,7 +444,7 @@ dependencies = [ "terminal_size", "termios", "unicode-width", - "winapi 0.3.8", + "winapi 0.3.9", "winapi-util", ] @@ -460,7 +460,7 @@ dependencies = [ "regex", "terminal_size", "unicode-width", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -759,7 +759,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -917,7 +917,7 @@ dependencies = [ "cfg-if 0.1.10", "libc", "redox_syscall 0.1.56", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1073,7 +1073,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1107,7 +1107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1157,9 +1157,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" +checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" dependencies = [ "bytes 1.0.1", "fnv", @@ -1282,15 +1282,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.3.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "httpdate" -version = "0.3.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "humantime" @@ -1300,9 +1300,9 @@ checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "hyper" -version = "0.14.4" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" dependencies = [ "bytes 1.0.1", "futures-channel", @@ -1314,8 +1314,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project", - "socket2", + "pin-project-lite 0.2.7", + "socket2 0.4.1", "tokio 1.8.1", "tower-service", "tracing", @@ -1485,9 +1485,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.81" +version = "0.2.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" [[package]] name = "libloading" @@ -1495,7 +1495,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1668,7 +1668,7 @@ dependencies = [ "log", "miow 0.3.6", "ntapi", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1700,8 +1700,8 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ - "socket2", - "winapi 0.3.8", + "socket2 0.3.17", + "winapi 0.3.9", ] [[package]] @@ -1730,7 +1730,7 @@ checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" dependencies = [ "cfg-if 0.1.10", "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1751,7 +1751,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1972,7 +1972,7 @@ dependencies = [ "redox_syscall 0.1.56", "rustc_version", "smallvec 0.6.14", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -1986,7 +1986,7 @@ dependencies = [ "libc", "redox_syscall 0.1.56", "smallvec 1.6.1", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2000,7 +2000,7 @@ dependencies = [ "libc", "redox_syscall 0.1.56", "smallvec 1.6.1", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2064,9 +2064,9 @@ checksum = "f7505eeebd78492e0f6108f7171c4948dbb120ee8119d9d77d0afa5469bef67f" [[package]] name = "pin-project-lite" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -2346,7 +2346,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2370,7 +2370,7 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "rustls", "serde", "serde_json", @@ -2397,7 +2397,7 @@ dependencies = [ "spin", "untrusted", "web-sys", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2407,7 +2407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2472,7 +2472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -2713,7 +2713,17 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.1.56", - "winapi 0.3.8", + "winapi 0.3.9", +] + +[[package]] +name = "socket2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +dependencies = [ + "libc", + "winapi 0.3.9", ] [[package]] @@ -3220,7 +3230,7 @@ dependencies = [ "syn 0.15.44", "syn 1.0.67", "tokio 0.1.22", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3356,7 +3366,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "socket2", + "socket2 0.3.17", "solana-clap-utils", "solana-logger 1.7.10", "solana-sdk", @@ -3863,7 +3873,7 @@ dependencies = [ "rand 0.8.2", "redox_syscall 0.2.4", "remove_dir_all", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3882,7 +3892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -3930,7 +3940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4004,10 +4014,10 @@ dependencies = [ "num_cpus", "once_cell", "parking_lot 0.11.1", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "signal-hook-registry", "tokio-macros", - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4127,7 +4137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0" dependencies = [ "futures-core", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "tokio 1.8.1", ] @@ -4227,7 +4237,7 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.7", "tokio 1.8.1", ] @@ -4414,7 +4424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", - "winapi 0.3.8", + "winapi 0.3.9", "winapi-util", ] @@ -4545,9 +4555,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", @@ -4571,7 +4581,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]] @@ -4586,7 +4596,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ - "winapi 0.3.8", + "winapi 0.3.9", ] [[package]]