Skip to content

Commit

Permalink
Fix clippy warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
mulmarta committed May 7, 2024
1 parent 50d150e commit 48df801
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 67 deletions.
7 changes: 0 additions & 7 deletions mls-rs-codec/tests/macro_usage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ struct TestType {
field_h: TestFieldStruct,
}

#[derive(Debug, Clone, PartialEq, Eq, MlsSize, MlsEncode)]
struct BorrowedTestType<'a> {
field_a: u8,
field_b: Option<&'a [u8]>,
field_c: &'a [u16],
}

#[repr(u16)]
#[derive(Debug, Clone, PartialEq, Eq, MlsSize, MlsEncode, MlsDecode)]
enum TestEnum {
Expand Down
44 changes: 3 additions & 41 deletions mls-rs-crypto-openssl/src/x509.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ use openssl::{
hash::MessageDigest,
nid::Nid,
pkey::{PKey, PKeyRef, Private, Public},
stack::{Stack, StackRef},
stack::Stack,
x509::{
extension::{BasicConstraints, KeyUsage, SubjectAlternativeName},
store::{X509Store, X509StoreBuilder},
verify::{X509VerifyFlags, X509VerifyParam},
X509Builder, X509Extension, X509Name, X509NameBuilder, X509NameRef, X509Ref,
X509ReqBuilder, X509StoreContext, X509VerifyResult, X509v3Context, X509,
X509Builder, X509Extension, X509Name, X509NameBuilder, X509ReqBuilder, X509StoreContext,
X509VerifyResult, X509v3Context, X509,
},
};
use thiserror::Error;
Expand Down Expand Up @@ -372,10 +372,6 @@ fn build_subject_alt_name(
}

trait X509BuilderCommon {
fn set_pubkey(&mut self, pub_key: &PKeyRef<Public>) -> Result<(), ErrorStack>;
fn set_subject_name(&mut self, name: &X509NameRef) -> Result<(), ErrorStack>;
fn add_extensions(&mut self, extensions: &StackRef<X509Extension>) -> Result<(), ErrorStack>;
fn x509v3_context<'a>(&'a self, issuer: Option<&'a X509Ref>) -> X509v3Context<'a>;
fn sign(&mut self, key: &PKeyRef<Private>, digest: MessageDigest) -> Result<(), ErrorStack>;

fn sign_with_ec_signer(
Expand All @@ -395,46 +391,12 @@ trait X509BuilderCommon {
}

impl X509BuilderCommon for X509ReqBuilder {
fn set_pubkey(&mut self, pub_key: &PKeyRef<Public>) -> Result<(), ErrorStack> {
self.set_pubkey(pub_key)
}

fn set_subject_name(&mut self, name: &X509NameRef) -> Result<(), ErrorStack> {
self.set_subject_name(name)
}

fn add_extensions(&mut self, extensions: &StackRef<X509Extension>) -> Result<(), ErrorStack> {
self.add_extensions(extensions)
}

fn x509v3_context<'a>(&'a self, _issuer: Option<&X509Ref>) -> X509v3Context<'a> {
self.x509v3_context(None)
}

fn sign(&mut self, key: &PKeyRef<Private>, digest: MessageDigest) -> Result<(), ErrorStack> {
self.sign(key, digest)
}
}

impl X509BuilderCommon for X509Builder {
fn set_pubkey(&mut self, pub_key: &PKeyRef<Public>) -> Result<(), ErrorStack> {
self.set_pubkey(pub_key)
}

fn set_subject_name(&mut self, name: &X509NameRef) -> Result<(), ErrorStack> {
self.set_subject_name(name)
}

fn add_extensions(&mut self, extensions: &StackRef<X509Extension>) -> Result<(), ErrorStack> {
extensions
.into_iter()
.try_for_each(|ex| self.append_extension2(ex))
}

fn x509v3_context<'a>(&'a self, issuer: Option<&'a X509Ref>) -> X509v3Context<'a> {
self.x509v3_context(issuer, None)
}

fn sign(&mut self, key: &PKeyRef<Private>, digest: MessageDigest) -> Result<(), ErrorStack> {
self.sign(key, digest)
}
Expand Down
5 changes: 0 additions & 5 deletions mls-rs/src/external_client/group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -569,11 +569,6 @@ where
type OutputType = ExternalReceivedMessage;
type CipherSuiteProvider = <C::CryptoProvider as CryptoProvider>::CipherSuiteProvider;

#[cfg(feature = "private_message")]
fn self_index(&self) -> Option<LeafIndex> {
None
}

fn mls_rules(&self) -> Self::MlsRules {
self.config.mls_rules()
}
Expand Down
2 changes: 0 additions & 2 deletions mls-rs/src/group/message_processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -861,8 +861,6 @@ pub(crate) trait MessageProcessor: Send + Sync {

fn group_state(&self) -> &GroupState;
fn group_state_mut(&mut self) -> &mut GroupState;
#[cfg(feature = "private_message")]
fn self_index(&self) -> Option<LeafIndex>;
fn mls_rules(&self) -> Self::MlsRules;
fn identity_provider(&self) -> Self::IdentityProvider;
fn cipher_suite_provider(&self) -> &Self::CipherSuiteProvider;
Expand Down
5 changes: 0 additions & 5 deletions mls-rs/src/group/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1604,11 +1604,6 @@ where
type OutputType = ReceivedMessage;
type CipherSuiteProvider = <C::CryptoProvider as CryptoProvider>::CipherSuiteProvider;

#[cfg(feature = "private_message")]
fn self_index(&self) -> Option<LeafIndex> {
Some(self.private_tree.self_index)
}

#[cfg(feature = "private_message")]
async fn process_ciphertext(
&mut self,
Expand Down
6 changes: 0 additions & 6 deletions mls-rs/src/group/test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,4 @@ impl MessageProcessor for GroupWithoutKeySchedule {
self.secrets = secrets;
Ok(())
}

#[cfg(feature = "private_message")]
#[cfg_attr(coverage_nightly, coverage(off))]
fn self_index(&self) -> Option<LeafIndex> {
<Group<TestClientConfig> as MessageProcessor>::self_index(&self.inner)
}
}
1 change: 1 addition & 0 deletions mls-rs/src/psk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ pub(crate) enum ResumptionPSKUsage {
Branch = 3u8,
}

#[cfg(feature = "psk")]
#[derive(Clone, Debug, PartialEq, MlsSize, MlsEncode)]
struct PSKLabel<'a> {
id: &'a PreSharedKeyID,
Expand Down
7 changes: 6 additions & 1 deletion mls-rs/src/tree_kem/tree_hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,12 @@ impl TreeKemPublic {
};

let p = ps.parent;
filtered_sets[n] = filtered_sets[p as usize].clone();

// Clippy's suggestion `filtered_sets[n].clone_from(&filtered_sets[p as usize])` is wrong and does not compile
#[allow(clippy::assigning_clones)]
{
filtered_sets[n] = filtered_sets[p as usize].clone();
}

if self.different_unmerged(*filtered_sets[p as usize].last().unwrap(), p)? {
filtered_sets[n].push(p);
Expand Down

0 comments on commit 48df801

Please sign in to comment.