From 7caee47c91dd81ab3c5da1ff581e5a78a246d4e6 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Wed, 15 Aug 2012 01:26:24 +0200 Subject: [PATCH] Massive fix for afine -> affine typo. --- Makefile.am | 2 +- README.md | 10 ++++---- configure.in | 6 ++--- demo/{afine.txt => affine.txt} | 0 src/lib/Makefile.am | 24 +++++++++---------- src/lib/alphabet.cpp | 2 +- src/lib/alphabet.hh | 10 ++++---- src/lib/codec.cpp | 2 +- src/lib/codec.hh | 10 ++++---- src/lib/{codec_afine.cpp => codec_affine.cpp} | 4 ++-- src/lib/codec_affine.hh | 23 ++++++++++++++++++ src/lib/codec_afine.hh | 23 ------------------ src/lib/codec_vigenere.cpp | 2 +- src/lib/codec_vigenere.hh | 10 ++++---- src/lib/cryptaffinity.hh | 8 +++++++ ...nity_global.hh => cryptaffinity_global.hh} | 4 ++-- src/lib/cryptaffinity_iface.hh | 4 ++++ ...finity_proto.hh => cryptaffinity_proto.hh} | 6 ++--- src/lib/cryptafinity.hh | 8 ------- src/lib/cryptafinity_iface.hh | 4 ---- src/lib/freq_analyser.cpp | 2 +- src/lib/freq_analyser.hh | 10 ++++---- src/lib/key.cpp | 2 +- src/lib/key.hh | 6 ++--- src/lib/{key_afine.cpp => key_affine.cpp} | 8 +++---- src/lib/{key_afine.hh => key_affine.hh} | 6 ++--- src/lib/key_vigenere.cpp | 2 +- src/lib/key_vigenere.hh | 6 ++--- src/lib/letter.cpp | 2 +- src/lib/letter.hh | 10 ++++---- src/lib/math_tools.cpp | 2 +- src/lib/math_tools.hh | 10 ++++---- src/lib/text.cpp | 2 +- src/lib/text.hh | 10 ++++---- src/lib/word_list.cpp | 2 +- src/lib/word_list.hh | 2 +- src/runAfine.sh | 2 +- src/runVigenere.sh | 2 +- src/tools/Makefile.am | 10 ++++---- src/tools/{ba_afine.cpp => ba_affine.cpp} | 4 ++-- src/tools/ba_cmd.cpp | 12 +++++----- src/tools/ba_cmd.hh | 12 +++++----- src/tools/ba_config.cpp | 2 +- src/tools/ba_config.hh | 8 +++---- src/tools/ba_vigenere.cpp | 8 +++---- src/tools/breakaffinity.hh | 8 +++++++ ...nity_global.hh => breakaffinity_global.hh} | 6 ++--- src/tools/breakaffinity_iface.hh | 4 ++++ ...finity_proto.hh => breakaffinity_proto.hh} | 4 ++-- src/tools/breakafinity.hh | 8 ------- src/tools/breakafinity_iface.hh | 4 ---- src/tools/file_loader.cpp | 4 ++-- src/tools/file_loader.hh | 4 ++-- src/tools/main.cpp | 6 ++--- 54 files changed, 176 insertions(+), 176 deletions(-) rename demo/{afine.txt => affine.txt} (100%) rename src/lib/{codec_afine.cpp => codec_affine.cpp} (92%) create mode 100644 src/lib/codec_affine.hh delete mode 100644 src/lib/codec_afine.hh create mode 100644 src/lib/cryptaffinity.hh rename src/lib/{cryptafinity_global.hh => cryptaffinity_global.hh} (86%) create mode 100644 src/lib/cryptaffinity_iface.hh rename src/lib/{cryptafinity_proto.hh => cryptaffinity_proto.hh} (68%) delete mode 100644 src/lib/cryptafinity.hh delete mode 100644 src/lib/cryptafinity_iface.hh rename src/lib/{key_afine.cpp => key_affine.cpp} (77%) rename src/lib/{key_afine.hh => key_affine.hh} (77%) rename src/tools/{ba_afine.cpp => ba_affine.cpp} (96%) create mode 100644 src/tools/breakaffinity.hh rename src/tools/{breakafinity_global.hh => breakaffinity_global.hh} (78%) create mode 100644 src/tools/breakaffinity_iface.hh rename src/tools/{breakafinity_proto.hh => breakaffinity_proto.hh} (54%) delete mode 100644 src/tools/breakafinity.hh delete mode 100644 src/tools/breakafinity_iface.hh diff --git a/Makefile.am b/Makefile.am index b268b6c..73b526d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ demodir = demo demo_DATA = \ demo/vigenere.txt \ - demo/afine.txt \ + demo/affine.txt \ demo/plaintext.txt \ demo/vigenere.2.txt \ demo/vigenere.3.txt diff --git a/README.md b/README.md index 9f11eb0..7a1921e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## 1. Description CryptAffinity est un logiciel libre permettant de déchiffrer des texte -obfusqués par des systemes Afines ou l'algorithme de Vigenère. Il possède les +obfusqués par des systemes Affines ou l'algorithme de Vigenère. Il possède les caractéristiques suivantes : * Il est distribue sous la licence [GNU General Public License](http://www.gnu.org/copyleft/gpl.html) @@ -120,7 +120,7 @@ clair. Pour utiliser le décodeur Affine : break_affinity -a data/alphabet.txt -f 0.7 -m a -p data/priority.txt \ - -t demo/afine.txt -e 0.1 + -t demo/affine.txt -e 0.1 Pour utiliser le décodeur Vigenère : @@ -148,7 +148,7 @@ en entrée: int alpha_size; //taille de l'alphabet std::list orb; // nombre premiers avec alpha_size MathTools mt; // bibliotheque d'outils mathematiques - std::list keyList; + std::list keyList; std::list::iterator orbIt; for (i=1; i::iterator kLIt; + std::list::iterator kLIt; for (kLIt = keyList.begin(); kLIt != keyList.end(); kLIt++){ float score = 0; diff --git a/configure.in b/configure.in index 05f96cb..5c15b54 100644 --- a/configure.in +++ b/configure.in @@ -16,21 +16,21 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl ## Autoconf requirements -AC_INIT([CryptAfinity], [0.2], [glenux@fr.st]) +AC_INIT([CryptAffinity], [0.2], [glenux@glenux.net]) AC_PREREQ(2.50) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([CryptAfinity],[0.2]) +AM_INIT_AUTOMAKE([CryptAffinity],[0.2]) #AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(src/config.h) -AC_CONFIG_SRCDIR([src/lib/cryptafinity.hh]) +AC_CONFIG_SRCDIR([src/lib/cryptaffinity.hh]) AC_PROG_INSTALL ## information on the package diff --git a/demo/afine.txt b/demo/affine.txt similarity index 100% rename from demo/afine.txt rename to demo/affine.txt diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 58c356a..aa6e258 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,37 +1,37 @@ SUBDIRS = . -lib_LTLIBRARIES = libcryptafinity.la +lib_LTLIBRARIES = libcryptaffinity.la #bin_PROGRAMS = libulm.o -libcryptafinity_la_SOURCES = alphabet.cpp \ +libcryptaffinity_la_SOURCES = alphabet.cpp \ key.cpp \ text.cpp \ codec.cpp \ letter.cpp \ - codec_afine.cpp \ + codec_affine.cpp \ codec_vigenere.cpp \ - key_afine.cpp \ + key_affine.cpp \ key_vigenere.cpp \ word_list.cpp \ math_tools.cpp \ freq_analyser.cpp -#libcryptafinity_la_SOURCES += cryptafinity_errors.hh \ -# cryptafinity_global.hh \ -# cryptafinity.hh \ -# cryptafinity_iface.hh \ -# cryptafinity_proto.hh \ +#libcryptaffinity_la_SOURCES += cryptaffinity_errors.hh \ +# cryptaffinity_global.hh \ +# cryptaffinity.hh \ +# cryptaffinity_iface.hh \ +# cryptaffinity_proto.hh \ # XSock.hh -libcryptafinity_la_CFLAGS = -DTRACE -static -libcryptafinity_la_LDFLAGS = -version-info 3:12:1 +libcryptaffinity_la_CFLAGS = -DTRACE -static +libcryptaffinity_la_LDFLAGS = -version-info 3:12:1 #INCLUDES= SQLITE3_CFLAGS@ \ # LIBXMLPP_CFLAGS@ \ # -I./ -#libcryptafinity_a_LDFLAGS= @LDFLAGS@ +#libcryptaffinity_a_LDFLAGS= @LDFLAGS@ #SQLITE3_LIBS@ LIBPCRE_LIBS@ diff --git a/src/lib/alphabet.cpp b/src/lib/alphabet.cpp index 16df967..4d5d197 100644 --- a/src/lib/alphabet.cpp +++ b/src/lib/alphabet.cpp @@ -1,7 +1,7 @@ #include "alphabet.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { Alphabet::Alphabet() : std::vector() { } diff --git a/src/lib/alphabet.hh b/src/lib/alphabet.hh index 6e01161..c0a4135 100644 --- a/src/lib/alphabet.hh +++ b/src/lib/alphabet.hh @@ -1,11 +1,11 @@ -#ifndef _LIBCRYPAFINITY_ALPHABET_HH -#define _LIBCRYPAFINITY_ALPHABET_HH +#ifndef _LIBCRYPAFFINITY_ALPHABET_HH +#define _LIBCRYPAFFINITY_ALPHABET_HH -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class ReverseAlphabet: public std::map { }; diff --git a/src/lib/codec.cpp b/src/lib/codec.cpp index 05aa2a1..d314383 100644 --- a/src/lib/codec.cpp +++ b/src/lib/codec.cpp @@ -1,7 +1,7 @@ #include "codec.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { Codec::Codec(){ } diff --git a/src/lib/codec.hh b/src/lib/codec.hh index dde9e3f..bb74983 100644 --- a/src/lib/codec.hh +++ b/src/lib/codec.hh @@ -1,13 +1,13 @@ -#ifndef _LIBCRYPAFINITY_CODEC_HH -#define _LIBCRYPAFINITY_CODEC_HH +#ifndef _LIBCRYPAFFINITY_CODEC_HH +#define _LIBCRYPAFFINITY_CODEC_HH #include "text.hh" #include "key.hh" -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class Codec { private: public: diff --git a/src/lib/codec_afine.cpp b/src/lib/codec_affine.cpp similarity index 92% rename from src/lib/codec_afine.cpp rename to src/lib/codec_affine.cpp index 3949788..7d4aeb9 100644 --- a/src/lib/codec_afine.cpp +++ b/src/lib/codec_affine.cpp @@ -1,8 +1,8 @@ -#include "codec_afine.hh" +#include "codec_affine.hh" #include "math_tools.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { CodecAfine::CodecAfine() : Codec() { } diff --git a/src/lib/codec_affine.hh b/src/lib/codec_affine.hh new file mode 100644 index 0000000..55dd974 --- /dev/null +++ b/src/lib/codec_affine.hh @@ -0,0 +1,23 @@ +#ifndef _LIBCRYPAFFINITY_CODEC_AFINE_HH +#define _LIBCRYPAFFINITY_CODEC_AFINE_HH + +#include "codec.hh" +#include "key_affine.hh" + +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" + + +namespace LibCryptAffinity { + class CodecAfine : public Codec { + private: + public: + CodecAfine(); + + Text encode(Text t, KeyAfine k); + Text decode(Text t, KeyAfine k); + + }; +} + +#endif diff --git a/src/lib/codec_afine.hh b/src/lib/codec_afine.hh deleted file mode 100644 index 55f7ab5..0000000 --- a/src/lib/codec_afine.hh +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _LIBCRYPAFINITY_CODEC_AFINE_HH -#define _LIBCRYPAFINITY_CODEC_AFINE_HH - -#include "codec.hh" -#include "key_afine.hh" - -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" - - -namespace LibCryptAfinity { - class CodecAfine : public Codec { - private: - public: - CodecAfine(); - - Text encode(Text t, KeyAfine k); - Text decode(Text t, KeyAfine k); - - }; -} - -#endif diff --git a/src/lib/codec_vigenere.cpp b/src/lib/codec_vigenere.cpp index 5a3b6ff..f16de56 100644 --- a/src/lib/codec_vigenere.cpp +++ b/src/lib/codec_vigenere.cpp @@ -1,7 +1,7 @@ #include "codec_vigenere.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { CodecVigenere::CodecVigenere() : Codec() { } diff --git a/src/lib/codec_vigenere.hh b/src/lib/codec_vigenere.hh index 49ddb1b..d5375c9 100644 --- a/src/lib/codec_vigenere.hh +++ b/src/lib/codec_vigenere.hh @@ -1,14 +1,14 @@ -#ifndef _LIBCRYPAFINITY_CODEC_VIGENERE_HH -#define _LIBCRYPAFINITY_CODEC_VIGENERE_HH +#ifndef _LIBCRYPAFFINITY_CODEC_VIGENERE_HH +#define _LIBCRYPAFFINITY_CODEC_VIGENERE_HH #include "codec.hh" #include "key_vigenere.hh" -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class CodecVigenere : public Codec { private: public: diff --git a/src/lib/cryptaffinity.hh b/src/lib/cryptaffinity.hh new file mode 100644 index 0000000..eb1141c --- /dev/null +++ b/src/lib/cryptaffinity.hh @@ -0,0 +1,8 @@ +#ifndef _CRYPTAFFINITY_HH +#define _CRYPTAFFINITY_HH + +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" +#include "cryptaffinity_proto.hh" + +#endif diff --git a/src/lib/cryptafinity_global.hh b/src/lib/cryptaffinity_global.hh similarity index 86% rename from src/lib/cryptafinity_global.hh rename to src/lib/cryptaffinity_global.hh index 359a2ac..8691ecb 100644 --- a/src/lib/cryptafinity_global.hh +++ b/src/lib/cryptaffinity_global.hh @@ -1,5 +1,5 @@ -#ifndef _CRYPTAFINITY_GLOBAL_HH -#define _CRYPTAFINITY_GLOBAL_HH +#ifndef _CRYPTAFFINITY_GLOBAL_HH +#define _CRYPTAFFINITY_GLOBAL_HH #include #include diff --git a/src/lib/cryptaffinity_iface.hh b/src/lib/cryptaffinity_iface.hh new file mode 100644 index 0000000..5e8898b --- /dev/null +++ b/src/lib/cryptaffinity_iface.hh @@ -0,0 +1,4 @@ +#ifndef _CRYPTAFFINITY_IFACE_HH +#define _CRYPTAFFINITY_IFACE_HH + +#endif diff --git a/src/lib/cryptafinity_proto.hh b/src/lib/cryptaffinity_proto.hh similarity index 68% rename from src/lib/cryptafinity_proto.hh rename to src/lib/cryptaffinity_proto.hh index a09450f..72b5cf8 100644 --- a/src/lib/cryptafinity_proto.hh +++ b/src/lib/cryptaffinity_proto.hh @@ -1,5 +1,5 @@ -#ifndef _CRYPTAFINITY_PROTO_HH -#define _CRYPTAFINITY_PROTO_HH +#ifndef _CRYPTAFFINITY_PROTO_HH +#define _CRYPTAFFINITY_PROTO_HH #include "math_tools.hh" #include "alphabet.hh" @@ -9,6 +9,6 @@ #include "freq_analyser.hh" #include "codec.hh" #include "codec_vigenere.hh" -#include "codec_afine.hh" +#include "codec_affine.hh" #endif diff --git a/src/lib/cryptafinity.hh b/src/lib/cryptafinity.hh deleted file mode 100644 index 724e718..0000000 --- a/src/lib/cryptafinity.hh +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _CRYPTAFINITY_HH -#define _CRYPTAFINITY_HH - -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" -#include "cryptafinity_proto.hh" - -#endif diff --git a/src/lib/cryptafinity_iface.hh b/src/lib/cryptafinity_iface.hh deleted file mode 100644 index b4093bb..0000000 --- a/src/lib/cryptafinity_iface.hh +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _CRYPTAFINITY_IFACE_HH -#define _CRYPTAFINITY_IFACE_HH - -#endif diff --git a/src/lib/freq_analyser.cpp b/src/lib/freq_analyser.cpp index dbd3c76..00827fe 100644 --- a/src/lib/freq_analyser.cpp +++ b/src/lib/freq_analyser.cpp @@ -4,7 +4,7 @@ #define DEBUG 0 -namespace LibCryptAfinity { +namespace LibCryptAffinity { std::list FreqAnalyser::getPriorities(Text text, int keylen, int column){ std::list result; std::map counter; diff --git a/src/lib/freq_analyser.hh b/src/lib/freq_analyser.hh index 73fae65..1d40fa0 100644 --- a/src/lib/freq_analyser.hh +++ b/src/lib/freq_analyser.hh @@ -1,12 +1,12 @@ -#ifndef _LIBCRYPTAFINITY_FREQANALYSER_HH -#define _LIBCRYPTAFINITY_FREQANALYSER_HH +#ifndef _LIBCRYPTAFFINITY_FREQANALYSER_HH +#define _LIBCRYPTAFFINITY_FREQANALYSER_HH -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" #include "text.hh" // body -namespace LibCryptAfinity { +namespace LibCryptAffinity { class FreqAnalyser { private: diff --git a/src/lib/key.cpp b/src/lib/key.cpp index 29e595e..456d453 100644 --- a/src/lib/key.cpp +++ b/src/lib/key.cpp @@ -1,7 +1,7 @@ #include "key.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { Key::Key() { } // std::string Key::toString() { } diff --git a/src/lib/key.hh b/src/lib/key.hh index 7b15a66..3a08d77 100644 --- a/src/lib/key.hh +++ b/src/lib/key.hh @@ -4,10 +4,10 @@ //#include "text.hh" -//#include "cryptafinity_global.hh" -//#include "cryptafinity_iface.hh" +//#include "cryptaffinity_global.hh" +//#include "cryptaffinity_iface.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class Key { private: public: diff --git a/src/lib/key_afine.cpp b/src/lib/key_affine.cpp similarity index 77% rename from src/lib/key_afine.cpp rename to src/lib/key_affine.cpp index cf52deb..edf26e2 100644 --- a/src/lib/key_afine.cpp +++ b/src/lib/key_affine.cpp @@ -1,10 +1,10 @@ -#include "key_afine.hh" +#include "key_affine.hh" -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { int KeyAfine::getCoefA(){ return this->_a; diff --git a/src/lib/key_afine.hh b/src/lib/key_affine.hh similarity index 77% rename from src/lib/key_afine.hh rename to src/lib/key_affine.hh index 8c193bc..c310628 100644 --- a/src/lib/key_afine.hh +++ b/src/lib/key_affine.hh @@ -1,13 +1,13 @@ #ifndef _CRYPTAFINIY_KEYAFINE_HH #define _CRYPTAFINIY_KEYAFINE_HH -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" #include "key.hh" // declaration #include "text.hh" // body -namespace LibCryptAfinity { +namespace LibCryptAffinity { class KeyAfine : public Key { private: int _a; diff --git a/src/lib/key_vigenere.cpp b/src/lib/key_vigenere.cpp index 5bf1a6e..1311b63 100644 --- a/src/lib/key_vigenere.cpp +++ b/src/lib/key_vigenere.cpp @@ -1,7 +1,7 @@ #include "key_vigenere.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { KeyVigenere::KeyVigenere() : Key(), Text() { // Key() int i; i=0; diff --git a/src/lib/key_vigenere.hh b/src/lib/key_vigenere.hh index 1c02812..9b97fa7 100644 --- a/src/lib/key_vigenere.hh +++ b/src/lib/key_vigenere.hh @@ -1,13 +1,13 @@ #ifndef _CRYPTAFINIY_KEYVIGENERE_HH #define _CRYPTAFINIY_KEYVIGENERE_HH -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" #include "text.hh" #include "key.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class KeyVigenere : public Key, public Text { private: public: diff --git a/src/lib/letter.cpp b/src/lib/letter.cpp index 549007c..c5dc5cf 100644 --- a/src/lib/letter.cpp +++ b/src/lib/letter.cpp @@ -1,6 +1,6 @@ #include "letter.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { Letter::Letter(const Letter &orig){ this->_alphabet = orig._alphabet; diff --git a/src/lib/letter.hh b/src/lib/letter.hh index c25c227..ec53600 100644 --- a/src/lib/letter.hh +++ b/src/lib/letter.hh @@ -1,12 +1,12 @@ -#ifndef _LIBCRYPTAFINITY_LETTER_HH -#define _LIBCRYPTAFINITY_LETTER_HH +#ifndef _LIBCRYPTAFFINITY_LETTER_HH +#define _LIBCRYPTAFFINITY_LETTER_HH -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" #include "alphabet.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class Letter { private: Alphabet _alphabet; diff --git a/src/lib/math_tools.cpp b/src/lib/math_tools.cpp index bcc60c2..daf7087 100644 --- a/src/lib/math_tools.cpp +++ b/src/lib/math_tools.cpp @@ -3,7 +3,7 @@ #define DEBUG 1 -namespace LibCryptAfinity { +namespace LibCryptAffinity { int MathTools::pgcd(int a, int b){ int fa = a; diff --git a/src/lib/math_tools.hh b/src/lib/math_tools.hh index 771ee7f..ab939dc 100644 --- a/src/lib/math_tools.hh +++ b/src/lib/math_tools.hh @@ -1,10 +1,10 @@ -#ifndef _LIBCRYPTAFINITY_MATHTOOLS_HH -#define _LIBCRYPTAFINITY_MATHTOOLS_HH +#ifndef _LIBCRYPTAFFINITY_MATHTOOLS_HH +#define _LIBCRYPTAFFINITY_MATHTOOLS_HH -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class MathTools { private: diff --git a/src/lib/text.cpp b/src/lib/text.cpp index de97936..fda8186 100644 --- a/src/lib/text.cpp +++ b/src/lib/text.cpp @@ -2,7 +2,7 @@ #include "text.hh" #define DEBUG 0 -namespace LibCryptAfinity { +namespace LibCryptAffinity { bool TextCounter::operator< (TextCounter b){ fflush(stdout); if (this->_text.size() < b.getText().size()){ diff --git a/src/lib/text.hh b/src/lib/text.hh index 4f7fa4f..4d5f521 100644 --- a/src/lib/text.hh +++ b/src/lib/text.hh @@ -1,12 +1,12 @@ -#ifndef _LIBCRYPAFINITY_TEXT_HH -#define _LIBCRYPAFINITY_TEXT_HH +#ifndef _LIBCRYPAFFINITY_TEXT_HH +#define _LIBCRYPAFFINITY_TEXT_HH -#include "cryptafinity_global.hh" -#include "cryptafinity_iface.hh" +#include "cryptaffinity_global.hh" +#include "cryptaffinity_iface.hh" #include "alphabet.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class TextCounter; class Text : public std::vector { diff --git a/src/lib/word_list.cpp b/src/lib/word_list.cpp index 9318887..4fc336f 100644 --- a/src/lib/word_list.cpp +++ b/src/lib/word_list.cpp @@ -1,7 +1,7 @@ #include "word_list.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { std::map WordList::getWordsContaining(int value){ std::map result; std::map::iterator foundVal; diff --git a/src/lib/word_list.hh b/src/lib/word_list.hh index 8debf30..5451448 100644 --- a/src/lib/word_list.hh +++ b/src/lib/word_list.hh @@ -4,7 +4,7 @@ #include #include "text.hh" -namespace LibCryptAfinity { +namespace LibCryptAffinity { class WordList { private: std::map _word2int; // existance du mot diff --git a/src/runAfine.sh b/src/runAfine.sh index 1281c13..9570455 100755 --- a/src/runAfine.sh +++ b/src/runAfine.sh @@ -1 +1 @@ -./tools/break_afinity -a tests/alphabet.txt -f 0.7 -m a -p tests/priority.txt -t tests/afine.txt -e 0.1 +./tools/break_affinity -a data/alphabet.txt -f 0.7 -m a -p data/priority.txt -t demo/affine.txt -e 0.1 diff --git a/src/runVigenere.sh b/src/runVigenere.sh index 564cd30..242df52 100755 --- a/src/runVigenere.sh +++ b/src/runVigenere.sh @@ -1 +1 @@ -./tools/break_afinity -a tests/alphabet.txt -f 0.7 -m v -p tests/priority.txt -t tests/vigenere.txt -e 0.05 +./tools/break_affinity -a data/alphabet.txt -f 0.7 -m v -p data/priority.txt -t demo/vigenere.txt -e 0.05 diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 3cf8138..64fdcf9 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -2,10 +2,10 @@ SUBDIRS = . -bin_PROGRAMS = break_afinity +bin_PROGRAMS = break_affinity -break_afinity_SOURCES = main.cpp ba_cmd.cpp ba_config.cpp file_loader.cpp ba_vigenere.cpp ba_afine.cpp +break_affinity_SOURCES = main.cpp ba_cmd.cpp ba_config.cpp file_loader.cpp ba_vigenere.cpp ba_affine.cpp # ftp_client.cpp \ # ftp_client_cmd.cpp \ @@ -13,7 +13,7 @@ break_afinity_SOURCES = main.cpp ba_cmd.cpp ba_config.cpp file_loader.cpp ba_vi # miniftp.cpp \ # server_msg.cpp -break_afinity_SOURCES += ba_cmd.hh breakafinity.hh breakafinity_global.hh breakafinity_iface.hh breakafinity_proto.hh file_loader.hh +break_affinity_SOURCES += ba_cmd.hh breakaffinity.hh breakaffinity_global.hh breakaffinity_iface.hh breakaffinity_proto.hh file_loader.hh # ftp_config.hh \ # miniftp_global.hh \ @@ -32,6 +32,6 @@ INCLUDES= -I../lib/ -I./ @GLIB2_CFLAGS@ # libyalag.la # miniftpc_INCLUDE = a -break_afinity_LDADD = -lcryptafinity @GLIB2_LIBS@ -break_afinity_LDFLAGS = @LDFLAGS@ -L../lib -L../lib/.libs +break_affinity_LDADD = -lcryptaffinity @GLIB2_LIBS@ +break_affinity_LDFLAGS = @LDFLAGS@ -L../lib -L../lib/.libs diff --git a/src/tools/ba_afine.cpp b/src/tools/ba_affine.cpp similarity index 96% rename from src/tools/ba_afine.cpp rename to src/tools/ba_affine.cpp index 95de2f2..aca5611 100644 --- a/src/tools/ba_afine.cpp +++ b/src/tools/ba_affine.cpp @@ -4,9 +4,9 @@ #define DEBUG 1 -namespace BreakAfinity { +namespace BreakAffinity { - void BreakAfinity::runAfine(){ + void BreakAffinity::runAfine(){ MathTools mt; CodecAfine codec; FreqAnalyser fa; diff --git a/src/tools/ba_cmd.cpp b/src/tools/ba_cmd.cpp index 1fbf0ad..ff41357 100644 --- a/src/tools/ba_cmd.cpp +++ b/src/tools/ba_cmd.cpp @@ -4,20 +4,20 @@ #define DEBUG 0 -namespace BreakAfinity { - BreakAfinity::BreakAfinity(){ +namespace BreakAffinity { + BreakAffinity::BreakAffinity(){ // on fixe la config par defaut int i; i=i+1; } - void BreakAfinity::loadFiles(){ + void BreakAffinity::loadFiles(){ printf("ALIVE !!!\n"); this->_config.loadFiles(); printf("ALIVE ???\n"); } - void BreakAfinity::init(int argc, char **argv) { + void BreakAffinity::init(int argc, char **argv) { int i; for (i = 1; i + 1 < argc; i = i + 2){ @@ -60,7 +60,7 @@ namespace BreakAfinity { printf("-a, --alphabet Letters ordered by decreasing frequency\n"); printf("-e, --epsilon Tolerance for the final key test\n"); printf("-f, --frequencies Average frequencies for the 9 first letters\n"); - printf("-m, --mode ( v | a ) Choose the kind of cypher : vigenere or afine.\n"); + printf("-m, --mode ( v | a ) Choose the kind of cypher : vigenere or affine.\n"); printf("-p, --priorities Letters ordered by decreasing frequency\n"); printf("-t, --text Cipher text to decipher\n"); //printf("-s, --popsize Population size in each generation\n"); @@ -71,7 +71,7 @@ namespace BreakAfinity { } } - void BreakAfinity::run(){ + void BreakAffinity::run(){ // vigenere ou affine ? MathTools mt; CodecVigenere codec; diff --git a/src/tools/ba_cmd.hh b/src/tools/ba_cmd.hh index 7282cde..2c236d1 100644 --- a/src/tools/ba_cmd.hh +++ b/src/tools/ba_cmd.hh @@ -1,20 +1,20 @@ -#ifndef _BREAKAFINITY_CMD_HH -#define _BREAKAFINITY_CMD_HH +#ifndef _BREAKAFFINITY_CMD_HH +#define _BREAKAFFINITY_CMD_HH #include #include -#include "breakafinity.hh" +#include "breakaffinity.hh" #include "ba_config.hh" -namespace BreakAfinity { +namespace BreakAffinity { - class BreakAfinity { + class BreakAffinity { private: BreakerConfig _config; public: - BreakAfinity(); + BreakAffinity(); void init(int argc, char ** argv); void loadFiles(); void run(); diff --git a/src/tools/ba_config.cpp b/src/tools/ba_config.cpp index 7df89a9..7079d1c 100644 --- a/src/tools/ba_config.cpp +++ b/src/tools/ba_config.cpp @@ -2,7 +2,7 @@ #include "ba_config.hh" #include "file_loader.hh" -namespace BreakAfinity { +namespace BreakAffinity { void BreakerConfig::setMode(char * m){ switch(m[0]){ case 'v': diff --git a/src/tools/ba_config.hh b/src/tools/ba_config.hh index 6bc0950..f3d6e8f 100644 --- a/src/tools/ba_config.hh +++ b/src/tools/ba_config.hh @@ -1,5 +1,5 @@ -#ifndef _BREAKAFINITY_CONFIG_HH -#define _BREAKAFINITY_CONFIG_HH +#ifndef _BREAKAFFINITY_CONFIG_HH +#define _BREAKAFFINITY_CONFIG_HH #include #include @@ -8,9 +8,9 @@ #include "alphabet.hh" #include "text.hh" -using namespace LibCryptAfinity; +using namespace LibCryptAffinity; -namespace BreakAfinity { +namespace BreakAffinity { class BreakerConfig { private: bool _modeVigenere; diff --git a/src/tools/ba_vigenere.cpp b/src/tools/ba_vigenere.cpp index b615f1c..ee14ac3 100644 --- a/src/tools/ba_vigenere.cpp +++ b/src/tools/ba_vigenere.cpp @@ -4,9 +4,9 @@ #define DEBUG 0 -namespace BreakAfinity { +namespace BreakAffinity { - void BreakAfinity::runVigenere(){ + void BreakAffinity::runVigenere(){ MathTools mt; CodecVigenere codec; FreqAnalyser fa; @@ -17,7 +17,7 @@ namespace BreakAfinity { int alpha_size = this->_config.getAlphabet().size(); // 1 - repérer les mots qui se répentent - pDEBUG("BreakAfinity::run","analysing %s\n",cypherText.toString().c_str()); + pDEBUG("BreakAffinity::run","analysing %s\n",cypherText.toString().c_str()); KeyVigenere key; TextCounter fst; TextCounter sec; @@ -49,7 +49,7 @@ namespace BreakAfinity { // 2 - on en déduit la longueur de la clef key_len = mt.pgcd(dist1,dist2); - pDEBUG("BreakAfinity::run","PGCD(%d, %d) = %d\n", dist1, dist2, key_len); + pDEBUG("BreakAffinity::run","PGCD(%d, %d) = %d\n", dist1, dist2, key_len); // 3 - on calcule le décalage par colonne std::list::iterator pI; diff --git a/src/tools/breakaffinity.hh b/src/tools/breakaffinity.hh new file mode 100644 index 0000000..fc92bd8 --- /dev/null +++ b/src/tools/breakaffinity.hh @@ -0,0 +1,8 @@ +#ifndef _BREAKAFFINITY_HH +#define _BREAKAFFINITY_HH + +#include "breakaffinity_global.hh" +#include "breakaffinity_iface.hh" +#include "breakaffinity_proto.hh" + +#endif diff --git a/src/tools/breakafinity_global.hh b/src/tools/breakaffinity_global.hh similarity index 78% rename from src/tools/breakafinity_global.hh rename to src/tools/breakaffinity_global.hh index 2cd6fe8..37a5810 100644 --- a/src/tools/breakafinity_global.hh +++ b/src/tools/breakaffinity_global.hh @@ -1,10 +1,10 @@ -#ifndef _BREAKAFINITY_GLOBAL_HH -#define _BREAKAFINITY_GLOBAL_HH +#ifndef _BREAKAFFINITY_GLOBAL_HH +#define _BREAKAFFINITY_GLOBAL_HH #include #include -#include "cryptafinity.hh" +#include "cryptaffinity.hh" #define COLOR_GREEN "\x1B[33m" #define COLOR_NORMAL "\x1B[0m" diff --git a/src/tools/breakaffinity_iface.hh b/src/tools/breakaffinity_iface.hh new file mode 100644 index 0000000..cf6c73d --- /dev/null +++ b/src/tools/breakaffinity_iface.hh @@ -0,0 +1,4 @@ +#ifndef _BREAKAFFINITY_IFACE_HH +#define _BREAKAFFINITY_IFACE_HH + +#endif diff --git a/src/tools/breakafinity_proto.hh b/src/tools/breakaffinity_proto.hh similarity index 54% rename from src/tools/breakafinity_proto.hh rename to src/tools/breakaffinity_proto.hh index c4f8278..c610b7e 100644 --- a/src/tools/breakafinity_proto.hh +++ b/src/tools/breakaffinity_proto.hh @@ -1,5 +1,5 @@ -#ifndef _BREAKAFINITY_PROTO_HH -#define _BREAKAFINITY_PROTO_HH +#ifndef _BREAKAFFINITY_PROTO_HH +#define _BREAKAFFINITY_PROTO_HH #include "ba_cmd.hh" #include "ba_config.hh" diff --git a/src/tools/breakafinity.hh b/src/tools/breakafinity.hh deleted file mode 100644 index d9eff86..0000000 --- a/src/tools/breakafinity.hh +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _BREAKAFINITY_HH -#define _BREAKAFINITY_HH - -#include "breakafinity_global.hh" -#include "breakafinity_iface.hh" -#include "breakafinity_proto.hh" - -#endif diff --git a/src/tools/breakafinity_iface.hh b/src/tools/breakafinity_iface.hh deleted file mode 100644 index 64c4099..0000000 --- a/src/tools/breakafinity_iface.hh +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _BREAKAFINITY_IFACE_HH -#define _BREAKAFINITY_IFACE_HH - -#endif diff --git a/src/tools/file_loader.cpp b/src/tools/file_loader.cpp index f021241..d7670cf 100644 --- a/src/tools/file_loader.cpp +++ b/src/tools/file_loader.cpp @@ -1,9 +1,9 @@ #include "file_loader.hh" -using namespace LibCryptAfinity; +using namespace LibCryptAffinity; -namespace BreakAfinity { +namespace BreakAffinity { std::vector FileLoader::loadPriorities( std::map reverse_alpha, std::string filename){ diff --git a/src/tools/file_loader.hh b/src/tools/file_loader.hh index a00dc6d..5886785 100644 --- a/src/tools/file_loader.hh +++ b/src/tools/file_loader.hh @@ -10,9 +10,9 @@ #include "alphabet.hh" #include "text.hh" -using namespace LibCryptAfinity; +using namespace LibCryptAffinity; -namespace BreakAfinity{ +namespace BreakAffinity{ class FileLoader { private: public: diff --git a/src/tools/main.cpp b/src/tools/main.cpp index dd93585..95940e8 100644 --- a/src/tools/main.cpp +++ b/src/tools/main.cpp @@ -1,11 +1,11 @@ -#include "breakafinity.hh" +#include "breakaffinity.hh" #include "ba_cmd.hh" -using namespace BreakAfinity; +using namespace BreakAffinity; int main(int argc, char ** argv){ - ::BreakAfinity::BreakAfinity br_af; + ::BreakAffinity::BreakAffinity br_af; br_af.init(argc, argv); br_af.loadFiles();