diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2021-09-15 16:11:55 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2021-09-15 16:19:01 +0200 |
commit | 36e3534f682916ddbf91948b0bc9977168380f5e (patch) | |
tree | 508978bbd0a503672c38634bee4f75e4260514ad | |
parent | 4ef309b940c79b14be3703b08e8f4dd73e2d1de1 (diff) |
openpgp: Avoid creating unused borrows.
-rw-r--r-- | openpgp/src/crypto/aead.rs | 4 | ||||
-rw-r--r-- | openpgp/src/crypto/backend/cng/asymmetric.rs | 16 | ||||
-rw-r--r-- | openpgp/src/crypto/backend/cng/ecdh.rs | 2 | ||||
-rw-r--r-- | openpgp/src/crypto/backend/cng/hash.rs | 2 | ||||
-rw-r--r-- | openpgp/src/crypto/backend/cng/symmetric.rs | 4 | ||||
-rw-r--r-- | openpgp/src/crypto/backend/sha1cd.rs | 2 | ||||
-rw-r--r-- | openpgp/src/crypto/ecdh.rs | 8 | ||||
-rw-r--r-- | openpgp/src/crypto/symmetric.rs | 4 | ||||
-rw-r--r-- | openpgp/src/parse/stream.rs | 2 |
9 files changed, 22 insertions, 22 deletions
diff --git a/openpgp/src/crypto/aead.rs b/openpgp/src/crypto/aead.rs index 8ca021cb..36a2baa8 100644 --- a/openpgp/src/crypto/aead.rs +++ b/openpgp/src/crypto/aead.rs @@ -244,7 +244,7 @@ impl<'a> Decryptor<'a> { // 1. Copy any buffered data. if !self.buffer.is_empty() { let to_copy = cmp::min(self.buffer.len(), plaintext.len()); - &plaintext[..to_copy].copy_from_slice(&self.buffer[..to_copy]); + plaintext[..to_copy].copy_from_slice(&self.buffer[..to_copy]); crate::vec_drain_prefix(&mut self.buffer, to_copy); pos = to_copy; @@ -361,7 +361,7 @@ impl<'a> Decryptor<'a> { assert!(0 < to_copy); assert!(to_copy < self.chunk_size); - &plaintext[pos..pos + to_copy] + plaintext[pos..pos + to_copy] .copy_from_slice(&self.buffer[..to_copy]); crate::vec_drain_prefix(&mut self.buffer, to_copy); pos += to_copy; diff --git a/openpgp/src/crypto/backend/cng/asymmetric.rs b/openpgp/src/crypto/backend/cng/asymmetric.rs index 8f54fa54..9455afe4 100644 --- a/openpgp/src/crypto/backend/cng/asymmetric.rs +++ b/openpgp/src/crypto/backend/cng/asymmetric.rs @@ -192,7 +192,7 @@ impl Signer for KeyPair { Version::V1 => { let mut group = [0; 20]; assert!(q.value().len() >= 20); - &mut group[..q.value().len()].copy_from_slice(q.value()); + group[..q.value().len()].copy_from_slice(q.value()); DsaPrivateBlob::V1(Blob::<DsaKeyPrivateBlob>::clone_from_parts( &winapi::shared::bcrypt::BCRYPT_DSA_KEY_BLOB { @@ -337,7 +337,7 @@ impl Decryptor for KeyPair { let missing = (8 - (c.value().len() % 8)) % 8; let c = if missing > 0 { _c = Protected::from(vec![0u8; missing + c.value().len()]); - &mut _c[missing..].copy_from_slice(c.value()); + _c[missing..].copy_from_slice(c.value()); &_c } else { c.value() @@ -499,7 +499,7 @@ impl<P: key::KeyParts, R: key::KeyRole> Key<P, R> { Version::V1 => { let mut group = [0; 20]; assert!(q.value().len() >= 20); - &mut group[..q.value().len()].copy_from_slice(q.value()); + group[..q.value().len()].copy_from_slice(q.value()); DsaPublicBlob::V1(Blob::<DsaKeyPublicBlob>::clone_from_parts( &winapi::shared::bcrypt::BCRYPT_DSA_KEY_BLOB { @@ -658,7 +658,7 @@ impl<P: key::KeyParts, R: key::KeyRole> Key<P, R> { ].concat(); assert_eq!(signature.len(), SIGNATURE_LENGTH); let mut sig_bytes = [0u8; 64]; - &mut sig_bytes[..].copy_from_slice(&*signature); + sig_bytes[..].copy_from_slice(&*signature); let signature = Signature::from(sig_bytes); @@ -720,7 +720,7 @@ where // https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-07#section-13.2. let mut public = [0u8; 1 + CURVE25519_SIZE]; public[0] = 0x40; - &mut public[1..].copy_from_slice(blob.x()); + public[1..].copy_from_slice(blob.x()); // Reverse the scalar. See // https://lists.gnupg.org/pipermail/gnupg-devel/2018-February/033437.html. @@ -759,7 +759,7 @@ where // https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-07#section-13.2. let mut public = [0u8; 1 + CURVE25519_SIZE]; public[0] = 0x40; - &mut public[1..].copy_from_slice(Into::<PublicKey>::into(&private).as_bytes()); + public[1..].copy_from_slice(Into::<PublicKey>::into(&private).as_bytes()); Self::with_secret( ctime.into().unwrap_or_else(SystemTime::now), @@ -920,7 +920,7 @@ where // https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-07#section-13.2. let mut public = [0u8; 1 + CURVE25519_SIZE]; public[0] = 0x40; - &mut public[1..].copy_from_slice(blob.x()); + public[1..].copy_from_slice(blob.x()); // Reverse the scalar. See // https://lists.gnupg.org/pipermail/gnupg-devel/2018-February/033437.html. @@ -951,7 +951,7 @@ where // https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-07#section-13.2. let mut compressed_public = [0u8; 1 + CURVE25519_SIZE]; compressed_public[0] = 0x40; - &mut compressed_public[1..].copy_from_slice(public.as_bytes()); + compressed_public[1..].copy_from_slice(public.as_bytes()); ( EdDSA, diff --git a/openpgp/src/crypto/backend/cng/ecdh.rs b/openpgp/src/crypto/backend/cng/ecdh.rs index c115ca88..01eab78f 100644 --- a/openpgp/src/crypto/backend/cng/ecdh.rs +++ b/openpgp/src/crypto/backend/cng/ecdh.rs @@ -49,7 +49,7 @@ where let blob = ephemeral.export().unwrap(); let mut VB = [0; 33]; VB[0] = 0x40; - &mut VB[1..].copy_from_slice(blob.x()); + VB[1..].copy_from_slice(blob.x()); let VB = MPI::new(&VB); // Compute the shared point S = vR; diff --git a/openpgp/src/crypto/backend/cng/hash.rs b/openpgp/src/crypto/backend/cng/hash.rs index ae655ef6..6254d12d 100644 --- a/openpgp/src/crypto/backend/cng/hash.rs +++ b/openpgp/src/crypto/backend/cng/hash.rs @@ -57,7 +57,7 @@ impl Digest for Hash { .expect("CNG to not fail internally"); let l = buffer.len().min(digest.len()); - &mut digest[..l].copy_from_slice(&buffer.as_slice()[..l]); + digest[..l].copy_from_slice(&buffer.as_slice()[..l]); Ok(()) } } diff --git a/openpgp/src/crypto/backend/cng/symmetric.rs b/openpgp/src/crypto/backend/cng/symmetric.rs index 27694f52..28af8af1 100644 --- a/openpgp/src/crypto/backend/cng/symmetric.rs +++ b/openpgp/src/crypto/backend/cng/symmetric.rs @@ -42,7 +42,7 @@ impl Mode for KeyWrapper { let missing = (block_size - (src.len() % block_size)) % block_size; let src = if missing != 0 { _src = vec![0u8; src.len() + missing]; - &mut _src[..src.len()].copy_from_slice(src); + _src[..src.len()].copy_from_slice(src); &_src } else { src @@ -68,7 +68,7 @@ impl Mode for KeyWrapper { let missing = (block_size - (src.len() % block_size)) % block_size; let src = if missing != 0 { _src = vec![0u8; src.len() + missing]; - &mut _src[..src.len()].copy_from_slice(src); + _src[..src.len()].copy_from_slice(src); &_src } else { src diff --git a/openpgp/src/crypto/backend/sha1cd.rs b/openpgp/src/crypto/backend/sha1cd.rs index dc511728..3645da81 100644 --- a/openpgp/src/crypto/backend/sha1cd.rs +++ b/openpgp/src/crypto/backend/sha1cd.rs @@ -27,7 +27,7 @@ impl Digest for sha1collisiondetection::Sha1CD { let r = self.finalize_into_dirty_cd(&mut d); self.reset(); let l = digest.len().min(d.len()); - &mut digest[..l].copy_from_slice(&d[..l]); + digest[..l].copy_from_slice(&d[..l]); r.map_err(Into::into) } } diff --git a/openpgp/src/crypto/ecdh.rs b/openpgp/src/crypto/ecdh.rs index df88c946..c49807f5 100644 --- a/openpgp/src/crypto/ecdh.rs +++ b/openpgp/src/crypto/ecdh.rs @@ -242,7 +242,7 @@ fn aes_key_wrap(algo: SymmetricAlgorithm, key: &Protected, for i in 0..n { // B = AES(K, A | R[i]) write_be_u64(&mut tmp[..8], a); - &mut tmp[8..].copy_from_slice(&r[8 * i..8 * (i + 1)]); + tmp[8..].copy_from_slice(&r[8 * i..8 * (i + 1)]); cipher.encrypt(&mut b, &tmp)?; // A = MSB(64, B) ^ t where t = (n*j)+i @@ -251,7 +251,7 @@ fn aes_key_wrap(algo: SymmetricAlgorithm, key: &Protected, // n, hence the index shift. // R[i] = LSB(64, B) - &mut r[8 * i..8 * (i + 1)].copy_from_slice(&b[8..]); + r[8 * i..8 * (i + 1)].copy_from_slice(&b[8..]); } } } @@ -317,7 +317,7 @@ fn aes_key_unwrap(algo: SymmetricAlgorithm, key: &Protected, for i in (0..=n-1).rev() { // B = AES-1(K, (A ^ t) | R[i]) where t = n*j+i write_be_u64(&mut tmp[..8], a ^ ((n * j) + i + 1) as u64); - &mut tmp[8..].copy_from_slice(&r[8 * i..8 * (i + 1)]); + tmp[8..].copy_from_slice(&r[8 * i..8 * (i + 1)]); // (Note that our i runs from n-1 to 0 instead of n to // 1, hence the index shift. cipher.decrypt(&mut b, &tmp)?; @@ -326,7 +326,7 @@ fn aes_key_unwrap(algo: SymmetricAlgorithm, key: &Protected, a = read_be_u64(&b[..8]); // R[i] = LSB(64, B) - &mut r[8 * i..8 * (i + 1)].copy_from_slice(&b[8..]); + r[8 * i..8 * (i + 1)].copy_from_slice(&b[8..]); } } } diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs index 45e9cbd9..64fe368c 100644 --- a/openpgp/src/crypto/symmetric.rs +++ b/openpgp/src/crypto/symmetric.rs @@ -109,7 +109,7 @@ impl<R: io::Read> io::Read for Decryptor<R> { // 1. Copy any buffered data. if !self.buffer.is_empty() { let to_copy = cmp::min(self.buffer.len(), plaintext.len()); - &plaintext[..to_copy].copy_from_slice(&self.buffer[..to_copy]); + plaintext[..to_copy].copy_from_slice(&self.buffer[..to_copy]); crate::vec_drain_prefix(&mut self.buffer, to_copy); pos = to_copy; } @@ -177,7 +177,7 @@ impl<R: io::Read> io::Read for Decryptor<R> { .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, format!("{}", e)))?; - &plaintext[pos..pos + to_copy].copy_from_slice(&self.buffer[..to_copy]); + plaintext[pos..pos + to_copy].copy_from_slice(&self.buffer[..to_copy]); crate::vec_drain_prefix(&mut self.buffer, to_copy); pos += to_copy; diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs index a554e8c3..1827287a 100644 --- a/openpgp/src/parse/stream.rs +++ b/openpgp/src/parse/stream.rs @@ -2828,7 +2828,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> { assert!(self.oppr.is_none()); assert!(self.cursor <= reserve.len()); let n = cmp::min(buf.len(), reserve.len() - self.cursor); - &mut buf[..n] + buf[..n] .copy_from_slice(&reserve[self.cursor..n + self.cursor]); self.cursor += n; return Ok(n); |