formatting

jmwample · Dec 7, 2023 · 978150f · 978150f
1 parent 56846e7
commit 978150f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 40 deletions.
diff --git a/src/o5/mod.rs b/src/o5/mod.rs
@@ -1,37 +1,36 @@
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use pqc_kyber::*;
+    use x25519_dalek::{EphemeralSecret, PublicKey};
 
-#[derive(Debug)]
-enum Error {
-    PQCError(pqc_kyber::KyberError),
-    Other(Box<dyn std::error::Error>),
-}
+    type Result<T> = std::result::Result<T, Error>;
 
-impl From<pqc_kyber::KyberError> for Error {
-    fn from(e: pqc_kyber::KyberError) -> Self {
-        return Error::PQCError(e);
+    #[derive(Debug)]
+    enum Error {
+        PQCError(pqc_kyber::KyberError),
+        Other(Box<dyn std::error::Error>),
     }
-}
-
-// impl From<&dyn std::error::Error> for Error {
-//     fn from(e: &dyn std::error::Error) -> Self {
-//         Error::Other(Box::new(e))
-//     }
-// }
-
-struct Kyber1024XKeypair {}
 
-impl Kyber1024XKeypair {
-    fn new() -> Result<Self> {
-        todo!()
+    impl From<pqc_kyber::KyberError> for Error {
+        fn from(e: pqc_kyber::KyberError) -> Self {
+            return Error::PQCError(e);
+        }
     }
-}
 
-type Result<T> = std::result::Result<T, Error>;
+    // impl From<&dyn std::error::Error> for Error {
+    //     fn from(e: &dyn std::error::Error) -> Self {
+    //         Error::Other(Box::new(e))
+    //     }
+    // }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use pqc_kyber::*;
-    use x25519_dalek::{EphemeralSecret, PublicKey};
+    struct Kyber1024XKeypair {}
+
+    impl Kyber1024XKeypair {
+        fn new() -> Result<Self> {
+            todo!()
+        }
+    }
 
     #[test]
     fn it_works() -> Result<()> {

diff --git a/src/obfs4/packet.rs b/src/obfs4/packet.rs
@@ -47,7 +47,9 @@ pub fn build(
     data: Option<impl AsRef<[u8]>>,
     pad_len: usize,
 ) -> impl Packet {
-    return PrngSeedMessage {len_seed: [0_u8; drbg::SEED_LENGTH]};
+    return PrngSeedMessage {
+        len_seed: [0_u8; drbg::SEED_LENGTH],
+    };
 }
 
 pub trait Packet {
@@ -87,8 +89,7 @@ impl ClientHandshakeMessage {
         return drbg::Seed::new();
     }
 
-
-    pub fn get_mark(&self) -> Result<[u8;MARK_LENGTH]> {
+    pub fn get_mark(&self) -> Result<[u8; MARK_LENGTH]> {
         todo!()
     }
 
@@ -177,7 +178,6 @@ impl ServerHandshakeMessage {
         // TODO: Actual derive from messsage
         return drbg::Seed::new();
     }
-
 }
 
 impl Packet for ServerHandshakeMessage {
@@ -292,9 +292,6 @@ pub fn find_mac_mark(
     max_pos: usize,
     from_tait: bool,
 ) -> Option<usize> {
-
-
-
     None
 }
 

diff --git a/src/obfs4/proto/client.rs b/src/obfs4/proto/client.rs
@@ -3,7 +3,7 @@
 use crate::{
     common::{elligator2::Representative, ntor},
     obfs4::{
-        framing::{Obfs4Codec, KEY_LENGTH, KEY_MATERIAL_LENGTH, FrameError},
+        framing::{FrameError, Obfs4Codec, KEY_LENGTH, KEY_MATERIAL_LENGTH},
         packet::{self, Packet, ServerHandshakeMessage},
     },
     stream::Stream,

diff --git a/src/obfs4/proto/server.rs b/src/obfs4/proto/server.rs
@@ -1,11 +1,7 @@
 #![allow(unused)]
 
 use crate::{
-    common::{
-        drbg, ntor,
-        replay_filter::ReplayFilter,
-        elligator2::Representative,
-    },
+    common::{drbg, elligator2::Representative, ntor, replay_filter::ReplayFilter},
     obfs4::{
         framing::{FrameError, Obfs4Codec, KEY_MATERIAL_LENGTH},
         packet::ClientHandshakeMessage,