Fix various clippy lints
This commit is contained in:
+1
-1
@@ -106,7 +106,7 @@ impl RecipientLine {
|
|||||||
let epk = esk.public_key();
|
let epk = esk.public_key();
|
||||||
let epk_bytes = EphemeralKeyBytes::from_public_key(&epk);
|
let epk_bytes = EphemeralKeyBytes::from_public_key(&epk);
|
||||||
|
|
||||||
let shared_secret = esk.diffie_hellman(&pk.public_key());
|
let shared_secret = esk.diffie_hellman(pk.public_key());
|
||||||
|
|
||||||
let mut salt = vec![];
|
let mut salt = vec![];
|
||||||
salt.extend_from_slice(epk_bytes.as_bytes());
|
salt.extend_from_slice(epk_bytes.as_bytes());
|
||||||
|
|||||||
+1
-1
@@ -48,7 +48,7 @@ impl Recipient {
|
|||||||
/// This accepts both compressed (as used by the plugin) and uncompressed (as used in
|
/// This accepts both compressed (as used by the plugin) and uncompressed (as used in
|
||||||
/// the YubiKey certificate) encodings.
|
/// the YubiKey certificate) encodings.
|
||||||
pub(crate) fn from_encoded(encoded: &p256::EncodedPoint) -> Option<Self> {
|
pub(crate) fn from_encoded(encoded: &p256::EncodedPoint) -> Option<Self> {
|
||||||
p256::PublicKey::from_encoded_point(&encoded).map(Recipient)
|
p256::PublicKey::from_encoded_point(encoded).map(Recipient)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns the compressed SEC-1 encoding of this recipient.
|
/// Returns the compressed SEC-1 encoding of this recipient.
|
||||||
|
|||||||
+6
-6
@@ -23,7 +23,7 @@ impl RecipientPluginV1 for RecipientPlugin {
|
|||||||
bytes: &[u8],
|
bytes: &[u8],
|
||||||
) -> Result<(), recipient::Error> {
|
) -> Result<(), recipient::Error> {
|
||||||
if let Some(pk) = if plugin_name == PLUGIN_NAME {
|
if let Some(pk) = if plugin_name == PLUGIN_NAME {
|
||||||
Recipient::from_bytes(&bytes)
|
Recipient::from_bytes(bytes)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
} {
|
} {
|
||||||
@@ -44,7 +44,7 @@ impl RecipientPluginV1 for RecipientPlugin {
|
|||||||
bytes: &[u8],
|
bytes: &[u8],
|
||||||
) -> Result<(), recipient::Error> {
|
) -> Result<(), recipient::Error> {
|
||||||
if let Some(stub) = if plugin_name == PLUGIN_NAME {
|
if let Some(stub) = if plugin_name == PLUGIN_NAME {
|
||||||
yubikey::Stub::from_bytes(&bytes, index)
|
yubikey::Stub::from_bytes(bytes, index)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
} {
|
} {
|
||||||
@@ -88,7 +88,7 @@ impl RecipientPluginV1 for RecipientPlugin {
|
|||||||
self.recipients
|
self.recipients
|
||||||
.iter()
|
.iter()
|
||||||
.chain(yk_recipients.iter())
|
.chain(yk_recipients.iter())
|
||||||
.map(|pk| format::RecipientLine::wrap_file_key(&file_key, &pk).into())
|
.map(|pk| format::RecipientLine::wrap_file_key(&file_key, pk).into())
|
||||||
.collect()
|
.collect()
|
||||||
})
|
})
|
||||||
.collect())
|
.collect())
|
||||||
@@ -111,7 +111,7 @@ impl IdentityPluginV1 for IdentityPlugin {
|
|||||||
bytes: &[u8],
|
bytes: &[u8],
|
||||||
) -> Result<(), identity::Error> {
|
) -> Result<(), identity::Error> {
|
||||||
if let Some(stub) = if plugin_name == PLUGIN_NAME {
|
if let Some(stub) = if plugin_name == PLUGIN_NAME {
|
||||||
yubikey::Stub::from_bytes(&bytes, index)
|
yubikey::Stub::from_bytes(bytes, index)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
} {
|
} {
|
||||||
@@ -145,7 +145,7 @@ impl IdentityPluginV1 for IdentityPlugin {
|
|||||||
for (file, stanzas) in files.iter().enumerate() {
|
for (file, stanzas) in files.iter().enumerate() {
|
||||||
for (stanza_index, stanza) in stanzas.iter().enumerate() {
|
for (stanza_index, stanza) in stanzas.iter().enumerate() {
|
||||||
match (
|
match (
|
||||||
format::RecipientLine::from_stanza(&stanza).map(|res| {
|
format::RecipientLine::from_stanza(stanza).map(|res| {
|
||||||
res.map_err(|_| identity::Error::Stanza {
|
res.map_err(|_| identity::Error::Stanza {
|
||||||
file_index: file,
|
file_index: file,
|
||||||
stanza_index,
|
stanza_index,
|
||||||
@@ -225,7 +225,7 @@ impl IdentityPluginV1 for IdentityPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (stanza_index, line) in stanzas.iter().enumerate() {
|
for (stanza_index, line) in stanzas.iter().enumerate() {
|
||||||
match conn.unwrap_file_key(&line) {
|
match conn.unwrap_file_key(line) {
|
||||||
Ok(file_key) => {
|
Ok(file_key) => {
|
||||||
// We've managed to decrypt this file!
|
// We've managed to decrypt this file!
|
||||||
file_keys.entry(file_index).or_insert(Ok(file_key));
|
file_keys.entry(file_index).or_insert(Ok(file_key));
|
||||||
|
|||||||
+1
-1
@@ -138,7 +138,7 @@ impl Metadata {
|
|||||||
extract_name(cert, all)
|
extract_name(cert, all)
|
||||||
.map(|(name, ours)| {
|
.map(|(name, ours)| {
|
||||||
if ours {
|
if ours {
|
||||||
let (pin_policy, touch_policy) = policies(&cert);
|
let (pin_policy, touch_policy) = policies(cert);
|
||||||
(name, pin_policy, touch_policy)
|
(name, pin_policy, touch_policy)
|
||||||
} else {
|
} else {
|
||||||
// We can extract the PIN and touch policies via an attestation. This
|
// We can extract the PIN and touch policies via an attestation. This
|
||||||
|
|||||||
+2
-3
@@ -358,9 +358,8 @@ impl Connection {
|
|||||||
None => {
|
None => {
|
||||||
return Ok(Err(identity::Error::Identity {
|
return Ok(Err(identity::Error::Identity {
|
||||||
index: self.identity_index,
|
index: self.identity_index,
|
||||||
message: format!(
|
message: "Certificate for YubiKey identity contains an invalid PIN policy"
|
||||||
"Certificate for YubiKey identity contains an invalid PIN policy"
|
.to_string(),
|
||||||
),
|
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user