mirror of
https://github.com/str4d/rage.git
synced 2025-04-03 19:07:42 +03:00
Migrate to workspace inheritance
This commit is contained in:
Jack Grigg
parent
fdb41822fc
commit
5b2ade12a4
8 changed files with 150 additions and 106 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -75,7 +75,6 @@ dependencies = [
|
|||
"futures",
|
||||
"futures-test",
|
||||
"hex",
|
||||
"hkdf",
|
||||
"hmac",
|
||||
"i18n-embed",
|
||||
"i18n-embed-fl",
|
||||
|
|
|
|||
60
Cargo.toml
60
Cargo.toml
|
|
@ -6,3 +6,63 @@ members = [
|
|||
"rage",
|
||||
]
|
||||
resolver = "2"
|
||||
|
||||
[workspace.package]
|
||||
authors = ["Jack Grigg <thestr4d@gmail.com>"]
|
||||
edition = "2021"
|
||||
rust-version = "1.65"
|
||||
repository = "https://github.com/str4d/rage"
|
||||
license = "MIT OR Apache-2.0"
|
||||
|
||||
[workspace.dependencies]
|
||||
age = { version = "0.9.2", path = "age" }
|
||||
age-core = { version = "0.9.0", path = "age-core" }
|
||||
|
||||
# Dependencies required by the age specification:
|
||||
# - Base64 from RFC 4648
|
||||
base64 = "0.13"
|
||||
|
||||
# - ChaCha20-Poly1305 from RFC 7539
|
||||
chacha20poly1305 = { version = "0.10", default-features = false, features = ["alloc"] }
|
||||
|
||||
# - X25519 from RFC 7748
|
||||
x25519-dalek = "1"
|
||||
|
||||
# - HKDF from RFC 5869 with SHA-256
|
||||
# - HMAC from RFC 2104 with SHA-256
|
||||
hkdf = "0.12"
|
||||
hmac = "0.12"
|
||||
sha2 = "0.10"
|
||||
|
||||
# - scrypt from RFC 7914
|
||||
scrypt = { version = "0.10", default-features = false }
|
||||
|
||||
# - CSPRNG
|
||||
rand = "0.8"
|
||||
rand_7 = { package = "rand", version = "0.7" }
|
||||
|
||||
# - Key encoding
|
||||
bech32 = "0.9"
|
||||
|
||||
# Parsing
|
||||
cookie-factory = "0.3.1"
|
||||
nom = { version = "7", default-features = false, features = ["alloc"] }
|
||||
|
||||
# Secret management
|
||||
pinentry = "0.5"
|
||||
secrecy = "0.8"
|
||||
subtle = "2"
|
||||
zeroize = "1"
|
||||
|
||||
# Localization
|
||||
i18n-embed = { version = "0.13", features = ["fluent-system"] }
|
||||
i18n-embed-fl = "0.6"
|
||||
lazy_static = "1"
|
||||
rust-embed = "6"
|
||||
|
||||
# CLI
|
||||
chrono = "0.4"
|
||||
console = { version = "0.15", default-features = false }
|
||||
env_logger = "0.9"
|
||||
gumdrop = "0.8"
|
||||
log = "0.4"
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
name = "age-core"
|
||||
description = "[BETA] Common functions used across the age crates"
|
||||
version = "0.9.0"
|
||||
authors = ["Jack Grigg <thestr4d@gmail.com>"]
|
||||
repository = "https://github.com/str4d/rage"
|
||||
authors.workspace = true
|
||||
repository.workspace = true
|
||||
readme = "README.md"
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.65"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
|
||||
[package.metadata.docs.rs]
|
||||
all-features = true
|
||||
|
|
@ -17,29 +17,20 @@ rustdoc-args = ["--cfg", "docsrs"]
|
|||
maintenance = { status = "experimental" }
|
||||
|
||||
[dependencies]
|
||||
# Dependencies required by the age specification:
|
||||
# - Base64 from RFC 4648
|
||||
base64 = "0.13"
|
||||
|
||||
# - ChaCha20-Poly1305 from RFC 7539
|
||||
chacha20poly1305 = { version = "0.10", default-features = false, features = ["alloc"] }
|
||||
|
||||
# - HKDF from RFC 5869 with SHA-256
|
||||
hkdf = "0.12"
|
||||
sha2 = "0.10"
|
||||
|
||||
# - CSPRNG
|
||||
rand = "0.8"
|
||||
|
||||
# Parsing
|
||||
cookie-factory = "0.3.1"
|
||||
nom = { version = "7", default-features = false, features = ["alloc"] }
|
||||
|
||||
# Secret management
|
||||
secrecy = "0.8"
|
||||
|
||||
# Plugin backend
|
||||
# Dependencies exposed in a public API:
|
||||
# (Breaking upgrades to these require a breaking upgrade to this crate.)
|
||||
chacha20poly1305.workspace = true
|
||||
cookie-factory.workspace = true
|
||||
io_tee = "0.1.1"
|
||||
nom.workspace = true
|
||||
secrecy.workspace = true
|
||||
|
||||
# Dependencies used internally:
|
||||
# (Breaking upgrades to these are usually backwards-compatible, but check MSRVs.)
|
||||
base64.workspace = true
|
||||
hkdf.workspace = true
|
||||
rand.workspace = true
|
||||
sha2.workspace = true
|
||||
tempfile = { version = "3.2.0", optional = true }
|
||||
|
||||
[features]
|
||||
|
|
|
|||
|
|
@ -2,21 +2,26 @@
|
|||
name = "age-plugin"
|
||||
description = "[BETA] API for writing age plugins."
|
||||
version = "0.4.0"
|
||||
authors = ["Jack Grigg <thestr4d@gmail.com>"]
|
||||
repository = "https://github.com/str4d/rage"
|
||||
authors.workspace = true
|
||||
repository.workspace = true
|
||||
readme = "README.md"
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.65"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
|
||||
[dependencies]
|
||||
age-core = { version = "0.9.0", path = "../age-core", features = ["plugin"] }
|
||||
base64 = "0.13"
|
||||
bech32 = "0.9"
|
||||
chrono = "0.4"
|
||||
# Dependencies exposed in a public API:
|
||||
# (Breaking upgrades to these require a breaking upgrade to this crate.)
|
||||
age-core = { workspace = true, features = ["plugin"] }
|
||||
|
||||
# Dependencies used internally:
|
||||
# (Breaking upgrades to these are usually backwards-compatible, but check MSRVs.)
|
||||
base64.workspace = true
|
||||
bech32.workspace = true
|
||||
chrono.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
gumdrop = "0.8"
|
||||
gumdrop.workspace = true
|
||||
|
||||
[lib]
|
||||
bench = false
|
||||
|
|
|
|||
|
|
@ -2,55 +2,62 @@
|
|||
name = "age"
|
||||
description = "[BETA] A simple, secure, and modern encryption library."
|
||||
version = "0.9.2"
|
||||
authors = ["Jack Grigg <thestr4d@gmail.com>"]
|
||||
repository = "https://github.com/str4d/rage"
|
||||
authors.workspace = true
|
||||
repository.workspace = true
|
||||
readme = "README.md"
|
||||
keywords = ["rage", "encryption"]
|
||||
categories = ["cryptography"]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.65"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
|
||||
[badges]
|
||||
maintenance = { status = "experimental" }
|
||||
|
||||
[dependencies]
|
||||
age-core = { version = "0.9.0", path = "../age-core" }
|
||||
age-core.workspace = true
|
||||
|
||||
# Dependencies required by the age specification:
|
||||
# - Base64 from RFC 4648
|
||||
base64 = "0.13"
|
||||
|
||||
# - ChaCha20-Poly1305 from RFC 7539
|
||||
chacha20poly1305 = { version = "0.10", default-features = false, features = ["alloc"] }
|
||||
|
||||
# - X25519 from RFC 7748
|
||||
x25519-dalek = "1"
|
||||
|
||||
# - HKDF from RFC 5869 with SHA-256
|
||||
# - HMAC from RFC 2104 with SHA-256
|
||||
hkdf = "0.12"
|
||||
hmac = "0.12"
|
||||
sha2 = "0.10"
|
||||
|
||||
# - scrypt from RFC 7914
|
||||
scrypt = { version = "0.10", default-features = false }
|
||||
|
||||
# - CSPRNG
|
||||
rand = "0.8"
|
||||
rand_7 = { package = "rand", version = "0.7" }
|
||||
|
||||
# - Key encoding
|
||||
bech32 = "0.9"
|
||||
# Dependencies exposed in a public API:
|
||||
# (Breaking upgrades to these require a breaking upgrade to this crate.)
|
||||
base64.workspace = true
|
||||
chacha20poly1305.workspace = true
|
||||
hmac.workspace = true
|
||||
i18n-embed.workspace = true
|
||||
rand.workspace = true
|
||||
|
||||
# OpenSSH-specific dependencies:
|
||||
# - RSAES-OAEP from RFC 8017 with SHA-256 and MGF1
|
||||
num-traits = { version = "0.2", optional = true }
|
||||
rsa = { version = "0.7", default-features = false, optional = true }
|
||||
|
||||
# - Conversion of public keys from Ed25519 to X25519
|
||||
curve25519-dalek = { version = "3", optional = true }
|
||||
|
||||
# Async I/O
|
||||
futures = { version = "0.3", optional = true }
|
||||
pin-project = "1"
|
||||
|
||||
# Common CLI dependencies
|
||||
pinentry = { version = "0.5", optional = true }
|
||||
|
||||
# Dependencies used internally:
|
||||
# (Breaking upgrades to these are usually backwards-compatible, but check MSRVs.)
|
||||
bech32.workspace = true
|
||||
cookie-factory.workspace = true
|
||||
i18n-embed-fl.workspace = true
|
||||
lazy_static.workspace = true
|
||||
nom.workspace = true
|
||||
rand_7.workspace = true
|
||||
rust-embed.workspace = true
|
||||
scrypt.workspace = true
|
||||
sha2.workspace = true
|
||||
subtle.workspace = true
|
||||
x25519-dalek.workspace = true
|
||||
zeroize.workspace = true
|
||||
|
||||
# OpenSSH-specific dependencies:
|
||||
# - RSAES-OAEP from RFC 8017 with SHA-256 and MGF1
|
||||
num-traits = { version = "0.2", optional = true }
|
||||
|
||||
# - Encrypted keys
|
||||
aes = { version = "0.8", optional = true }
|
||||
aes-gcm = { version = "0.10", optional = true }
|
||||
|
|
@ -59,33 +66,17 @@ cbc = { version = "0.1", optional = true }
|
|||
cipher = { version = "0.4.3", features = ["alloc"], optional = true }
|
||||
ctr = { version = "0.9", optional = true }
|
||||
|
||||
# Parsing
|
||||
cookie-factory = "0.3.1"
|
||||
nom = { version = "7", default-features = false, features = ["alloc"] }
|
||||
|
||||
# Secret management
|
||||
subtle = "2"
|
||||
zeroize = "1"
|
||||
# scrypt Performance timer
|
||||
web-sys = { version = "0.3", optional = true, features = ["Window", "Performance"]}
|
||||
|
||||
# Async I/O
|
||||
futures = { version = "0.3", optional = true }
|
||||
memchr = { version = "2.5", optional = true }
|
||||
pin-project = "1"
|
||||
|
||||
# Localization
|
||||
i18n-embed = { version = "0.13", features = ["fluent-system"] }
|
||||
i18n-embed-fl = "0.6"
|
||||
lazy_static = "1"
|
||||
rust-embed = "6"
|
||||
|
||||
# Common CLI dependencies
|
||||
atty = { version = "0.2", optional = true }
|
||||
console = { version = "0.15", optional = true, default-features = false }
|
||||
pinentry = { version = "0.5", optional = true }
|
||||
rpassword = { version = "6", optional = true }
|
||||
|
||||
web-sys = { version = "0.3", optional = true, features = ["Window", "Performance"]}
|
||||
|
||||
[target.'cfg(any(unix, windows))'.dependencies]
|
||||
# Plugin management
|
||||
which = { version = "4", optional = true }
|
||||
|
|
|
|||
1
fuzz-afl/Cargo.lock
generated
1
fuzz-afl/Cargo.lock
generated
|
|
@ -34,7 +34,6 @@ dependencies = [
|
|||
"bech32",
|
||||
"chacha20poly1305",
|
||||
"cookie-factory",
|
||||
"hkdf",
|
||||
"hmac",
|
||||
"i18n-embed",
|
||||
"i18n-embed-fl",
|
||||
|
|
|
|||
1
fuzz/Cargo.lock
generated
1
fuzz/Cargo.lock
generated
|
|
@ -21,7 +21,6 @@ dependencies = [
|
|||
"bech32",
|
||||
"chacha20poly1305",
|
||||
"cookie-factory",
|
||||
"hkdf",
|
||||
"hmac",
|
||||
"i18n-embed",
|
||||
"i18n-embed-fl",
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
name = "rage"
|
||||
description = "[BETA] A simple, secure, and modern encryption tool."
|
||||
version = "0.9.2"
|
||||
authors = ["Jack Grigg <thestr4d@gmail.com>"]
|
||||
repository = "https://github.com/str4d/rage"
|
||||
authors.workspace = true
|
||||
repository.workspace = true
|
||||
readme = "../README.md"
|
||||
keywords = ["age", "cli", "encryption"]
|
||||
categories = ["command-line-utilities", "cryptography"]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.65"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
default-run = "rage"
|
||||
|
||||
[package.metadata.deb]
|
||||
|
|
@ -54,17 +54,17 @@ maintenance = { status = "experimental" }
|
|||
|
||||
[dependencies]
|
||||
# rage and rage-keygen dependencies
|
||||
age = { version = "0.9.2", path = "../age", features = ["armor", "cli-common", "plugin"] }
|
||||
chrono = "0.4"
|
||||
console = { version = "0.15", default-features = false }
|
||||
env_logger = "0.9"
|
||||
gumdrop = "0.8"
|
||||
i18n-embed = { version = "0.13", features = ["desktop-requester", "fluent-system"] }
|
||||
i18n-embed-fl = "0.6"
|
||||
lazy_static = "1"
|
||||
log = "0.4"
|
||||
pinentry = "0.5"
|
||||
rust-embed = "6"
|
||||
age = { workspace = true, features = ["armor", "cli-common", "plugin"] }
|
||||
chrono.workspace = true
|
||||
console.workspace = true
|
||||
env_logger.workspace = true
|
||||
gumdrop.workspace = true
|
||||
i18n-embed = { workspace = true, features = ["desktop-requester"] }
|
||||
i18n-embed-fl.workspace = true
|
||||
lazy_static.workspace = true
|
||||
log.workspace = true
|
||||
pinentry.workspace = true
|
||||
rust-embed.workspace = true
|
||||
|
||||
# rage-mount dependencies
|
||||
ctrlc = { version = "3.2", optional = true }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue