Version bump and autoformatting

Author: jmlepisto

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "clatter"
-version = "2.1.0-rc.2"
+version = "2.1.0"
 edition = "2021"
 rust-version = "1.81.0"
 license = "MIT"

Cargo.toml

@@ -6,7 +6,7 @@ use clatter::crypto::dh::X25519;
 use clatter::crypto::hash::{Blake2b, Blake2s, Sha256, Sha512};
 use clatter::crypto::kem::pqclean_ml_kem::MlKem1024;
 use clatter::crypto::kem::rust_crypto_ml_kem::MlKem512;
-use clatter::traits::{Cipher, Dh, Hash, Handshaker, Kem};
+use clatter::traits::{Cipher, Dh, Handshaker, Hash, Kem};
 use clatter_fuzz::{hybrid_handshake_patterns, setup_hybrid_handshake};
 use libfuzzer_sys::fuzz_target;
 
@@ -33,4 +33,3 @@ fn verify_with<DH: Dh, EKEM: Kem, SKEM: Kem, C: Cipher, H: Hash>(data: &[u8]) {
         let _ = alice.write_message(data, &mut alice_buf);
     }
 }
-

fuzz/fuzz_targets/hybrid_handshake_payload.rs

@@ -6,7 +6,7 @@ use clatter::crypto::dh::X25519;
 use clatter::crypto::hash::{Blake2b, Blake2s, Sha256, Sha512};
 use clatter::crypto::kem::pqclean_ml_kem::MlKem1024;
 use clatter::crypto::kem::rust_crypto_ml_kem::MlKem512;
-use clatter::traits::{Cipher, Dh, Hash, Handshaker, Kem};
+use clatter::traits::{Cipher, Dh, Handshaker, Hash, Kem};
 use clatter_fuzz::{hybrid_handshake_patterns, setup_hybrid_handshake};
 use libfuzzer_sys::fuzz_target;
 
@@ -38,4 +38,3 @@ fn verify_with<DH: Dh, EKEM: Kem, SKEM: Kem, C: Cipher, H: Hash>(data: &[u8]) {
         let _ = bob.read_message(data, &mut bob_buf);
     }
 }
-

fuzz/fuzz_targets/hybrid_handshake_read.rs

@@ -48,4 +48,3 @@ fn verify_with<DH: Dh, EKEM: Kem, SKEM: Kem, C: Cipher, H: Hash>(data: &[u8]) {
         }
     }
 }
-

fuzz/fuzz_targets/hybrid_transport.rs

@@ -4,7 +4,7 @@ use clatter::constants::MAX_MESSAGE_LEN;
 use clatter::crypto::cipher::{AesGcm, ChaChaPoly};
 use clatter::crypto::dh::X25519;
 use clatter::crypto::hash::{Blake2b, Blake2s, Sha256, Sha512};
-use clatter::traits::{Cipher, Dh, Hash, Handshaker};
+use clatter::traits::{Cipher, Dh, Handshaker, Hash};
 use clatter_fuzz::{nq_handshake_patterns, setup_nq_handshake};
 use libfuzzer_sys::fuzz_target;
 

fuzz/fuzz_targets/nq_handshake_payload.rs

@@ -4,7 +4,7 @@ use clatter::constants::MAX_MESSAGE_LEN;
 use clatter::crypto::cipher::{AesGcm, ChaChaPoly};
 use clatter::crypto::dh::X25519;
 use clatter::crypto::hash::{Blake2b, Blake2s, Sha256, Sha512};
-use clatter::traits::{Cipher, Dh, Hash, Handshaker};
+use clatter::traits::{Cipher, Dh, Handshaker, Hash};
 use clatter_fuzz::{nq_handshake_patterns, setup_nq_handshake};
 use libfuzzer_sys::fuzz_target;
 

fuzz/fuzz_targets/nq_handshake_read.rs

@@ -5,7 +5,7 @@ use clatter::crypto::cipher::{AesGcm, ChaChaPoly};
 use clatter::crypto::hash::{Blake2b, Blake2s, Sha256, Sha512};
 use clatter::crypto::kem::pqclean_ml_kem::MlKem1024;
 use clatter::crypto::kem::rust_crypto_ml_kem::MlKem512;
-use clatter::traits::{Cipher, Hash, Handshaker, Kem};
+use clatter::traits::{Cipher, Handshaker, Hash, Kem};
 use clatter_fuzz::{pq_handshake_patterns, setup_pq_handshake};
 use libfuzzer_sys::fuzz_target;
 

fuzz/fuzz_targets/pq_handshake_payload.rs

@@ -5,7 +5,7 @@ use clatter::crypto::cipher::{AesGcm, ChaChaPoly};
 use clatter::crypto::hash::{Blake2b, Blake2s, Sha256, Sha512};
 use clatter::crypto::kem::pqclean_ml_kem::MlKem1024;
 use clatter::crypto::kem::rust_crypto_ml_kem::MlKem512;
-use clatter::traits::{Cipher, Hash, Handshaker, Kem};
+use clatter::traits::{Cipher, Handshaker, Hash, Kem};
 use clatter_fuzz::{pq_handshake_patterns, setup_pq_handshake};
 use libfuzzer_sys::fuzz_target;
 

fuzz/fuzz_targets/pq_handshake_read.rs

@@ -2,7 +2,7 @@
 
 use clatter::constants::MAX_MESSAGE_LEN;
 use clatter::handshakepattern::*;
-use clatter::traits::{Cipher, Dh, Hash, Handshaker, Kem};
+use clatter::traits::{Cipher, Dh, Handshaker, Hash, Kem};
 use clatter::transportstate::TransportState;
 use clatter::{HybridHandshake, HybridHandshakeParams, NqHandshake, PqHandshake};
 
@@ -198,7 +198,10 @@ pub fn setup_pq_handshake<EKEM: Kem, SKEM: Kem, C: Cipher, H: Hash>(
 /// Setup hybrid handshake pair
 pub fn setup_hybrid_handshake<DH: Dh, EKEM: Kem, SKEM: Kem, C: Cipher, H: Hash>(
     pattern: &HandshakePattern,
-) -> (HybridHandshake<DH, EKEM, SKEM, C, H>, HybridHandshake<DH, EKEM, SKEM, C, H>) {
+) -> (
+    HybridHandshake<DH, EKEM, SKEM, C, H>,
+    HybridHandshake<DH, EKEM, SKEM, C, H>,
+) {
     let alice_dh_keys = DH::genkey().unwrap();
     let alice_dh_pub = alice_dh_keys.public.clone();
     let bob_dh_keys = DH::genkey().unwrap();
@@ -262,5 +265,3 @@ pub fn complete_handshake<A: Handshaker<C, H>, B: Handshaker<C, H>, C: Cipher, H
 
     (alice_transport, bob_transport)
 }
-
-