- crypto updated to openssl 1.0.1

- sending eof when write eof is true fixing nosteg_rr.
- http steg is working.

.gitignore

@@ -37,8 +37,18 @@
 #/config-aux/missing
 #/config-aux/compile
 config-aux/ltmain.sh
-config-aux/*.m4
+#config-aux/*.m4 boost files are here
+config-aux/config.sub
+config-aux/config.guess
+#automatcally generated by libtool
+config-aux/libtool.m4
+config-aux/ltoptions.m4
+config-aux/ltsugar.m4
+config-aux/ltversion.m4
+config-aux/lt~obsolete.m4
 
+#for some reason our m4 files are in config-aux folder
+/m4
 
 /protolist.cc
 /steglist.cc

Makefile.am

@@ -53,9 +53,9 @@ libstegotorus_a_SOURCES = \
 	src/socks.cc \
 	src/steg.cc \
 	src/util.cc \
-	src/strncasestr.cc \
-	src/util-net.cc \
 	src/evbuf_util.cc \
+	src/util-net.cc \
+	src/strncasestr.cc \
 	src/curl_util.cc \
 	src/transparent_proxy.cc \
 	$(PROTOCOLS) $(STEGANOGRAPHERS)
@@ -71,7 +71,9 @@ nodist_libstegotorus_a_SOURCES = protolist.cc steglist.cc
 stegotorus_SOURCES = \
 	src/main.cc
 
-stegotorus_LDADD = libstegotorus.a $(lib_LIBS)
+stegotorus_LDADD = libstegotorus.a $(lib_LIBS) \
+	$(BOOST_FILESYSTEM_LIB) \
+	$(BOOST_SYSTEM_LIB)
 
 # prevent stegotorus from being linked if s-a-g fails
 # it is known that $(lib_LIBS) contains nothing that needs to be depended upon
@@ -115,7 +117,9 @@ unittests_SOURCES = \
 
 nodist_unittests_SOURCES = unitgrplist.cc
 
-unittests_LDADD = libstegotorus.a $(lib_LIBS)
+unittests_LDADD = libstegotorus.a $(lib_LIBS) \
+	$(BOOST_FILESYSTEM_LIB) \
+	$(BOOST_SYSTEM_LIB)
 
 GTEST_SOURCES = \
 	src/test/gtest/gtest_main.cc \
@@ -127,7 +131,10 @@ g_unittests_SOURCES = \
 	src/test/steg_test/payload_scraper_unittest.cc
 
 
-g_unittests_LDADD = libstegotorus.a $(lib_LIBS) -lpthread
+g_unittests_LDADD = libstegotorus.a $(lib_LIBS) -lpthread \
+	$(BOOST_FILESYSTEM_LIB) \
+	$(BOOST_SYSTEM_LIB)
+
 
 #g_unittests_LDFLAGS = \
 #	-lgtest_main \
@@ -182,7 +189,7 @@ EXTRA_DIST = doc \
 	src/test/test_tl.py
 
 #tester_proxy_CPPFLAGS = $(libevent_openssl_CPPFLAGS) $(libssl_CPPFLAGS)
-tester_proxy_LDADD = $(libevent_openssl_LIBS) $(libssl_LIBS)
+tester_proxy_LDADD = $(libevent_openssl_LIBS) $(libssl_LIBS) $(lib_LIBS)
 
 tester_proxy_SOURCES = src/test/tester_proxy/tester_proxy.cc
 

conf.d/chop-http-trace-server.yaml

@@ -14,7 +14,6 @@ protocols:
     passphrase: "correct passphrase"
     trace-packets: true
     enable-retransmit: true
-    cover-server: 66.135.46.119:80 #funny cat 
     up-address: 127.0.0.1:5001
     stegs:
       - name: "http"

conf.d/chop-nosteg-client.yaml

@@ -1,7 +1,7 @@
 ####################################
 # process options
 ####################################
-log-min-severity:  info
+log-min-severity:  debug
 timestamp-logs: true
 
 ####################################

conf.d/chop-nosteg-rr-client.yaml

@@ -0,0 +1,17 @@
+####################################
+# process options
+####################################
+log-min-severity:  debug
+timestamp-logs: true
+
+####################################
+# protocol specification for client
+####################################
+protocols:
+  - name: "chop"
+    mode: client
+    up-address: 127.0.0.1:4999
+    disable-retransmit: true 
+    stegs:
+      - name: nosteg_rr
+        down-address: 127.0.0.1:5000

conf.d/chop-nosteg-rr-server.yaml

@@ -0,0 +1,17 @@
+####################################
+# process options
+####################################
+log-min-severity:  debug
+timestamp-logs: true
+
+####################################
+# protocol specification for client
+####################################
+protocols:
+  - name: "chop"
+    mode: server
+    up-address: 127.0.0.1:5001
+    disable-retransmit: true
+    stegs:
+      - name: nosteg_rr
+        down-address: 127.0.0.1:5000

conf.d/chop-nosteg-server.yaml

@@ -0,0 +1,17 @@
+####################################
+# process options
+####################################
+log-min-severity:  info
+timestamp-logs: true
+
+####################################
+# protocol specification for client
+####################################
+protocols:
+  - name: "chop"
+    mode: server
+    up-address: 127.0.0.1:5001
+    disable-retransmit: true
+    stegs:
+      - name: nosteg
+        down-address: 127.0.0.1:5000