mirror of
https://github.com/warp-tech/warpgate.git
synced 2025-02-22 22:43:29 +08:00
removed russh submodule
This commit is contained in:
Eugene Pankov
parent
a1dc78e5cf
commit
8d919b59ed
5 changed files with 14 additions and 114 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -1,3 +0,0 @@
|
|||
[submodule "russh"]
|
||||
path = russh
|
||||
url = https://github.com/warp-tech/russh.git
|
||||
112
Cargo.lock
generated
112
Cargo.lock
generated
|
|
@ -826,7 +826,7 @@ dependencies = [
|
|||
"crossbeam-utils",
|
||||
"futures",
|
||||
"hdrhistogram",
|
||||
"humantime 2.1.0",
|
||||
"humantime",
|
||||
"prost-types",
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
@ -1191,32 +1191,6 @@ dependencies = [
|
|||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"humantime 1.3.0",
|
||||
"log",
|
||||
"regex",
|
||||
"termcolor",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"humantime 2.1.0",
|
||||
"log",
|
||||
"regex",
|
||||
"termcolor",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "2.5.2"
|
||||
|
|
@ -1379,12 +1353,6 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fuchsia-cprng"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
|
||||
|
||||
[[package]]
|
||||
name = "funty"
|
||||
version = "2.0.0"
|
||||
|
|
@ -1756,15 +1724,6 @@ version = "1.0.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
|
||||
|
||||
[[package]]
|
||||
name = "humantime"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
|
||||
dependencies = [
|
||||
"quick-error",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "humantime"
|
||||
version = "2.1.0"
|
||||
|
|
@ -1777,7 +1736,7 @@ version = "1.1.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
|
||||
dependencies = [
|
||||
"humantime 2.1.0",
|
||||
"humantime",
|
||||
"serde",
|
||||
]
|
||||
|
||||
|
|
@ -3081,12 +3040,6 @@ dependencies = [
|
|||
"image",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "1.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.18"
|
||||
|
|
@ -3102,19 +3055,6 @@ version = "0.7.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
|
||||
dependencies = [
|
||||
"fuchsia-cprng",
|
||||
"libc",
|
||||
"rand_core 0.3.1",
|
||||
"rdrand",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.7.3"
|
||||
|
|
@ -3159,21 +3099,6 @@ dependencies = [
|
|||
"rand_core 0.6.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
|
||||
dependencies = [
|
||||
"rand_core 0.4.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.5.1"
|
||||
|
|
@ -3214,15 +3139,6 @@ dependencies = [
|
|||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rdrand"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
|
||||
dependencies = [
|
||||
"rand_core 0.3.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.13"
|
||||
|
|
@ -3348,18 +3264,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "russh"
|
||||
version = "0.34.0-beta.12"
|
||||
version = "0.34.0-beta.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a24b30157d49ff9362e17243e127f549675207ed31152be5354ca16988806a9f"
|
||||
dependencies = [
|
||||
"aes 0.8.1",
|
||||
"aes-gcm 0.10.1",
|
||||
"anyhow",
|
||||
"bitflags",
|
||||
"byteorder",
|
||||
"chacha20",
|
||||
"ctr 0.9.1",
|
||||
"curve25519-dalek",
|
||||
"digest 0.10.3",
|
||||
"env_logger 0.7.1",
|
||||
"flate2",
|
||||
"futures",
|
||||
"generic-array",
|
||||
|
|
@ -3383,6 +3299,8 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "russh-cryptovec"
|
||||
version = "0.7.0-beta.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e89fd30a2ef98dfa621409d5bc56a2479d5810bf13a5eea3de89d859437b7e2e"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
|
|
@ -3390,7 +3308,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "russh-keys"
|
||||
version = "0.22.0-beta.5"
|
||||
version = "0.22.0-beta.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a65c3fd68140a6c7d51156a8e55b556b643d806091746cc7ffdfab0e9cfd6da"
|
||||
dependencies = [
|
||||
"aes 0.8.1",
|
||||
"bcrypt-pbkdf",
|
||||
|
|
@ -3402,7 +3322,6 @@ dependencies = [
|
|||
"data-encoding",
|
||||
"dirs",
|
||||
"ed25519-dalek",
|
||||
"env_logger 0.8.4",
|
||||
"futures",
|
||||
"hmac",
|
||||
"inout",
|
||||
|
|
@ -3418,7 +3337,6 @@ dependencies = [
|
|||
"serde",
|
||||
"serde_derive",
|
||||
"sha2 0.10.2",
|
||||
"tempdir",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"tokio-stream",
|
||||
|
|
@ -4137,16 +4055,6 @@ version = "1.0.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
|
||||
[[package]]
|
||||
name = "tempdir"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
|
||||
dependencies = [
|
||||
"rand 0.4.6",
|
||||
"remove_dir_all",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.3.0"
|
||||
|
|
|
|||
1
russh
1
russh
|
|
@ -1 +0,0 @@
|
|||
Subproject commit e65dd27f2102b2cb7018981f7689525a9824a8a6
|
||||
|
|
@ -24,7 +24,7 @@ poem-openapi = { version = "^2.0.4", features = [
|
|||
"uuid",
|
||||
"static-files",
|
||||
] }
|
||||
russh-keys = { version = "0.22.0-beta.4", features = ["openssl"], path = "../russh/russh-keys" }
|
||||
russh-keys = { version = "0.22.0-beta.4", features = ["openssl"] }
|
||||
rust-embed = "6.3"
|
||||
sea-orm = { version = "^0.9", features = [
|
||||
"sqlx-sqlite",
|
||||
|
|
@ -34,7 +34,7 @@ sea-orm = { version = "^0.9", features = [
|
|||
serde = "1.0"
|
||||
serde_json = "1.0"
|
||||
thiserror = "1.0"
|
||||
tokio = {version = "1.20", features = ["tracing"]}
|
||||
tokio = { version = "1.20", features = ["tracing"] }
|
||||
tracing = "0.1"
|
||||
uuid = { version = "1.0", features = ["v4", "serde"] }
|
||||
warpgate-common = { version = "*", path = "../warpgate-common" }
|
||||
|
|
|
|||
|
|
@ -12,12 +12,8 @@ bimap = "0.6"
|
|||
bytes = "1.2"
|
||||
dialoguer = "0.10"
|
||||
futures = "0.3"
|
||||
russh = { version = "0.34.0-beta.12", features = [
|
||||
"vendored-openssl",
|
||||
], path = "../russh/russh" }
|
||||
russh-keys = { version = "0.22.0-beta.5", features = [
|
||||
"vendored-openssl",
|
||||
], path = "../russh/russh-keys" }
|
||||
russh = { version = "0.34.0-beta.15", features = ["vendored-openssl"] }
|
||||
russh-keys = { version = "0.22.0-beta.5", features = ["vendored-openssl"] }
|
||||
sea-orm = { version = "^0.9", features = [
|
||||
"runtime-tokio-native-tls",
|
||||
], default-features = false }
|
||||
|
|
|
|||
Loading…
Reference in a new issue