Formatierung

Tristan-H11 · Feb 14, 2024 · 874d64a · 874d64a
1 parent 61d03cd
commit 874d64a
Show file tree

Hide file tree

Showing 25 changed files with 88 additions and 42 deletions.
diff --git a/src/api/endpoints/math/exponentiation.rs b/src/api/endpoints/math/exponentiation.rs
@@ -8,8 +8,12 @@ use serde::Deserialize;
 
 use crate::api::basic::call_checked_with_parsed_big_ints;
 use crate::api::serializable_models::{SingleStringResponse, UseFastQuery};
-use crate::math_core::number_theory::number_theory_service::{NumberTheoryService, NumberTheoryServiceTrait};
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
+use crate::math_core::number_theory::number_theory_service::{
+    NumberTheoryService, NumberTheoryServiceTrait,
+};
 
 #[derive(Deserialize)]
 pub struct ExponentiationRequest {

diff --git a/src/api/endpoints/math/extended_euclid.rs b/src/api/endpoints/math/extended_euclid.rs
@@ -9,8 +9,12 @@ use serde::{Deserialize, Serialize};
 use crate::api::basic::call_checked_with_parsed_big_ints;
 use crate::api::serializable_models::UseFastQuery;
 use crate::math_core::number_theory::extended_euclid_result::ExtendedEuclidResult;
-use crate::math_core::number_theory::number_theory_service::{NumberTheoryService, NumberTheoryServiceTrait};
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
+use crate::math_core::number_theory::number_theory_service::{
+    NumberTheoryService, NumberTheoryServiceTrait,
+};
 
 #[derive(Deserialize)]
 pub struct ExtendedEuclidRequest {

diff --git a/src/api/endpoints/math/modular_inverse.rs b/src/api/endpoints/math/modular_inverse.rs
@@ -8,8 +8,12 @@ use serde::Deserialize;
 
 use crate::api::basic::call_checked_with_parsed_big_ints;
 use crate::api::serializable_models::{SingleStringResponse, UseFastQuery};
-use crate::math_core::number_theory::number_theory_service::{NumberTheoryService, NumberTheoryServiceTrait};
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
+use crate::math_core::number_theory::number_theory_service::{
+    NumberTheoryService, NumberTheoryServiceTrait,
+};
 
 #[derive(Deserialize)]
 pub struct ModulInverseRequest {

diff --git a/src/api/endpoints/math/shanks.rs b/src/api/endpoints/math/shanks.rs
@@ -10,7 +10,9 @@ use crate::api::basic::call_checked_with_parsed_big_ints;
 use crate::api::serializable_models::{SingleStringResponse, UseFastQuery};
 use crate::math_core::babystep_giantstep::Shanks;
 use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
 
 #[derive(Deserialize)]
 pub struct ShanksRequest {

diff --git a/src/api/endpoints/rsa/create_key_pair.rs b/src/api/endpoints/rsa/create_key_pair.rs
@@ -4,10 +4,12 @@ use log::info;
 use serde::Deserialize;
 
 use crate::api::serializable_models::{KeyPair, SingleStringResponse, UseFastQuery};
+use crate::encryption::rsa::rsa_keygen_service::RsaKeygenService;
 use crate::math_core::block_chiffre::determine_block_size;
 use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
-use crate::encryption::rsa::rsa_keygen_service::RsaKeygenService;
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
 
 #[derive(Deserialize)]
 pub struct CreateKeyPairRequest {

diff --git a/src/api/endpoints/rsa/decrypt.rs b/src/api/endpoints/rsa/decrypt.rs
@@ -5,7 +5,9 @@ use log::info;
 
 use crate::api::serializable_models::{EncryptDecryptRequest, SingleStringResponse, UseFastQuery};
 use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
 
 /// Endpunkt zum Entschlüsseln einer Nachricht mit RSA.
 /// # Argumente

diff --git a/src/api/endpoints/rsa/encrypt.rs b/src/api/endpoints/rsa/encrypt.rs
@@ -5,7 +5,9 @@ use log::info;
 
 use crate::api::serializable_models::{EncryptDecryptRequest, SingleStringResponse, UseFastQuery};
 use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
 
 ///
 /// Verschlüsselt eine Nachricht.

diff --git a/src/api/endpoints/rsa/multiplication.rs b/src/api/endpoints/rsa/multiplication.rs
@@ -8,9 +8,11 @@ use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 
 use crate::api::serializable_models::{KeyPair, SingleStringResponse, UseFastQuery};
-use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
 use crate::encryption::rsa::rsa_service::RsaService;
+use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
 
 #[derive(Deserialize)]
 pub struct MultiplicationRequest {

diff --git a/src/api/endpoints/rsa/sign.rs b/src/api/endpoints/rsa/sign.rs
@@ -6,7 +6,9 @@ use serde::Deserialize;
 
 use crate::api::serializable_models::{KeyPair, SingleStringResponse, UseFastQuery};
 use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
 
 #[derive(Deserialize)]
 pub struct SignRequest {

diff --git a/src/api/endpoints/rsa/verify.rs b/src/api/endpoints/rsa/verify.rs
@@ -6,7 +6,9 @@ use serde::Deserialize;
 
 use crate::api::serializable_models::{KeyPair, SingleStringResponse, UseFastQuery};
 use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
-use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+    Fast, Slow,
+};
 
 #[derive(Deserialize)]
 pub struct VerifyRequest {

diff --git a/src/api/serializable_models.rs b/src/api/serializable_models.rs
@@ -1,8 +1,8 @@
+use crate::encryption::asymmetric_key_type::AsymmetricKeyType;
 use crate::encryption::rsa::keys::RsaKey;
 use bigdecimal::num_bigint::ParseBigIntError;
 use log::debug;
 use serde::{Deserialize, Serialize};
-use crate::encryption::asymmetric_key_type::AsymmetricKeyType;
 
 #[derive(Serialize, Deserialize)]
 pub struct KeyPair {

diff --git a/src/encryption/el_gamal/el_gamal_keygen_service.rs b/src/encryption/el_gamal/el_gamal_keygen_service.rs
@@ -1,9 +1,11 @@
-use atomic_counter::RelaxedCounter;
-use log::debug;
 use crate::encryption::el_gamal::keys::{PrivateKey, PublicKey};
-use crate::math_core::number_theory::number_theory_service::{NumberTheoryService, NumberTheoryServiceTrait};
+use crate::math_core::number_theory::number_theory_service::{
+    NumberTheoryService, NumberTheoryServiceTrait,
+};
 use crate::math_core::pseudo_random_number_generator::PseudoRandomNumberGenerator;
 use crate::math_core::traits::increment::Increment;
+use atomic_counter::RelaxedCounter;
+use log::debug;
 
 ///
 /// Stellt einen Service zum Generieren von Schlüsselpaaren für das ElGamal-Kryptosystem in primen Restklassengruppen bereit.
@@ -21,7 +23,10 @@ impl ElGamalKeygenService {
     /// * `number_theory_service` - Ein Service für die Durchführung von Operationen der Zahlentheorie.
     /// * `modulus_width` - Die Bitbreite des Modulus, unter dem die Restklassengruppe operiert.
     ///
-    pub fn new(number_theory_service: NumberTheoryService, modulus_width: u32) -> ElGamalKeygenService {
+    pub fn new(
+        number_theory_service: NumberTheoryService,
+        modulus_width: u32,
+    ) -> ElGamalKeygenService {
         ElGamalKeygenService {
             number_theory_service,
             modulus_width,
@@ -40,7 +45,11 @@ impl ElGamalKeygenService {
         let counter = RelaxedCounter::new(1);
 
         // Generieren der sicheren Primzahl p und der Primitivwurzel g
-        let (p, g) = random_generator.generate_secure_prime_with_primitive_root(self.modulus_width, 100, &counter); //TODO: iterations
+        let (p, g) = random_generator.generate_secure_prime_with_primitive_root(
+            self.modulus_width,
+            100,
+            &counter,
+        ); //TODO: iterations
 
         // Generieren des privaten Schlüssels x (Zufallszahl zwischen 1 und p-2)
         let p_minus_two = p.decrement().decrement();
@@ -51,4 +60,4 @@ impl ElGamalKeygenService {
 
         (PublicKey { p: p.clone(), g, y }, PrivateKey { p, x })
     }
-}
+}
diff --git a/src/encryption/el_gamal/el_gamal_service.rs b/src/encryption/el_gamal/el_gamal_service.rs
@@ -26,4 +26,4 @@ impl ElGamalService {
     pub fn verify() {
         unimplemented!();
     }
-}
+}
diff --git a/src/encryption/el_gamal/mod.rs b/src/encryption/el_gamal/mod.rs
@@ -1,3 +1,3 @@
-mod keys;
 mod el_gamal_keygen_service;
-mod el_gamal_service;
+mod el_gamal_service;
+mod keys;
diff --git a/src/encryption/mod.rs b/src/encryption/mod.rs
@@ -1,3 +1,3 @@
-pub(crate) mod rsa;
-mod el_gamal;
 pub(crate) mod asymmetric_key_type;
+mod el_gamal;
+pub(crate) mod rsa;
diff --git a/src/encryption/rsa/keys.rs b/src/encryption/rsa/keys.rs
@@ -1,6 +1,5 @@
-use bigdecimal::num_bigint::BigInt;
 use crate::encryption::asymmetric_key_type::AsymmetricKeyType;
-
+use bigdecimal::num_bigint::BigInt;
 
 /// Ein RSA-Schlüssel.
 #[derive(Clone, Debug)]

diff --git a/src/encryption/rsa/rsa_keygen_service.rs b/src/encryption/rsa/rsa_keygen_service.rs
@@ -1,10 +1,10 @@
+use crate::encryption::asymmetric_key_type::AsymmetricKeyType;
+use crate::encryption::rsa::keys::RsaKey;
 use atomic_counter::RelaxedCounter;
 use bigdecimal::num_bigint::BigInt;
 use bigdecimal::One;
 use log::{debug, trace};
 use num::Integer;
-use crate::encryption::asymmetric_key_type::AsymmetricKeyType;
-use crate::encryption::rsa::keys::RsaKey;
 
 use crate::math_core::number_theory::number_theory_service::{
     NumberTheoryService, NumberTheoryServiceTrait,

diff --git a/src/encryption/rsa/rsa_service.rs b/src/encryption/rsa/rsa_service.rs
@@ -1,16 +1,16 @@
+use crate::encryption::asymmetric_key_type::AsymmetricKeyType;
 use bigdecimal::num_bigint::{BigInt, Sign};
 use log::{debug, info};
 use sha2::{Digest, Sha256};
-use crate::encryption::asymmetric_key_type::AsymmetricKeyType;
 
+use crate::encryption::rsa::keys::RsaKey;
 use crate::math_core::block_chiffre::{
     create_string_from_blocks_decrypt, create_string_from_blocks_encrypt, encode_string_to_blocks,
 };
 use crate::math_core::number_theory::number_theory_service::{
     NumberTheoryService, NumberTheoryServiceTrait,
 };
 use crate::math_core::traits::logarithm::Logarithm;
-use crate::encryption::rsa::keys::RsaKey;
 
 pub struct RsaService {
     number_theory_service: NumberTheoryService,
@@ -174,8 +174,10 @@ impl RsaService {
 mod tests {
     use std::str::FromStr;
 
-    use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
     use crate::encryption::rsa::rsa_keygen_service::RsaKeygenService;
+    use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+        Fast, Slow,
+    };
 
     use super::*;
 

diff --git a/src/math_core/babystep_giantstep.rs b/src/math_core/babystep_giantstep.rs
@@ -99,7 +99,9 @@ impl Shanks {
 
 #[cfg(test)]
 mod tests {
-    use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+    use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+        Fast, Slow,
+    };
 
     use super::*;
 

diff --git a/src/math_core/ecc/finite_field_elliptic_curve_point.rs b/src/math_core/ecc/finite_field_elliptic_curve_point.rs
@@ -5,8 +5,10 @@ use bigdecimal::num_traits::Euclid;
 use bigdecimal::Zero;
 
 use crate::math_core::ecc::finite_field_elliptic_curve::FiniteFieldEllipticCurve;
-use crate::math_core::number_theory::number_theory_service::{NumberTheoryService, NumberTheoryServiceTrait};
 use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::Fast;
+use crate::math_core::number_theory::number_theory_service::{
+    NumberTheoryService, NumberTheoryServiceTrait,
+};
 use crate::math_core::traits::parity::Parity;
 
 ///

diff --git a/src/math_core/mod.rs b/src/math_core/mod.rs
@@ -1,6 +1,6 @@
 pub mod babystep_giantstep;
 pub mod block_chiffre;
+pub mod ecc;
 pub mod number_theory;
 pub mod pseudo_random_number_generator;
 pub mod traits;
-pub mod ecc;
diff --git a/src/math_core/number_theory/fast_number_theory_service.rs b/src/math_core/number_theory/fast_number_theory_service.rs
@@ -4,8 +4,10 @@ use bigdecimal::num_traits::Euclid;
 use bigdecimal::One;
 use num::Integer;
 
-use crate::math_core::number_theory::number_theory_service::{NumberTheoryService, NumberTheoryServiceTrait};
 use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::Fast;
+use crate::math_core::number_theory::number_theory_service::{
+    NumberTheoryService, NumberTheoryServiceTrait,
+};
 use crate::math_core::number_theory::primality_test::PrimalityTest;
 use crate::math_core::pseudo_random_number_generator::PseudoRandomNumberGenerator;
 use crate::shared::errors::ArithmeticError;

diff --git a/src/math_core/number_theory/number_theory_service.rs b/src/math_core/number_theory/number_theory_service.rs
@@ -175,7 +175,9 @@ pub trait NumberTheoryServiceTrait {
 mod tests {
     use std::str::FromStr;
 
-    use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{Fast, Slow};
+    use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::{
+        Fast, Slow,
+    };
 
     use super::*;
 

diff --git a/src/math_core/number_theory/slow_number_theory_service.rs b/src/math_core/number_theory/slow_number_theory_service.rs
@@ -3,8 +3,10 @@ use bigdecimal::num_bigint::BigInt;
 use bigdecimal::num_traits::Euclid;
 use bigdecimal::{One, Zero};
 
-use crate::math_core::number_theory::number_theory_service::{NumberTheoryService, NumberTheoryServiceTrait};
 use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::Slow;
+use crate::math_core::number_theory::number_theory_service::{
+    NumberTheoryService, NumberTheoryServiceTrait,
+};
 use crate::math_core::number_theory::primality_test::PrimalityTest;
 use crate::math_core::pseudo_random_number_generator::PseudoRandomNumberGenerator;
 use crate::math_core::traits::divisible::Divisible;

diff --git a/src/math_core/pseudo_random_number_generator.rs b/src/math_core/pseudo_random_number_generator.rs
@@ -219,10 +219,10 @@ impl PseudoRandomNumberGenerator {
 
 #[cfg(test)]
 mod tests {
-    use atomic_counter::RelaxedCounter;
-    use bigdecimal::num_bigint::BigInt;
     use crate::math_core::number_theory::number_theory_service::NumberTheoryService;
     use crate::math_core::number_theory::number_theory_service::NumberTheoryServiceSpeed::Fast;
+    use atomic_counter::RelaxedCounter;
+    use bigdecimal::num_bigint::BigInt;
 
     use crate::math_core::pseudo_random_number_generator::PseudoRandomNumberGenerator;
     use crate::math_core::traits::divisible::Divisible;
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,4 +26,4 @@ impl ElGamalService { @@
         pub fn verify() {
             unimplemented!();
         }
-    }
+    }