mirrors/rage
1
0
Fork 0
mirror of https://github.com/str4d/rage.git synced 2025-04-04 19:37:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

nom 6

Browse source
This commit is contained in:
Jack Grigg 2021-01-11 04:18:52 +00:00
parent 0e860a672a
commit 2f902ae05f
10 changed files with 135 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Cargo.lock generated
View file

@ -148,12 +148,6 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "arrayvec"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]] [[package]]
name = "atty" name = "atty"
version = "0.2.14" version = "0.2.14"
@ -208,6 +202,18 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "bitvec"
version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
dependencies = [
"funty",
"radium",
"tap",
"wyz",
]
[[package]] [[package]]
name = "block" name = "block"
version = "0.1.6" version = "0.1.6"
@ -739,6 +745,12 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb1016e8c600060e0099218442fff329a204f6316d6ec974d590d3281517a52" checksum = "edb1016e8c600060e0099218442fff329a204f6316d6ec974d590d3281517a52"
[[package]]
name = "funty"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
[[package]] [[package]]
name = "fuse" name = "fuse"
version = "0.3.1" version = "0.3.1"
@ -1123,19 +1135,6 @@ dependencies = [
"spin", "spin",
] ]
[[package]]
name = "lexical-core"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
dependencies = [
"arrayvec",
"bitflags",
"cfg-if 0.1.10",
"ryu",
"static_assertions",
]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.82" version = "0.2.82"
@ -1232,11 +1231,11 @@ dependencies = [
[[package]] [[package]]
name = "nom" name = "nom"
version = "5.1.2" version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
dependencies = [ dependencies = [
"lexical-core", "bitvec",
"memchr", "memchr",
"version_check", "version_check",
] ]
@ -1471,9 +1470,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]] [[package]]
name = "pinentry" name = "pinentry"
version = "0.2.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df68b5d0eab7fbcbd231ba70565bac680a06faf66e8405a387eb48ad145c1327" checksum = "a8266a6e77c40ef16f3d00bfe72ddb6e2fd29384d5b87e6bae1975099aa12921"
dependencies = [ dependencies = [
"log 0.4.13", "log 0.4.13",
"nom", "nom",
@ -1594,6 +1593,12 @@ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "radium"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
[[package]] [[package]]
name = "rage" name = "rage"
version = "0.5.0" version = "0.5.0"
@ -1955,12 +1960,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.10.0" version = "0.10.0"
@ -1996,6 +1995,12 @@ dependencies = [
"unicode-xid", "unicode-xid",
] ]
[[package]]
name = "tap"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
[[package]] [[package]]
name = "tar" name = "tar"
version = "0.4.30" version = "0.4.30"
@ -2333,6 +2338,12 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4" checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4"
[[package]]
name = "wyz"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
[[package]] [[package]]
name = "x25519-dalek" name = "x25519-dalek"
version = "1.1.0" version = "1.1.0"

2
age-core/Cargo.toml
View file

@ -29,7 +29,7 @@ rand = "0.7"
# Parsing # Parsing
cookie-factory = "0.3.1" cookie-factory = "0.3.1"
nom = "5" nom = { version = "6", default-features = false, features = ["alloc"] }
# Secret management # Secret management
secrecy = "0.7" secrecy = "0.7"

11
age-core/src/format.rs
View file

@ -108,7 +108,7 @@ pub mod read {
bytes::streaming::{tag, take_while, take_while1}, bytes::streaming::{tag, take_while, take_while1},
character::streaming::newline, character::streaming::newline,
combinator::{map, map_opt, opt, verify}, combinator::{map, map_opt, opt, verify},
multi::{many0, separated_nonempty_list}, multi::{many0, separated_list1},
sequence::{pair, preceded, terminated}, sequence::{pair, preceded, terminated},
IResult, IResult,
}; };
@ -189,7 +189,7 @@ pub mod read {
} }
fn legacy_wrapped_encoded_data(input: &[u8]) -> IResult<&[u8], Vec<u8>> { fn legacy_wrapped_encoded_data(input: &[u8]) -> IResult<&[u8], Vec<u8>> {
map_opt(separated_nonempty_list(newline, take_b64_line1), |chunks| { map_opt(separated_list1(newline, take_b64_line1), |chunks| {
// Enforce that the only chunk allowed to be shorter than 64 characters // Enforce that the only chunk allowed to be shorter than 64 characters
// is the last chunk. // is the last chunk.
if chunks.iter().rev().skip(1).any(|s| s.len() != 64) if chunks.iter().rev().skip(1).any(|s| s.len() != 64)
@ -218,7 +218,7 @@ pub mod read {
pair( pair(
preceded( preceded(
tag(STANZA_TAG), tag(STANZA_TAG),
terminated(separated_nonempty_list(tag(" "), arbitrary_string), newline), terminated(separated_list1(tag(" "), arbitrary_string), newline),
), ),
wrapped_encoded_data, wrapped_encoded_data,
), ),
@ -232,10 +232,7 @@ pub mod read {
fn legacy_age_stanza_inner<'a>(input: &'a [u8]) -> IResult<&'a [u8], AgeStanza<'a>> { fn legacy_age_stanza_inner<'a>(input: &'a [u8]) -> IResult<&'a [u8], AgeStanza<'a>> {
map( map(
pair( pair(
preceded( preceded(tag(STANZA_TAG), separated_list1(tag(" "), arbitrary_string)),
tag(STANZA_TAG),
separated_nonempty_list(tag(" "), arbitrary_string),
),
terminated(opt(preceded(newline, legacy_wrapped_encoded_data)), newline), terminated(opt(preceded(newline, legacy_wrapped_encoded_data)), newline),
), ),
|(mut args, body)| { |(mut args, body)| {

4
age/Cargo.toml
View file

@ -58,7 +58,7 @@ block-modes = { version = "0.7", optional = true }
# Parsing # Parsing
cookie-factory = "0.3.1" cookie-factory = "0.3.1"
nom = "5" nom = { version = "6", default-features = false, features = ["alloc"] }
# Secret management # Secret management
secrecy = "0.7" secrecy = "0.7"
@ -77,7 +77,7 @@ rust-embed = "5"
# Common CLI dependencies # Common CLI dependencies
console = { version = "0.13", optional = true } console = { version = "0.13", optional = true }
pinentry = { version = "0.2", optional = true } pinentry = { version = "0.3", optional = true }
rpassword = { version = "5", optional = true } rpassword = { version = "5", optional = true }
[target.'cfg(any(unix, windows))'.dependencies] [target.'cfg(any(unix, windows))'.dependencies]

10
age/src/format.rs
View file

@ -77,8 +77,9 @@ impl Header {
// parser is constructed, because if we read more than we need, the // parser is constructed, because if we read more than we need, the
// remainder of the input will be truncated. // remainder of the input will be truncated.
let m = data.len(); let m = data.len();
data.resize(m + n, 0); let new_len = m + n.get();
input.read_exact(&mut data[m..m + n])?; data.resize(new_len, 0);
input.read_exact(&mut data[m..new_len])?;
} }
Err(_) => { Err(_) => {
break Err(DecryptError::InvalidHeader); break Err(DecryptError::InvalidHeader);
@ -105,8 +106,9 @@ impl Header {
// parser is constructed, because if we read more than we need, the // parser is constructed, because if we read more than we need, the
// remainder of the input will be truncated. // remainder of the input will be truncated.
let m = data.len(); let m = data.len();
data.resize(m + n, 0); let new_len = m + n.get();
input.read_exact(&mut data[m..m + n]).await?; data.resize(new_len, 0);
input.read_exact(&mut data[m..new_len]).await?;
} }
Err(_) => { Err(_) => {
break Err(DecryptError::InvalidHeader); break Err(DecryptError::InvalidHeader);

4
age/src/ssh.rs
View file

@ -103,7 +103,7 @@ impl EncryptedKey {
.cipher .cipher
.decrypt(&self.kdf, passphrase, &self.encrypted)?; .decrypt(&self.kdf, passphrase, &self.encrypted)?;
let parser = read_ssh::openssh_unencrypted_privkey(&self.ssh_key); let mut parser = read_ssh::openssh_unencrypted_privkey(&self.ssh_key);
parser(&decrypted) parser(&decrypted)
.map(|(_, sk)| sk) .map(|(_, sk)| sk)
.map_err(|_| DecryptError::KeyDecryptionFailed) .map_err(|_| DecryptError::KeyDecryptionFailed)
@ -450,7 +450,7 @@ mod read_ssh {
#[allow(clippy::needless_lifetimes)] #[allow(clippy::needless_lifetimes)]
pub(super) fn openssh_unencrypted_privkey<'a>( pub(super) fn openssh_unencrypted_privkey<'a>(
ssh_key: &[u8], ssh_key: &[u8],
) -> impl Fn(&'a [u8]) -> IResult<&'a [u8], UnencryptedKey> { ) -> impl FnMut(&'a [u8]) -> IResult<&'a [u8], UnencryptedKey> {
// We need to own, move, and clone these in order to keep them alive. // We need to own, move, and clone these in order to keep them alive.
let ssh_key_rsa = ssh_key.to_vec(); let ssh_key_rsa = ssh_key.to_vec();
let ssh_key_ed25519 = ssh_key.to_vec(); let ssh_key_ed25519 = ssh_key.to_vec();

14
age/src/util.rs
View file

@ -16,7 +16,7 @@ pub(crate) mod read {
use nom::{ use nom::{
combinator::map_res, combinator::map_res,
error::{make_error, ErrorKind}, error::{make_error, ErrorKind},
multi::separated_nonempty_list, multi::separated_list1,
IResult, IResult,
}; };
@ -31,15 +31,7 @@ pub(crate) mod read {
let encoded_count = ((4 * count) + 2) / 3; let encoded_count = ((4 * count) + 2) / 3;
move |input: &str| { move |input: &str| {
// take() returns the total number of bytes it needs, not the let (i, data) = take(encoded_count)(input)?;
// additional number of bytes like other APIs.
let (i, data) = take(encoded_count)(input).map_err(|e| match e {
nom::Err::Incomplete(nom::Needed::Size(n)) if n == encoded_count => {
nom::Err::Incomplete(nom::Needed::Size(encoded_count - input.len()))
}
e => e,
})?;
match base64::decode_config(data, config) { match base64::decode_config(data, config) {
Ok(decoded) => Ok((i, decoded)), Ok(decoded) => Ok((i, decoded)),
Err(_) => Err(nom::Err::Failure(make_error(input, ErrorKind::Eof))), Err(_) => Err(nom::Err::Failure(make_error(input, ErrorKind::Eof))),
@ -74,7 +66,7 @@ pub(crate) mod read {
move |input: &str| { move |input: &str| {
map_res( map_res(
separated_nonempty_list( separated_list1(
line_ending, line_ending,
take_while1(|c| { take_while1(|c| {
let c = c as u8; let c = c as u8;

73
fuzz-afl/Cargo.lock generated
View file

@ -100,12 +100,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "arrayvec"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]] [[package]]
name = "atty" name = "atty"
version = "0.2.14" version = "0.2.14"
@ -135,6 +129,18 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "bitvec"
version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
dependencies = [
"funty",
"radium",
"tap",
"wyz",
]
[[package]] [[package]]
name = "block-buffer" name = "block-buffer"
version = "0.9.0" version = "0.9.0"
@ -323,6 +329,12 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb1016e8c600060e0099218442fff329a204f6316d6ec974d590d3281517a52" checksum = "edb1016e8c600060e0099218442fff329a204f6316d6ec974d590d3281517a52"
[[package]]
name = "funty"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
[[package]] [[package]]
name = "fxhash" name = "fxhash"
version = "0.2.1" version = "0.2.1"
@ -484,19 +496,6 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lexical-core"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
dependencies = [
"arrayvec",
"bitflags",
"cfg-if 0.1.10",
"ryu",
"static_assertions",
]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.82" version = "0.2.82"
@ -529,11 +528,11 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]] [[package]]
name = "nom" name = "nom"
version = "5.1.2" version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
dependencies = [ dependencies = [
"lexical-core", "bitvec",
"memchr", "memchr",
"version_check", "version_check",
] ]
@ -688,6 +687,12 @@ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "radium"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.7.3" version = "0.7.3"
@ -795,12 +800,6 @@ dependencies = [
"semver", "semver",
] ]
[[package]]
name = "ryu"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]] [[package]]
name = "salsa20" name = "salsa20"
version = "0.7.2" version = "0.7.2"
@ -906,12 +905,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.8.0" version = "0.8.0"
@ -953,6 +946,12 @@ dependencies = [
"unicode-xid", "unicode-xid",
] ]
[[package]]
name = "tap"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
[[package]] [[package]]
name = "textwrap" name = "textwrap"
version = "0.11.0" version = "0.11.0"
@ -1122,6 +1121,12 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "wyz"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
[[package]] [[package]]
name = "x25519-dalek" name = "x25519-dalek"
version = "1.1.0" version = "1.1.0"

73
fuzz/Cargo.lock generated
View file

@ -86,12 +86,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64cf76cb6e2222ed0ea86b2b0ee2f71c96ec6edd5af42e84d59160e91b836ec4" checksum = "64cf76cb6e2222ed0ea86b2b0ee2f71c96ec6edd5af42e84d59160e91b836ec4"
[[package]]
name = "arrayvec"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.13.0" version = "0.13.0"
@ -105,10 +99,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdcf67bb7ba7797a081cd19009948ab533af7c355d5caf1d08c777582d351e9c" checksum = "cdcf67bb7ba7797a081cd19009948ab533af7c355d5caf1d08c777582d351e9c"
[[package]] [[package]]
name = "bitflags" name = "bitvec"
version = "1.2.1" version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
dependencies = [
"funty",
"radium",
"tap",
"wyz",
]
[[package]] [[package]]
name = "block-buffer" name = "block-buffer"
@ -283,6 +283,12 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb1016e8c600060e0099218442fff329a204f6316d6ec974d590d3281517a52" checksum = "edb1016e8c600060e0099218442fff329a204f6316d6ec974d590d3281517a52"
[[package]]
name = "funty"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
[[package]] [[package]]
name = "fxhash" name = "fxhash"
version = "0.2.1" version = "0.2.1"
@ -444,19 +450,6 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lexical-core"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
dependencies = [
"arrayvec",
"bitflags",
"cfg-if 0.1.10",
"ryu",
"static_assertions",
]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.82" version = "0.2.82"
@ -498,11 +491,11 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]] [[package]]
name = "nom" name = "nom"
version = "5.1.2" version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
dependencies = [ dependencies = [
"lexical-core", "bitvec",
"memchr", "memchr",
"version_check", "version_check",
] ]
@ -657,6 +650,12 @@ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "radium"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.7.3" version = "0.7.3"
@ -755,12 +754,6 @@ dependencies = [
"walkdir", "walkdir",
] ]
[[package]]
name = "ryu"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]] [[package]]
name = "salsa20" name = "salsa20"
version = "0.7.2" version = "0.7.2"
@ -851,12 +844,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.10.0" version = "0.10.0"
@ -892,6 +879,12 @@ dependencies = [
"unicode-xid", "unicode-xid",
] ]
[[package]]
name = "tap"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.23" version = "1.0.23"
@ -1040,6 +1033,12 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "wyz"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
[[package]] [[package]]
name = "x25519-dalek" name = "x25519-dalek"
version = "1.1.0" version = "1.1.0"

2
rage/Cargo.toml
View file

@ -52,7 +52,7 @@ i18n-embed = { version = "0.10.2", features = ["desktop-requester", "fluent-syst
i18n-embed-fl = "0.3" i18n-embed-fl = "0.3"
lazy_static = "1" lazy_static = "1"
log = "0.4" log = "0.4"
pinentry = "0.2" pinentry = "0.3"
rust-embed = "5" rust-embed = "5"
secrecy = "0.7" secrecy = "0.7"