Update dependencies

This commit is contained in:
kpcyrd
2020-09-13 22:56:00 +02:00
parent 67082a1002
commit 5c447d259f
4 changed files with 242 additions and 129 deletions

331
Cargo.lock generated
View File

@@ -89,7 +89,7 @@ dependencies = [
"addr2line",
"cfg-if",
"libc",
"miniz_oxide 0.4.1",
"miniz_oxide 0.4.2",
"object",
"rustc-demangle",
]
@@ -172,9 +172,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
dependencies = [
"byte-tools 0.3.1",
"crypto-mac",
"crypto-mac 0.7.0",
"digest 0.8.1",
"opaque-debug",
"opaque-debug 0.2.3",
]
[[package]]
@@ -204,12 +204,22 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
dependencies = [
"block-padding",
"block-padding 0.1.5",
"byte-tools 0.3.1",
"byteorder",
"generic-array 0.12.3",
]
[[package]]
name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"block-padding 0.2.1",
"generic-array 0.14.4",
]
[[package]]
name = "block-padding"
version = "0.1.5"
@@ -219,6 +229,12 @@ dependencies = [
"byte-tools 0.3.1",
]
[[package]]
name = "block-padding"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
name = "boxxy"
version = "0.11.0"
@@ -338,9 +354,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.0.59"
version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
[[package]]
name = "cexpr"
@@ -371,9 +387,9 @@ dependencies = [
[[package]]
name = "chrootable-https"
version = "0.15.2"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e32a3007fb5dc65e9c373e4bbcf6bf36d7b2a9185e21f35c3660508baacffd8b"
checksum = "697290151ae22357e009edbd3f63dfe8126c97a822eb18771df1b865a811df37"
dependencies = [
"byteorder",
"bytes 0.4.12",
@@ -386,7 +402,6 @@ dependencies = [
"ipconfig",
"log 0.4.11",
"lru-cache",
"resolv-conf",
"rustls",
"serde",
"serde_derive",
@@ -447,9 +462,9 @@ checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
[[package]]
name = "colored"
version = "1.9.3"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
dependencies = [
"atty",
"lazy_static",
@@ -516,6 +531,12 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
[[package]]
name = "cpuid-bool"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
[[package]]
name = "crc32fast"
version = "1.2.0"
@@ -590,7 +611,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
dependencies = [
"generic-array 0.12.3",
"subtle",
"subtle 1.0.0",
]
[[package]]
name = "crypto-mac"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca"
dependencies = [
"generic-array 0.14.4",
"subtle 2.3.0",
]
[[package]]
@@ -607,7 +638,7 @@ dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"smallvec 1.4.2",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -617,7 +648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
dependencies = [
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -694,7 +725,7 @@ checksum = "8d2d6daefd5f1d4b74a891a5d2ab7dccba028d423107c074232a0c5dc0d40a9e"
dependencies = [
"data-encoding",
"proc-macro-hack",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -726,7 +757,7 @@ checksum = "1dcfabdab475c16a93d669dddfc393027803e347d09663f524447f642fbb84ba"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -784,7 +815,7 @@ checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -824,6 +855,15 @@ dependencies = [
"generic-array 0.12.3",
]
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array 0.14.4",
]
[[package]]
name = "dirs"
version = "2.0.2"
@@ -898,9 +938,9 @@ dependencies = [
[[package]]
name = "either"
version = "1.6.0"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "embedded-triple"
@@ -996,7 +1036,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
"synstructure",
]
@@ -1027,7 +1067,7 @@ dependencies = [
"cfg-if",
"crc32fast",
"libc",
"miniz_oxide 0.4.1",
"miniz_oxide 0.4.2",
]
[[package]]
@@ -1051,6 +1091,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
dependencies = [
"matches",
"percent-encoding 2.1.0",
]
[[package]]
name = "fsevent"
version = "0.4.0"
@@ -1151,6 +1201,16 @@ dependencies = [
"typenum",
]
[[package]]
name = "generic-array"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
dependencies = [
"typenum",
"version_check 0.9.2",
]
[[package]]
name = "geo"
version = "0.13.0"
@@ -1257,9 +1317,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
version = "0.1.15"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151"
dependencies = [
"libc",
]
@@ -1288,23 +1348,12 @@ dependencies = [
[[package]]
name = "hmac"
version = "0.7.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff"
dependencies = [
"crypto-mac",
"digest 0.8.1",
]
[[package]]
name = "hostname"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
dependencies = [
"libc",
"match_cfg",
"winapi 0.3.9",
"crypto-mac 0.9.1",
"digest 0.9.0",
]
[[package]]
@@ -1318,7 +1367,7 @@ dependencies = [
"markup5ever",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -1530,9 +1579,12 @@ dependencies = [
[[package]]
name = "instant"
version = "0.1.6"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
dependencies = [
"cfg-if",
]
[[package]]
name = "iovec"
@@ -1686,9 +1738,9 @@ dependencies = [
[[package]]
name = "libsqlite3-sys"
version = "0.17.3"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56d90181c2904c287e5390186be820e5ef311a3c62edebb7d6ca3d6a48ce041d"
checksum = "1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd"
dependencies = [
"cc",
"pkg-config",
@@ -1813,12 +1865,6 @@ dependencies = [
"tendril",
]
[[package]]
name = "match_cfg"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
[[package]]
name = "matches"
version = "0.1.8"
@@ -1844,13 +1890,13 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
[[package]]
name = "md-5"
version = "0.8.0"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8"
checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15"
dependencies = [
"block-buffer 0.7.3",
"digest 0.8.1",
"opaque-debug",
"block-buffer 0.9.0",
"digest 0.9.0",
"opaque-debug 0.3.0",
]
[[package]]
@@ -1861,9 +1907,9 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
[[package]]
name = "memoffset"
version = "0.5.5"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
dependencies = [
"autocfg 1.0.1",
]
@@ -1886,7 +1932,7 @@ dependencies = [
"migrations_internals",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -1925,11 +1971,12 @@ dependencies = [
[[package]]
name = "miniz_oxide"
version = "0.4.1"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722"
checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9"
dependencies = [
"adler",
"autocfg 1.0.1",
]
[[package]]
@@ -2264,6 +2311,12 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "opener"
version = "0.4.1"
@@ -2456,7 +2509,7 @@ dependencies = [
"pest_meta",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -2467,7 +2520,7 @@ checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
dependencies = [
"maplit",
"pest",
"sha-1",
"sha-1 0.8.2",
]
[[package]]
@@ -2512,7 +2565,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -2618,7 +2671,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
"version_check 0.9.2",
]
@@ -2886,9 +2939,9 @@ dependencies = [
[[package]]
name = "rayon-core"
version = "1.8.0"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0"
checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -2984,16 +3037,6 @@ dependencies = [
"winreg",
]
[[package]]
name = "resolv-conf"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a"
dependencies = [
"hostname",
"quick-error",
]
[[package]]
name = "ring"
version = "0.16.15"
@@ -3140,7 +3183,7 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
dependencies = [
"semver",
"semver 0.9.0",
]
[[package]]
@@ -3331,6 +3374,15 @@ dependencies = [
"semver-parser",
]
[[package]]
name = "semver"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
dependencies = [
"semver-parser",
]
[[package]]
name = "semver-parser"
version = "0.7.0"
@@ -3360,7 +3412,7 @@ checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -3398,6 +3450,18 @@ dependencies = [
"url 2.1.1",
]
[[package]]
name = "serde_urlencoded"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
dependencies = [
"form_urlencoded",
"itoa",
"ryu",
"serde",
]
[[package]]
name = "servo_arc"
version = "0.1.1"
@@ -3417,7 +3481,20 @@ dependencies = [
"block-buffer 0.7.3",
"digest 0.8.1",
"fake-simd",
"opaque-debug",
"opaque-debug 0.2.3",
]
[[package]]
name = "sha-1"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770"
dependencies = [
"block-buffer 0.9.0",
"cfg-if",
"cpuid-bool",
"digest 0.9.0",
"opaque-debug 0.3.0",
]
[[package]]
@@ -3441,20 +3518,32 @@ dependencies = [
"block-buffer 0.7.3",
"digest 0.8.1",
"fake-simd",
"opaque-debug",
"opaque-debug 0.2.3",
]
[[package]]
name = "sha2"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
dependencies = [
"block-buffer 0.9.0",
"cfg-if",
"cpuid-bool",
"digest 0.9.0",
"opaque-debug 0.3.0",
]
[[package]]
name = "sha3"
version = "0.8.2"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
dependencies = [
"block-buffer 0.7.3",
"byte-tools 0.3.1",
"digest 0.8.1",
"block-buffer 0.9.0",
"digest 0.9.0",
"keccak",
"opaque-debug",
"opaque-debug 0.3.0",
]
[[package]]
@@ -3497,7 +3586,7 @@ dependencies = [
"hex 0.3.2",
"log 0.4.11",
"serde",
"sha-1",
"sha-1 0.8.2",
]
[[package]]
@@ -3533,7 +3622,7 @@ dependencies = [
"data-encoding",
"diesel",
"diesel_migrations",
"digest 0.8.1",
"digest 0.9.0",
"dirs 3.0.1",
"embedded-triple",
"env_logger",
@@ -3556,22 +3645,22 @@ dependencies = [
"rand 0.7.3",
"regex",
"rustyline 6.3.0",
"semver",
"semver 0.10.0",
"separator",
"serde",
"serde_derive",
"serde_json",
"serde_urlencoded 0.6.1",
"sha-1",
"sha2 0.8.2",
"serde_urlencoded 0.7.0",
"sha-1 0.9.1",
"sha2 0.9.1",
"sha3",
"shellwords",
"sloppy-rfc4880",
"sn0int-common",
"sn0int-std",
"structopt",
"strum",
"strum_macros",
"strum 0.19.2",
"strum_macros 0.19.2",
"syscallz",
"tempfile",
"threadpool",
@@ -3612,7 +3701,7 @@ dependencies = [
"rocket",
"rocket_contrib",
"rocket_failure",
"semver",
"semver 0.9.0",
"serde",
"serde_derive",
"serde_json",
@@ -3755,9 +3844,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
version = "0.3.17"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cc388d94ffabf39b5ed5fadddc40147cb21e605f53db6f8f36a625d27489ac5"
checksum = "a33f6461027d7f08a13715659b2948e1602c31a3756aeae9378bfe7518c72e82"
dependencies = [
"clap",
"lazy_static",
@@ -3766,15 +3855,15 @@ dependencies = [
[[package]]
name = "structopt-derive"
version = "0.4.10"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f"
checksum = "c92e775028122a4b3dd55d58f14fc5120289c69bee99df1d117ae30f84b225c9"
dependencies = [
"heck",
"proc-macro-error",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -3783,6 +3872,12 @@ version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
[[package]]
name = "strum"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3924a58d165da3b7b2922c667ab0673c7b5fd52b5c19ea3442747bcb3cd15abe"
[[package]]
name = "strum_macros"
version = "0.18.0"
@@ -3792,7 +3887,19 @@ dependencies = [
"heck",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
name = "strum_macros"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d2ab682ecdcae7f5f45ae85cd7c1e6c8e68ea42c8a612d47fedf831c037146a"
dependencies = [
"heck",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.41",
]
[[package]]
@@ -3801,6 +3908,12 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
[[package]]
name = "subtle"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
[[package]]
name = "syn"
version = "0.15.44"
@@ -3814,9 +3927,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.40"
version = "1.0.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
@@ -3831,7 +3944,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
"unicode-xid 0.2.1",
]
@@ -3866,8 +3979,8 @@ dependencies = [
"log 0.4.11",
"pkg-config",
"seccomp-sys",
"strum",
"strum_macros",
"strum 0.18.0",
"strum_macros 0.18.0",
]
[[package]]
@@ -3936,7 +4049,7 @@ checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
]
[[package]]
@@ -4310,7 +4423,7 @@ dependencies = [
"input_buffer",
"log 0.4.11",
"rand 0.7.3",
"sha-1",
"sha-1 0.8.2",
"url 2.1.1",
"utf-8",
]
@@ -4551,7 +4664,7 @@ dependencies = [
"log 0.4.11",
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
"wasm-bindgen-shared",
]
@@ -4573,7 +4686,7 @@ checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
dependencies = [
"proc-macro2 1.0.21",
"quote 1.0.7",
"syn 1.0.40",
"syn 1.0.41",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]

View File

@@ -45,21 +45,21 @@ hlua-badtouch = "0.4"
structopt = "0.3"
failure = "0.1"
rand = "0.7"
colored = "1.6"
colored = "2"
lazy_static = "1.0"
shellwords = "1.0"
diesel = { version = "1.0.0", features = ["sqlite", "chrono"] }
diesel_migrations = { version = "1.3.0", features = ["sqlite"] }
libsqlite3-sys = { version = "0.17.0", features = ["bundled-windows"] }
libsqlite3-sys = { version = "0.18.0", features = ["bundled-windows"] }
chrono = { version = "0.4", features = ["serde"] }
dirs = "3.0"
url = "2.0"
percent-encoding = "2.1"
#chrootable-https = { path = "../chrootable-https" }
chrootable-https = "0.15.2"
chrootable-https = "0.16"
base64 = "0.12"
data-encoding = "2.1.2"
serde_urlencoded = "0.6"
serde_urlencoded = "0.7"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
@@ -73,20 +73,20 @@ regex = "1.0"
toml = "0.5"
threadpool = "1.7"
atty = "0.2"
semver = "0.9"
semver = "0.10"
bytes = "0.4"
bytesize = "1.0"
ipnetwork = "0.17"
strum = "0.18"
strum_macros = "0.18"
strum = "0.19"
strum_macros = "0.19"
embedded-triple = "0.1.0"
digest = "0.8.0"
md-5 = "0.8.0"
sha-1 = "0.8.1"
sha2 = "0.8.0"
sha3 = "0.8.0"
hmac = "0.7"
digest = "0.9"
md-5 = "0.9"
sha-1 = "0.9"
sha2 = "0.9"
sha3 = "0.9"
hmac = "0.9"
walkdir = "2.2"
nude = "0.3"

View File

@@ -25,7 +25,7 @@ webpki = "0.21"
webpki-roots = "0.19.0"
ct-logs = "0.6"
#chrootable-https = { path = "../../chrootable-https" }
chrootable-https = "0.15.2"
chrootable-https = "0.16"
http = "0.2"
bufstream = "0.1.4"
pem = "0.7"

View File

@@ -2,9 +2,9 @@ use crate::errors::*;
use crate::engine::ctx::State;
use crate::engine::structs::{byte_array, lua_bytes};
use crate::hlua::{self, AnyLuaValue};
use digest::{Digest, Input, BlockInput, FixedOutput, Reset};
use digest::{Digest, Update, BlockInput, FixedOutput, Reset};
use digest::generic_array::ArrayLength;
use hmac::{Hmac, Mac};
use hmac::{Hmac, Mac, NewMac};
use std::sync::Arc;
@@ -58,7 +58,7 @@ pub fn sha3_512(lua: &mut hlua::Lua, state: Arc<dyn State>) {
fn hmac<D>(secret: AnyLuaValue, msg: AnyLuaValue) -> Result<AnyLuaValue>
where
D: Input + BlockInput + FixedOutput + Reset + Default + Clone,
D: Update + BlockInput + FixedOutput + Reset + Default + Clone,
D::BlockSize: ArrayLength<u8> + Clone,
D::OutputSize: ArrayLength<u8>,
{
@@ -69,9 +69,9 @@ fn hmac<D>(secret: AnyLuaValue, msg: AnyLuaValue) -> Result<AnyLuaValue>
Ok(mac) => mac,
Err(_) => bail!("Invalid key length"),
};
mac.input(&msg);
let result = mac.result();
Ok(lua_bytes(&result.code()))
mac.update(&msg);
let result = mac.finalize();
Ok(lua_bytes(&result.into_bytes()))
}
pub fn hmac_md5(lua: &mut hlua::Lua, state: Arc<dyn State>) {