algo_suite: definition moved to a better place

src/algo_suite.h

@@ -19,7 +19,10 @@
 #ifndef _ccr_algo_suite_h_
 #define _ccr_algo_suite_h_
 
-#include "algorithm.h"
+#include <map>
+#include <string>
+class algorithm;
+typedef std::map<std::string, algorithm*> algorithm_suite;
 
 void fill_algorithm_suite (algorithm_suite&);
 

src/algorithm.h

@@ -19,15 +19,11 @@
 #ifndef _ccr_algorithm_h_
 #define _ccr_algorithm_h_
 
+#include "algo_suite.h"
 #include "bvector.h"
 #include "prng.h"
 #include "sencode.h"
 
-#include <map>
-#include <string>
-class algorithm;
-typedef std::map<std::string, algorithm*> algorithm_suite;
-
 /*
  * virtual interface definition for all cryptographic algorithm instances.
  *

src/main.cpp

@@ -99,11 +99,12 @@ void test()
 
 #include <getopt.h>
 
-#include "keyring.h"
+#include "actions.h"
 #include "algo_suite.h"
 
 int main (int argc, char**argv)
 {
+	//option variables
 	bool do_help = false,
 	     do_version = false,
 	     do_test = false,
@@ -122,7 +123,6 @@ int main (int argc, char**argv)
 
 	char action = 0;
 
-	//process options
 	int c, option_index;
 	for (;;) {
 		static struct option long_opts[] = {