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

clippy: Remove needless borrows

Browse source
This commit is contained in:
Jack Grigg 2022-03-16 03:52:04 +00:00
parent 4df2fac3e1
commit 538ac500da
9 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
age-plugin/src/identity.rs
View file

@ -134,9 +134,9 @@ impl Error {
fn message(&self) -> &str { fn message(&self) -> &str {
match self { match self {
Error::Identity { message, .. } => &message, Error::Identity { message, .. } => message,
Error::Internal { message } => &message, Error::Internal { message } => message,
Error::Stanza { message, .. } => &message, Error::Stanza { message, .. } => message,
} }
} }
@ -152,8 +152,8 @@ impl Error {
}; };
let metadata = match &index { let metadata = match &index {
Some((file_index, Some(stanza_index))) => vec![self.kind(), &file_index, &stanza_index], Some((file_index, Some(stanza_index))) => vec![self.kind(), file_index, stanza_index],
Some((index, None)) => vec![self.kind(), &index], Some((index, None)) => vec![self.kind(), index],
None => vec![self.kind()], None => vec![self.kind()],
}; };

14
age-plugin/src/recipient.rs
View file

@ -128,9 +128,9 @@ impl Error {
fn message(&self) -> &str { fn message(&self) -> &str {
match self { match self {
Error::Recipient { message, .. } => &message, Error::Recipient { message, .. } => message,
Error::Identity { message, .. } => &message, Error::Identity { message, .. } => message,
Error::Internal { message } => &message, Error::Internal { message } => message,
} }
} }
@ -143,7 +143,7 @@ impl Error {
}; };
let metadata = match &index { let metadata = match &index {
Some(index) => vec![self.kind(), &index], Some(index) => vec![self.kind(), index],
None => vec![self.kind()], None => vec![self.kind()],
}; };
@ -230,7 +230,7 @@ pub(crate) fn run_v1<P: RecipientPluginV1>(mut plugin: P) -> io::Result<()> {
.as_ref() .as_ref()
.and_then(|(hrp, data, variant)| match (plugin_name(hrp), variant) { .and_then(|(hrp, data, variant)| match (plugin_name(hrp), variant) {
(Some(plugin_name), &bech32::Variant::Bech32) => { (Some(plugin_name), &bech32::Variant::Bech32) => {
Vec::from_base32(&data).ok().map(|data| (plugin_name, data)) Vec::from_base32(data).ok().map(|data| (plugin_name, data))
} }
_ => None, _ => None,
}) })
@ -254,7 +254,7 @@ pub(crate) fn run_v1<P: RecipientPluginV1>(mut plugin: P) -> io::Result<()> {
index, index,
message: "Invalid recipient encoding".to_owned(), message: "Invalid recipient encoding".to_owned(),
}, },
|index, plugin_name, bytes| plugin.add_recipient(index, &plugin_name, &bytes), |index, plugin_name, bytes| plugin.add_recipient(index, plugin_name, &bytes),
); );
let identities = parse_and_add( let identities = parse_and_add(
identities, identities,
@ -269,7 +269,7 @@ pub(crate) fn run_v1<P: RecipientPluginV1>(mut plugin: P) -> io::Result<()> {
index, index,
message: "Invalid identity encoding".to_owned(), message: "Invalid identity encoding".to_owned(),
}, },
|index, plugin_name, bytes| plugin.add_identity(index, &plugin_name, &bytes), |index, plugin_name, bytes| plugin.add_identity(index, plugin_name, &bytes),
); );
// Phase 2: wrap the file keys or return errors // Phase 2: wrap the file keys or return errors

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

