fix in length and nullcypher (still not working)

5 files changed, 12 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index 9e5c414..3ba33b4 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ OBJS = anytun.o \
 
 EXECUTABLE = anytun
 
-all: $(EXECUTABLE)
+all: $(EXECUTABLE) libAnysync.a
 
 anytun: $(OBJS)
 	$(LD) $(OBJS) -o $@ $(LDFLAGS)
@@ -170,6 +170,13 @@ router.o: router.cpp router.h
 anytun.o: anytun.cpp
 	$(C++) $(CCFLAGS) $< -c
 
+cConnectionParam.o: cConnectionParam.cpp
+	$(C++) $(CCFLAGS) $< -c
+
+libAnysync.a: $(OBJS)
+	ar cru $@ $(OBJS)
+	ranlib $@
+
 clean:
 	rm -f *.o
 	rm -f $(EXECUTABLE)
diff --git a/anytun.cpp b/anytun.cpp
index 8d2f1ac..3ef2389 100644
--- a/anytun.cpp
+++ b/anytun.cpp
@@ -141,12 +141,12 @@ void* sender(void* p)
   u_int16_t mux = 0;
   while(1)
   {
-    packet.setLength( packet.getSize() );
-    plain_packet.setLength( plain_packet.getSize() );
+    plain_packet.setLength( 1600);
 
     // read packet from device
     u_int32_t len = param->dev.read(plain_packet);
     plain_packet.setLength(len);
+    packet.setLength( packet.getSize() );
 
     if( param->cl.empty())
       continue;
diff --git a/cypher.cpp b/cypher.cpp
index 71f064d..d5ca35b 100644
--- a/cypher.cpp
+++ b/cypher.cpp
@@ -44,7 +44,7 @@ void NullCypher::cypher(Buffer& out, Buffer& in, u_int32_t length, seq_nr_t seq_
 {
   try
   {
-    for(u_int32_t i; i<length; ++i)
+    for(u_int32_t i=0; i<length; ++i)
       out[i] = in[i];
   }
   catch(std::out_of_range& o) {}
diff --git a/keyexchange/isakmpd_20041012-4.dsc b/keyexchange/isakmpd_20041012-4.dsc
index a36f50a..7a170ba 100644
--- a/keyexchange/isakmpd_20041012-4.dsc
+++ b/keyexchange/isakmpd_20041012-4.dsc
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 Format: 1.0
 Source: isakmpd
 Version: 20041012-4
@@ -10,17 +7,4 @@ Architecture: any
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 5), libkeynote-dev, libssl-dev, libgmp3-dev, libpcap-dev, linux-kernel-headers
 Files: 
- e6d25a9e232fb186e1a48dc06453bd57 373941 isakmpd_20041012.orig.tar.gz
- 3256d8ef06f5e26649651760c0750726 32679 isakmpd_20041012-4.diff.gz
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iQEVAwUBRP6sIMP9a9GOLSE6AQJQ5Qf+JpIWbwjsD2KJs+hxJmdjqDV440JpxMpQ
-SZdAP0jFnw9zBQe/L06k7c3aSG/DH3yJJt8yuyWoArUi1EOBPEk6c42WkuaAU86T
-kDT8XE8lLYXFQOv1hm4Wl9VIo/rydLk3Hx+grwXi6g6H92xHqz8NdDLtO/dpYri6
-XjrwLEjJeeGnPOI/STEIhB7oym4+gmXCS7WVTXM+AOJ1b2tTf+vBmDnRLc8kj+LN
-8Gseni1gWr00KHtxndCuHugtDOG8aPeCELrYk4uelacj/9aB2vzViQOb6WMYrnQS
-I8DPuSjOfArPxa1wthq4GDCiEX6bqi1wbtC3qsPaoxBj/OBw1Qjjbw==
-=WdrG
------END PGP SIGNATURE-----
+ 18da456d6c39773a5670dc18918cafc8 775980 isakmpd_20041012-4.tar.gz
diff --git a/keyexchange/isakmpd_20041012.orig.tar.gz b/keyexchange/isakmpd_20041012.orig.tar.gz
deleted file mode 100644
index 4997fbf..0000000
--- a/keyexchange/isakmpd_20041012.orig.tar.gz
+++ /dev/null