diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml index bd31bf09c2..45c84f9c70 100644 --- a/.github/workflows/windows-test.yml +++ b/.github/workflows/windows-test.yml @@ -45,6 +45,7 @@ jobs: - name: Build and install Python Bindings run: | + python --version ; python .\cryptatools-core\setup.py bdist_wheel --verbose ; $wheelFile = Get-ChildItem -Path .\dist\ -Recurse -Include * ; pip3 install $wheelFile --force-reinstall ; diff --git a/cryptatools-cli/src/statistical_cryptanalysis/main.rs b/cryptatools-cli/src/statistical_cryptanalysis/main.rs index 14ae38421d..a8f67a167b 100644 --- a/cryptatools-cli/src/statistical_cryptanalysis/main.rs +++ b/cryptatools-cli/src/statistical_cryptanalysis/main.rs @@ -20,7 +20,7 @@ struct Freq ( fn main() { let cli = Cli::parse(); match &cli.command { - Commands::GetCoincidenceIndex { cipher_text } => { + Commands::GetCoincidenceIndex { cipher_text: _ } => { println!("here is the coincidence index.") //let c = CoincidenceIndexGuesser::new(alphabet); //let coincidence_index: f64 = c.guess_coincidence_index(opcodes.as_bytes().to_vec()); diff --git a/cryptatools-core/setup.py b/cryptatools-core/setup.py index fd6f9f524e..64bb99e698 100644 --- a/cryptatools-core/setup.py +++ b/cryptatools-core/setup.py @@ -34,7 +34,7 @@ "wheel", "semantic-version==2.9.0", "setuptools", - "typing_extensions==4.0.1", + "typing_extensions==4.7.1", "pytest==7.1.2", "tox==3.25.1", ] diff --git a/cryptatools-core/src/cryptanalysis/general_cryptanalysis_methods/hash_cryptanalysis/birthday_paradox.rs b/cryptatools-core/src/cryptanalysis/general_cryptanalysis_methods/hash_cryptanalysis/birthday_paradox.rs index e467cb478b..7a17abe8d8 100644 --- a/cryptatools-core/src/cryptanalysis/general_cryptanalysis_methods/hash_cryptanalysis/birthday_paradox.rs +++ b/cryptatools-core/src/cryptanalysis/general_cryptanalysis_methods/hash_cryptanalysis/birthday_paradox.rs @@ -3,7 +3,6 @@ use num_bigfloat::BigFloat; use num_traits::Pow; use num::FromPrimitive; use num_traits::Float; -use num::ToPrimitive; use num::One; diff --git a/cryptatools-core/src/cryptanalysis/know_plaintext_attacks/matsui_s_algorithm/algorithm_one.rs b/cryptatools-core/src/cryptanalysis/know_plaintext_attacks/matsui_s_algorithm/algorithm_one.rs index 50386ecd65..6a0779cbdb 100644 --- a/cryptatools-core/src/cryptanalysis/know_plaintext_attacks/matsui_s_algorithm/algorithm_one.rs +++ b/cryptatools-core/src/cryptanalysis/know_plaintext_attacks/matsui_s_algorithm/algorithm_one.rs @@ -1,7 +1,7 @@ -use std::collections::HashMap; use crate::utils::alphabets::Alphabet; pub struct AlgorithmOne { + #[allow(dead_code)] alphabet: Alphabet, } diff --git a/cryptatools-core/src/lib.rs b/cryptatools-core/src/lib.rs index f151676160..1734c02ceb 100644 --- a/cryptatools-core/src/lib.rs +++ b/cryptatools-core/src/lib.rs @@ -7,11 +7,4 @@ use crate::cryptography::classical::encryption::monoalphabetic_ciphers::caesar_n use crate::cryptography::classical::encryption::transpositional_ciphers::columnar_transposition::ColumnarTranspositionAlgorithm; use crate::cryptanalysis::general_cryptanalysis_methods::frequency_analysis::coincidence_index::CoincidenceIndexGuesser; -uniffi_macros::include_scaffolding!("cryptatools"); - -/* - [Name=full_hexadecimal_alphabet] - constructor(); - - Alphabet full_hexadecimal_alphabet(); -*/ \ No newline at end of file +uniffi_macros::include_scaffolding!("cryptatools"); \ No newline at end of file diff --git a/cryptatools-core/src/utils/alphabets.rs b/cryptatools-core/src/utils/alphabets.rs index 2ed3f6699c..b14da3fc52 100644 --- a/cryptatools-core/src/utils/alphabets.rs +++ b/cryptatools-core/src/utils/alphabets.rs @@ -1,4 +1,3 @@ -#![feature(assert_matches)] use itertools::Itertools; use bimap::btree::BiBTreeMap; //use std::assert_matches::assert_matches; diff --git a/doc-examples/ethereum-colision-evaluation/src/main.rs b/doc-examples/ethereum-colision-evaluation/src/main.rs index 3e0e742c44..f8a902574b 100644 --- a/doc-examples/ethereum-colision-evaluation/src/main.rs +++ b/doc-examples/ethereum-colision-evaluation/src/main.rs @@ -1,7 +1,6 @@ use ethers::prelude::*; -use cryptatools_core::utils::{convert::Encode, alphabets::split_bytes_by_characters_representation, alphabets::Alphabet, alphabets::Encoding}; -use cryptatools_core::cryptanalysis::general_cryptanalysis_methods::frequency_analysis::coincidence_index::CoincidenceIndexGuesser; +use cryptatools_core::utils::alphabets::Alphabet; use cryptatools_core::cryptanalysis::general_cryptanalysis_methods::hash_cryptanalysis::birthday_paradox::BirtdayParadox; const WSS_URL: &str = "wss://mainnet.infura.io/ws/v3/c60b0bb42f8a4c6481ecd229eddaca27";