@ -210,7 +210,7 @@ impl<W: AsyncWrite> AsyncWrite for LineEndingWriter<W> {
// line must be written in poll_close(). // line must be written in poll_close().
if !buf.is_empty() { if !buf.is_empty() {
*this.line_with_ending = Some(EncodedLine { *this.line_with_ending = Some(EncodedLine {
bytes: [&line, LINE_ENDING.as_bytes()].concat(), bytes: [line, LINE_ENDING.as_bytes()].concat(),
offset: 0, offset: 0,
}); });
line.clear(); line.clear();
@ -240,7 +240,7 @@ impl<W: AsyncWrite> AsyncWrite for LineEndingWriter<W> {
// marker. // marker.
*this.line_with_ending = Some(EncodedLine { *this.line_with_ending = Some(EncodedLine {
bytes: [ bytes: [
&line, line,
LINE_ENDING.as_bytes(), LINE_ENDING.as_bytes(),
ARMORED_END_MARKER.as_bytes(), ARMORED_END_MARKER.as_bytes(),
LINE_ENDING.as_bytes(), LINE_ENDING.as_bytes(),
@ -1080,7 +1080,7 @@ mod tests {
let mut tmp = &data[..]; let mut tmp = &data[..];
loop { loop {
match w.as_mut().poll_write(&mut cx, &tmp) { match w.as_mut().poll_write(&mut cx, tmp) {
Poll::Ready(Ok(0)) => break, Poll::Ready(Ok(0)) => break,
Poll::Ready(Ok(written)) => tmp = &tmp[written..], Poll::Ready(Ok(written)) => tmp = &tmp[written..],
Poll::Ready(Err(e)) => panic!("Unexpected error: {}", e), Poll::Ready(Err(e)) => panic!("Unexpected error: {}", e),

8
age/src/primitives/stream.rs
View file

@ -324,7 +324,7 @@ impl<W: AsyncWrite> AsyncWrite for StreamWriter<W> {
if !buf.is_empty() { if !buf.is_empty() {
let this = self.as_mut().project(); let this = self.as_mut().project();
*this.encrypted_chunk = Some(EncryptedChunk { *this.encrypted_chunk = Some(EncryptedChunk {
bytes: this.stream.encrypt_chunk(&this.chunk, false)?, bytes: this.stream.encrypt_chunk(this.chunk, false)?,
offset: 0, offset: 0,
}); });
this.chunk.clear(); this.chunk.clear();
@ -346,7 +346,7 @@ impl<W: AsyncWrite> AsyncWrite for StreamWriter<W> {
// Finish the stream. // Finish the stream.
let this = self.as_mut().project(); let this = self.as_mut().project();
*this.encrypted_chunk = Some(EncryptedChunk { *this.encrypted_chunk = Some(EncryptedChunk {
bytes: this.stream.encrypt_chunk(&this.chunk, true)?, bytes: this.stream.encrypt_chunk(this.chunk, true)?,
offset: 0, offset: 0,
}); });
} }
@ -719,7 +719,7 @@ mod tests {
let mut encrypted = vec![]; let mut encrypted = vec![];
{ {
let mut w = Stream::encrypt(PayloadKey([7; 32].into()), &mut encrypted); let mut w = Stream::encrypt(PayloadKey([7; 32].into()), &mut encrypted);
w.write_all(&data).unwrap(); w.write_all(data).unwrap();
w.finish().unwrap(); w.finish().unwrap();
}; };
@ -759,7 +759,7 @@ mod tests {
let mut tmp = data; let mut tmp = data;
loop { loop {
match w.as_mut().poll_write(&mut cx, &tmp) { match w.as_mut().poll_write(&mut cx, tmp) {
Poll::Ready(Ok(0)) => break, Poll::Ready(Ok(0)) => break,
Poll::Ready(Ok(written)) => tmp = &tmp[written..], Poll::Ready(Ok(written)) => tmp = &tmp[written..],
Poll::Ready(Err(e)) => panic!("Unexpected error: {}", e), Poll::Ready(Err(e)) => panic!("Unexpected error: {}", e),

2
age/src/protocol.rs
View file

@ -287,7 +287,7 @@ mod tests {
let mut tmp = &test_msg[..]; let mut tmp = &test_msg[..];
loop { loop {
match w.as_mut().poll_write(&mut cx, &tmp) { match w.as_mut().poll_write(&mut cx, tmp) {
Poll::Ready(Ok(0)) => break, Poll::Ready(Ok(0)) => break,
Poll::Ready(Ok(written)) => tmp = &tmp[written..], Poll::Ready(Ok(written)) => tmp = &tmp[written..],
Poll::Ready(Err(e)) => panic!("Unexpected error: {}", e), Poll::Ready(Err(e)) => panic!("Unexpected error: {}", e),

6
age/src/ssh.rs
View file

@ -80,7 +80,7 @@ impl OpenSshKdf {
match self { match self {
OpenSshKdf::Bcrypt { salt, rounds } => { OpenSshKdf::Bcrypt { salt, rounds } => {
let mut output = vec![0; out_len]; let mut output = vec![0; out_len];
bcrypt_pbkdf(passphrase.expose_secret(), &salt, *rounds, &mut output) bcrypt_pbkdf(passphrase.expose_secret(), salt, *rounds, &mut output)
.expect("parameters are valid"); .expect("parameters are valid");
output output
} }
@ -132,7 +132,7 @@ mod decrypt {
let cipher = C::new_from_slices(key, iv).expect("key and IV are correct length"); let cipher = C::new_from_slices(key, iv).expect("key and IV are correct length");
cipher cipher
.decrypt_padded_vec_mut::<NoPadding>(&ciphertext) .decrypt_padded_vec_mut::<NoPadding>(ciphertext)
.map_err(|_| DecryptError::KeyDecryptionFailed) .map_err(|_| DecryptError::KeyDecryptionFailed)
} }
@ -416,7 +416,7 @@ mod read_ssh {
map_opt(tuple((string, string)), |(pubkey_bytes, privkey_bytes)| { map_opt(tuple((string, string)), |(pubkey_bytes, privkey_bytes)| {
if privkey_bytes.len() == 64 && pubkey_bytes == &privkey_bytes[32..64] { if privkey_bytes.len() == 64 && pubkey_bytes == &privkey_bytes[32..64] {
let mut privkey = [0; 64]; let mut privkey = [0; 64];
privkey.copy_from_slice(&privkey_bytes); privkey.copy_from_slice(privkey_bytes);
Some(Secret::new(privkey)) Some(Secret::new(privkey))
} else { } else {
None None

6
age/src/ssh/identity.rs
View file

@ -48,7 +48,7 @@ impl UnencryptedKey {
match (self, stanza.tag.as_str()) { match (self, stanza.tag.as_str()) {
(UnencryptedKey::SshRsa(ssh_key, sk), SSH_RSA_RECIPIENT_TAG) => { (UnencryptedKey::SshRsa(ssh_key, sk), SSH_RSA_RECIPIENT_TAG) => {
let tag = base64_arg(stanza.args.get(0)?, [0; TAG_LEN_BYTES])?; let tag = base64_arg(stanza.args.get(0)?, [0; TAG_LEN_BYTES])?;
if ssh_tag(&ssh_key) != tag { if ssh_tag(ssh_key) != tag {
return None; return None;
} }
@ -73,7 +73,7 @@ impl UnencryptedKey {
} }
(UnencryptedKey::SshEd25519(ssh_key, privkey), SSH_ED25519_RECIPIENT_TAG) => { (UnencryptedKey::SshEd25519(ssh_key, privkey), SSH_ED25519_RECIPIENT_TAG) => {
let tag = base64_arg(stanza.args.get(0)?, [0; TAG_LEN_BYTES])?; let tag = base64_arg(stanza.args.get(0)?, [0; TAG_LEN_BYTES])?;
if ssh_tag(&ssh_key) != tag { if ssh_tag(ssh_key) != tag {
return None; return None;
} }
if stanza.body.len() != crate::x25519::ENCRYPTED_FILE_KEY_BYTES { if stanza.body.len() != crate::x25519::ENCRYPTED_FILE_KEY_BYTES {
@ -92,7 +92,7 @@ impl UnencryptedKey {
let pk = X25519PublicKey::from(&sk); let pk = X25519PublicKey::from(&sk);
let tweak: StaticSecret = let tweak: StaticSecret =
hkdf(&ssh_key, SSH_ED25519_RECIPIENT_KEY_LABEL, &[]).into(); hkdf(ssh_key, SSH_ED25519_RECIPIENT_KEY_LABEL, &[]).into();
let shared_secret = tweak let shared_secret = tweak
.diffie_hellman(&X25519PublicKey::from(*sk.diffie_hellman(&epk).as_bytes())); .diffie_hellman(&X25519PublicKey::from(*sk.diffie_hellman(&epk).as_bytes()));

8
age/src/ssh/recipient.rs
View file

@ -109,8 +109,7 @@ impl crate::Recipient for Recipient {
) )
.expect("pubkey is valid and file key is not too long"); .expect("pubkey is valid and file key is not too long");
let encoded_tag = let encoded_tag = base64::encode_config(&ssh_tag(ssh_key), base64::STANDARD_NO_PAD);
base64::encode_config(&ssh_tag(&ssh_key), base64::STANDARD_NO_PAD);
Ok(vec![Stanza { Ok(vec![Stanza {
tag: SSH_RSA_RECIPIENT_TAG.to_owned(), tag: SSH_RSA_RECIPIENT_TAG.to_owned(),
@ -126,7 +125,7 @@ impl crate::Recipient for Recipient {
let epk: X25519PublicKey = (&esk).into(); let epk: X25519PublicKey = (&esk).into();
let tweak: StaticSecret = let tweak: StaticSecret =
hkdf(&ssh_key, SSH_ED25519_RECIPIENT_KEY_LABEL, &[]).into(); hkdf(ssh_key, SSH_ED25519_RECIPIENT_KEY_LABEL, &[]).into();
let shared_secret = let shared_secret =
tweak.diffie_hellman(&(*esk.diffie_hellman(&pk).as_bytes()).into()); tweak.diffie_hellman(&(*esk.diffie_hellman(&pk).as_bytes()).into());
@ -141,8 +140,7 @@ impl crate::Recipient for Recipient {
); );
let encrypted_file_key = aead_encrypt(&enc_key, file_key.expose_secret()); let encrypted_file_key = aead_encrypt(&enc_key, file_key.expose_secret());
let encoded_tag = let encoded_tag = base64::encode_config(&ssh_tag(ssh_key), base64::STANDARD_NO_PAD);
base64::encode_config(&ssh_tag(&ssh_key), base64::STANDARD_NO_PAD);
let encoded_epk = base64::encode_config(epk.as_bytes(), base64::STANDARD_NO_PAD); let encoded_epk = base64::encode_config(epk.as_bytes(), base64::STANDARD_NO_PAD);
Ok(vec![Stanza { Ok(vec![Stanza {

2
rage/src/bin/rage-mount/main.rs
View file

@ -164,7 +164,7 @@ fn mount_fs<T: FilesystemMT + Send + Sync + 'static, F>(
where where
F: FnOnce() -> io::Result<T>, F: FnOnce() -> io::Result<T>,
{ {
let fuse_args: Vec<&OsStr> = vec![&OsStr::new("-o"), &OsStr::new("ro,auto_unmount")]; let fuse_args: Vec<&OsStr> = vec![OsStr::new("-o"), OsStr::new("ro,auto_unmount")];
let fs = open().map(|fs| fuse_mt::FuseMT::new(fs, 1))?; let fs = open().map(|fs| fuse_mt::FuseMT::new(fs, 1))?;
info!("{}", fl!("info-mounting-as-fuse")); info!("{}", fl!("info-mounting-as-fuse"));