Started packaging a .deb for amd64 1.6

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ansvif 1.5.3.
+# Generated by GNU Autoconf 2.69 for ansvif 1.6.
 #
 # Report bugs to <[email protected]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ansvif'
 PACKAGE_TARNAME='ansvif'
-PACKAGE_VERSION='1.5.3'
-PACKAGE_STRING='ansvif 1.5.3'
+PACKAGE_VERSION='1.6'
+PACKAGE_STRING='ansvif 1.6'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1287,7 +1287,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ansvif 1.5.3 to adapt to many kinds of systems.
+\`configure' configures ansvif 1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1354,7 +1354,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ansvif 1.5.3:";;
+     short | recursive ) echo "Configuration of ansvif 1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1447,7 +1447,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ansvif configure 1.5.3
+ansvif configure 1.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1795,7 +1795,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ansvif $as_me 1.5.3, which was
+It was created by ansvif $as_me 1.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4753,7 +4753,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ansvif'
- VERSION='1.5.3'
+ VERSION='1.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5672,7 +5672,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ansvif $as_me 1.5.3, which was
+This file was extended by ansvif $as_me 1.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5729,7 +5729,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ansvif config.status 1.5.3
+ansvif config.status 1.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([ansvif], [1.5.3], [[email protected]])
+AC_INIT([ansvif], [1.6], [[email protected]])
 AC_PROG_CC
 AC_PROG_CXX
 AC_LANG([C++])

src/linux/main.cpp

@@ -120,7 +120,7 @@ int main(int argc, char *argv[]) { // initialize our main
     debug = false, is_other = false, dump_opts = false, never_rand = false,
     valgrind = false, single_try = false, percent_sign = false;
   /* what version of ansvif are we running? */
-    std::string ver = "1.5.3";
+    std::string ver = "1.6";
   /* first off we're going to start the signal handler incase they
    * do ctrl+c or something
    */

src/match_seg.cpp

@@ -361,35 +361,9 @@ bool match_seg(int buf_size, std::vector<std::string> opts,
 	   std::thread reaper_thread(reaper, pid, t_timeout);
       /* takes care of the reaper thread */
       reaper_thread.detach();
-	  #endif
-//      #endif
-/*	  #ifdef _WIN32
-//	        int pid;
-      FILE *fp = popen2_win(out_str);
-      char command_out[4096] = {0};
-      std::stringstream output;
-      while (read(fileno(fp), command_out, sizeof(command_out) - 1) != 0) {
-        output << std::string(command_out);
-        /* make sure we don't overflow */
-/*
-        memset(&command_out, 0, sizeof(command_out));
-      }
-      /* close out the command cleanly */
-//      pclose2_win(fp);
-
-      /* this here takes care of the command that is run after 
-       * the fuzz
-       */
- //     int run_com_pid;
-/*
- if (run_command != "") {
-        FILE *fp = popen2_win(run_command);
-        pclose2_win(fp);
-      }
-	  #endif
+      #endif
       /* our output will be stored here! */
       std::string cmd_output;
-
       if (write_file_n != "") {
       #ifdef __linux
 	  std::ostringstream pid_as_s;
@@ -478,7 +452,7 @@ bool match_seg(int buf_size, std::vector<std::string> opts,
           }
           if (write_to_file == true) {
             /* logging hangs */
-			#ifdef __linux
+            #ifdef __linux
             std::ostringstream pid_as_s;
             pid_as_s << pid;
             #endif

src/win/bin2hex.cpp

@@ -15,22 +15,28 @@
 #include <string>
 
 std::string binstr_to_hex(std::string bin_str) {
-  std::stringstream hex_out; // initialize the hex to go out
-  std::string hexxy;         // initalize our string to put it in
+  /* initialize the hex to go out */
+  std::stringstream hex_out;
+  /* initialize our string to put it in with a filler of
+   * zero and upercase hexadecimal with a width of 2
+   */
+  std::string hexxy;
   hex_out << std::setw(2) << std::setfill('0') << std::hex
-          << std::uppercase; // set the filler to 0, uppercase hexadecimal and
-                             // width 2.
+          << std::uppercase;
   std::copy(bin_str.begin(), bin_str.end(),
             std::ostream_iterator<unsigned int>(
-                hex_out, "\\x")); // for each of them, go put the \\x infront
-                                  // for the output to go to printf
-  if (hex_out.str() != "") {      // if we don't have anything in the buffer
-    hexxy = hex_out.str() + "20"; // put a space
+                hex_out, "\\x"));
+  if (hex_out.str() != "") {
+    /* if we don't have anything in the buffer throw
+     * a space in
+     */
+    hexxy = hex_out.str() + "20";
   }
   hexxy = "\\x" + hexxy;
   if (hexxy == "\\x20\\x20") {
     return "";
   } else {
-    return (hexxy); // return to sys_string in hex to be put into printf
+    /* return to be fed into printf */
+    return (hexxy);
   }
 }

src/win/bin2hex_pc.cpp

@@ -15,22 +15,29 @@
 #include <string>
 
 std::string binstr_to_hex_pc(std::string bin_str) {
-  std::stringstream hex_out; // initialize the hex to go out
-  std::string hexxy;         // initalize our string to put it in
+  /* initialize the hex to go out */
+  std::stringstream hex_out;
+  /* initialize our string to put it in with a filler of
+   * zero and upercase hexadecimal with a width of 2
+   */
+  std::string hexxy;
   hex_out << std::setw(2) << std::setfill('0') << std::hex
-          << std::uppercase; // set the filler to 0, uppercase hexadecimal and
-                             // width 2.
+          << std::uppercase;
+  /* for each of them put a % in front for the output to printf
+   * if we don't have anything in the buffer then we'll just put
+   * a space
+   */
   std::copy(bin_str.begin(), bin_str.end(),
             std::ostream_iterator<unsigned int>(
-                hex_out, "%"));   // for each of them, go put the % infront
-                                  // for the output to go to printf
-  if (hex_out.str() != "") {      // if we don't have anything in the buffer
-    hexxy = hex_out.str() + "20"; // put a space
+                hex_out, "%"));
+  if (hex_out.str() != "") {
+    hexxy = hex_out.str() + "20";
   }
   hexxy = "%" + hexxy;
   if (hexxy == "%20%20") {
     return "";
   } else {
-    return (hexxy); // return to sys_string in hex to be put into printf
+    /* return the hex */
+    return (hexxy);
   }
 }

src/win/help.cpp

@@ -4,12 +4,18 @@
  * Marshall Whittaker / oxagast
  */
 
+//    __ _  _  __   ___  __  ____ ____ 
+//   /  ( \/ )/ _\ / __)/ _\/ ___(_  _)
+//  (  O )  (/    ( (_ /    \___ \ )(  
+//   \__(_/\_\_/\_/\___\_/\_(____/(__)
+
 #include <cstdlib>
 #include <iostream>
 #include <stdio.h>
 #include <string>
 
 void help_me(std::string mr_me, std::string ver) {
+  /* print all the help shit to STDOUT */
   std::cout
       << "ansvif v" << ver << " -- A Not So Very Intelligent Fuzzer"
       << std::endl
@@ -79,7 +85,9 @@ void help_me(std::string mr_me, std::string ver) {
       << " -P           Use % to represent binary in fuzz." << std::endl
       << " -v           Verbose." << std::endl
       << " -d           Debug."
-      << std::endl; // write all this help file shit out to STDOUT
-  exit(1); // exit with error 1 because we didn't really do anything but print
-           // help...
+      << std::endl;
+    /* exit with an error because we didn't do anything but
+     * print a help page
+     */
+    exit(1);
 }

src/win/main.cpp

@@ -42,6 +42,7 @@ std::vector<std::string> get_other(std::string filename, bool verbose,
 void write_seg(std::string filename, std::string seg_line);
 
 int main(int argc, char *argv[]) { // initialize our main
+  /* initial random seed for all our randomization mess */
   srand(time(NULL));
   int opt;                         // initialize opt for how many options
   int num_threads = 2;             // how many threads are we using?

src/win/man_read.cpp

@@ -21,6 +21,7 @@ bool file_exists(const std::string &filen);
 std::vector<std::string> get_flags_man(std::string man_page,
                                        std::string man_loc, bool verbose,
                                        bool debug, bool dump_opts) {
+  /* just error out :( */
   std::cout << "Not implemented in Windows, sorry..." << std::endl;
   exit(1);
 }