Merge pull request #6 from magnumripper/master

alphabetCreator: Allow missing -a option, defaulting to /dev/null

.editorconfig

@@ -0,0 +1,16 @@
+# top-most EditorConfig file, enforcing some of the code style
+#
+# See http://editorconfig.org for a plugin to your editor!
+#
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+
+[makefile]
+indent_style = tab

.gitignore

@@ -1,2 +1,21 @@
 # C extensions
 *.so
+*.o
+CP.level
+EP.level
+IP.level
+LN.level
+alphabetCreator
+charFrequency.txt
+createConfig
+enumNG
+evalPW
+results/
+src/cmdlineAlphabetCreator.c
+src/cmdlineAlphabetCreator.h
+src/cmdlineCreateNG.c
+src/cmdlineCreateNG.h
+src/cmdlineEnumNG.c
+src/cmdlineEnumNG.h
+src/cmdlineEvalPW.c
+src/cmdlineEvalPW.h

src/alphabetCreator.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * alphabetCreator.c
  * @authors: Fabian Angelstorf, Franziska Juckel
  * @copyright: Horst Goertz Institute for IT-Security, Ruhr-University Bochum

src/alphabetCreator.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * alphabetCreator.h
  * @authors: Fabian Angelstorf, Franziska Juckel
  * @copyright: Horst Goertz Institute for IT-Security, Ruhr-University Bochum
@@ -7,20 +7,20 @@
 #ifndef ALPHABETCREATOR_H_
 #define ALPHABETCREATOR_H_
 
-/* 
+/*
  * initializes all global parameters, setting them to their default value
  * !! this function must be called before any other operation !!
  */
 void initialize ();
 
-/* 
+/*
  *  prints all Error-Messages (if any), clears the allocated memory of the
  *  global variables and ends the application
  *  !! this function is set via atexit() !!
  */
 void exit_routine ();
 
-/* 
+/*
  * prints the by arguments selected mode as well as the output and input filenames
  */
 void print_settings ();

src/attackSimulator.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * attackSimulator.c
  * @authors: Fabian Angelstorf, Franziska Juckel
  * @copyright: Horst Goertz Institute for IT-Security, Ruhr-University Bochum

src/attackSimulator.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * attackSimulator.h
  * @authors: Fabian Angelstorf, Franziska Juckel
  * @copyright: Horst Goertz Institute for IT-Security, Ruhr-University Bochum
@@ -15,7 +15,7 @@
 extern uint64_t glbl_crackedCount;
 extern float glbl_crackedRatio;
 
-/* 
+/*
  * Generates a "testing set" based on the passwords found in the
  * given @filename. If an error occurs FALSE is returned.
  * The passwords of the "testing set" are stored in the global variable
@@ -26,19 +26,19 @@ bool simAtt_generateTestingSet (const char *filename, // filename to the file co
                                 const char *resultFolder, // folder for the result files
                                 int outputCycle); // every x crack try should be added to the graph
 
-/* 
+/*
  * Frees any memory allocated by the attack simulator
  */
 void simAtt_freeTestingSet ();
 
-/* 
+/*
  * Checks if the "testing set" (glbl_testingSet) contains the given @password.
  * Returns TRUE, if the password is part of the testing set or false if not.
  */
 bool simAtt_checkCandidate (const char *const password, // the password to be checked out
                             int length);  // the length of the password
 
-/* 
+/*
  * This functions prints the results of a simulated attack
  * to the given file pointer (i.e. stdout or log-file).
  * If @additionalInfo is TRUE, the additional infomration will

src/boosting.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * boosting.c
  * @authors: Fabian Angelstorf, Franziska Juckel
  * @copyright: Horst Goertz Institute for IT-Security, Ruhr-University Bochum
@@ -286,7 +286,7 @@ void boost (nGram_struct * nGrams, const alphabet_struct * const alph, const int
   }
 }
 
-/* 
+/*
  * undo the changes by boost()
  */
 void deboost (nGram_struct * nGrams)

src/boosting.h

@@ -1,4 +1,4 @@
-/* 
+/*
  * boosting.h
  * @authors: Fabian Angelstorf, Franziska Juckel
  * @copyright: Horst Goertz Institute for IT-Security, Ruhr-University Bochum
@@ -9,12 +9,12 @@
 
 #include "commonStructs.h"
 
-/* 
+/*
  * Reads boosting factor alpha from file in return array.
  */
 int *read_alphas (char *filename, int *alpha_count);
 
-/* 
+/*
  * Reads hints from file in return array.
  */
 char **read_hints (char *filename, int alpha_count, int hint_count);