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

age: Remove radix64 dependency

Browse source 
radix64::EncodeWriter<W> is only implemented for W: Write, so we can't
store it inside ArmoredWriter<W> without any bound, which would prevent
us from using ArmoredWriter with W: AsyncWrite + !Write.
This commit is contained in:
Jack Grigg 2020-07-19 13:39:29 +12:00
parent 70c1296fac
commit db406102c0
3 changed files with 50 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Cargo.lock generated
View file

@ -84,7 +84,6 @@ dependencies = [
"pinentry 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quickcheck 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quickcheck_macros 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"radix64 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rpassword 4.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rsa 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1240,15 +1239,6 @@ dependencies = [
"proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "radix64"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rage"
version = "0.4.0"
@ -2103,7 +2093,6 @@ dependencies = [
"checksum quickcheck 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
"checksum quickcheck_macros 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f"
"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
"checksum radix64 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "999718fa65c3be3a74f3f6dae5a98526ff436ea58a82a574f0de89eecd342bee"
"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"

3
age/Cargo.toml
View file

@ -61,9 +61,6 @@ block-modes = { version = "0.4", optional = true }
cookie-factory = "0.3.1"
nom = "5"
# Armor writing
radix64 = "0.6"
# Secret management
secrecy = "0.7"
subtle = "2"

60
age/src/primitives/armor.rs
View file

@ -1,7 +1,6 @@
//! I/O helper structs for the age ASCII armor format.
use pin_project::pin_project;
use radix64::{configs::Std, io::EncodeWriter, STD};
use std::cmp;
use std::io::{self, BufRead, BufReader, Read, Seek, SeekFrom, Write};
use zeroize::Zeroizing;
@ -92,7 +91,8 @@ impl<W: Write> Write for LineEndingWriter<W> {
enum ArmorIs<W: Write> {
Enabled {
encoder: EncodeWriter<Std, LineEndingWriter<W>>,
inner: LineEndingWriter<W>,
byte_buf: Option<Vec<u8>>,
},
Disabled {
@ -109,7 +109,8 @@ impl<W: Write> ArmoredWriter<W> {
match format {
Format::AsciiArmor => LineEndingWriter::new(output).map(|w| {
ArmoredWriter(ArmorIs::Enabled {
encoder: EncodeWriter::new(STD, w),
inner: w,
byte_buf: Some(Vec::with_capacity(ARMORED_BYTES_PER_LINE)),
})
}),
Format::Binary => Ok(ArmoredWriter(ArmorIs::Disabled { inner: output })),
@ -123,26 +124,65 @@ impl<W: Write> ArmoredWriter<W> {
/// that will fail to decrypt.
pub fn finish(self) -> io::Result<W> {
match self.0 {
ArmorIs::Enabled { encoder } => encoder
.finish()
.map_err(|e| io::Error::from(e.error().kind()))
.and_then(|line_ending| line_ending.finish()),
ArmorIs::Enabled {
mut inner,
byte_buf,
..
} => {
let byte_buf = byte_buf.unwrap();
inner.write_all(base64::encode_config(&byte_buf, base64::STANDARD).as_bytes())?;
inner.finish()
}
ArmorIs::Disabled { inner } => Ok(inner),
}
}
}
impl<W: Write> Write for ArmoredWriter<W> {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
fn write(&mut self, mut buf: &[u8]) -> io::Result<usize> {
match &mut self.0 {
ArmorIs::Enabled { encoder } => encoder.write(buf),
ArmorIs::Enabled {
inner, byte_buf, ..
} => {
// Guaranteed to be Some (as long as async and sync writing isn't mixed),
// because ArmoredWriter::finish consumes self.
let byte_buf = byte_buf.as_mut().unwrap();
let mut written = 0;
loop {
let mut to_write = ARMORED_BYTES_PER_LINE - byte_buf.len();
if to_write > buf.len() {
to_write = buf.len()
}
byte_buf.extend_from_slice(&buf[..to_write]);
buf = &buf[to_write..];
written += to_write;
// At this point, either buf is empty, or we have a full line.
assert!(buf.is_empty() || byte_buf.len() == ARMORED_BYTES_PER_LINE);
// Only encode the line if we have more data to write, as the last
// (possibly-partial) line must be written in finish().
if buf.is_empty() {
break;
} else {
inner.write_all(
base64::encode_config(&byte_buf, base64::STANDARD).as_bytes(),
)?;
byte_buf.clear();
};
}
Ok(written)
}
ArmorIs::Disabled { inner } => inner.write(buf),
}
}
fn flush(&mut self) -> io::Result<()> {
match &mut self.0 {
ArmorIs::Enabled { encoder } => encoder.flush(),
ArmorIs::Enabled { inner, .. } => inner.flush(),
ArmorIs::Disabled { inner } => inner.flush(),
}
}