Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410).

- adds turtle router as a generic tunneling service
- made ftServer a client of the service. Now turtle file items are handled in ftServer
- added new client: p3MsgService to send/recv pgp-encrypted distant messages
- added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels.
- The GUI is disabled for now, since it needs some polishing before being fully usable.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6411 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/tests/network_simulator/MonitoredTurtle.h

@@ -4,7 +4,7 @@ class MonitoredTurtleRouter: public p3turtle
 {
 	public:
 		MonitoredTurtleRouter(p3LinkMgr *lmgr,ftServer *fts)
-			: p3turtle(lmgr,fts)
+			: p3turtle(lmgr)
 		{
 		}
 

libretroshare/src/tests/network_simulator/Network.cpp

@@ -172,7 +172,7 @@ void PeerNode::provideFileHash(const std::string& hash)
 void PeerNode::manageFileHash(const std::string& hash)
 {
 	_managed_hashes.insert(hash) ;
-	_turtle->monitorFileTunnels("file 1",hash,10000) ;
+	_turtle->monitorTunnels(hash,_ftserver) ;
 }
 
 void PeerNode::getTrafficInfo(NodeTrafficInfo& info)

libretroshare/src/tests/network_simulator/Network.h

@@ -47,6 +47,7 @@ class PeerNode
 	private:
 		p3ServiceServer *_service_server ;
 		MonitoredTurtleRouter *_turtle ;
+		ftServer *_ftserver ;
 		std::string _id ;
 
 		std::set<TurtleFileHash> _provided_hashes ;

libretroshare/src/tests/util/Makefile

@@ -9,8 +9,8 @@ OPS_TOP_DIR = ../../../../openpgpsdk/src
 include $(RS_TOP_DIR)/tests/scripts/config.mk
 ###############################################################
 
-TESTOBJ  = dirtest.o sha1_test.o
-TESTS  = dirtest sha1_test
+TESTOBJ  = dirtest.o sha1_test.o aes_test.o dchat_decrypt.o
+TESTS  = dirtest sha1_test aes_test dchat_decrypt
 
 all: tests
 
@@ -18,6 +18,10 @@ sha1_test: sha1_test.o
 	$(CC) $(CFLAGS) -o sha1_test sha1_test.o $(LIBS)
 dirtest: dirtest.o 
 	$(CC) $(CFLAGS) -o dirtest dirtest.o $(LIBS)
+dirtest: aes_test.o 
+	$(CC) $(CFLAGS) -o aes_test aes_test.o $(LIBS)
+dchat_decrypt: dchat_decrypt.o 
+	$(CC) $(CFLAGS) -o dchat_decrypt dchat_decrypt.o $(LIBS)
 
 ###############################################################
 include $(RS_TOP_DIR)/tests/scripts/rules.mk

libretroshare/src/tests/util/aes_test.cc

@@ -0,0 +1,115 @@
+
+/*
+ * "$Id: dirtest.cc,v 1.1 2007-02-19 20:08:30 rmf24 Exp $"
+ *
+ * RetroShare C++ Interface.
+ *
+ * Copyright 2012-2012 by Cyril Soler
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+
+
+#include "util/rsaes.h"
+#include "util/utest.h"
+#include <common/argstream.h>
+
+#include <iostream>
+#include <list>
+#include <string>
+#include <stdio.h>
+
+void printHelp(int argc,char *argv[])
+{
+	std::cerr << argv[0] << ": tests AES encryption/decryption functions." << std::endl;
+	std::cerr << "Usage: " << argv[0] << std::endl ;
+}
+
+void printHex(unsigned char *data,uint32_t length)
+{
+	static const char outh[16] = { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' } ;
+	static const char outl[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' } ;
+
+	for(uint32_t j = 0; j < length; j++)
+	{
+		std::cerr << outh[ (data[j]>>4) ] ;
+		std::cerr << outh[ data[j] & 0xf ] ;
+	}
+}
+
+
+INITTEST() ;
+
+int main(int argc,char *argv[])
+{
+	std::string inputfile ;
+	argstream as(argc,argv) ;
+
+	as >> help() ;
+
+	as.defaultErrorHandling() ;
+
+	std::cerr << "Testing AES crypt" << std::endl;
+
+	std::string source_string = "This is a very secret string, but ultimately it will always be decyphered" ;
+	std::cerr << "Input string: length=" << source_string.length() << ", s=\"" << source_string << "\"" << std::endl;
+
+	unsigned char key_data[16] ;
+	unsigned char salt[8] ;
+
+	for(int i=0;i<16;++i)
+		key_data[i] = lrand48() & 0xff ;
+
+	std::cerr << "Key: " ; printHex(key_data,16);
+	std::cerr << std::endl;
+
+	for(int i=5;i<source_string.length();++i)
+	{
+		for(int j=0;j<8;++j)
+			salt[j] = lrand48() & 0xff ;
+
+		std::string S(source_string.c_str(),i) ;
+
+		unsigned char output_data[S.size() + 16] ;
+		uint32_t output_data_length = S.size() + 16 ;
+
+		CHECK(RsAES::aes_crypt_8_16( (const uint8_t*)S.c_str(),S.length(),key_data,salt,output_data,output_data_length)) ;
+
+		std::cerr << "Round " << i << " salt=" ;
+		printHex(salt,8) ;
+		std::cerr << ": real_length = " << S.length() << ", output_length = " << output_data_length << ", encrypted string = " ;
+		printHex(output_data,output_data_length) ;
+		std::cerr << std::endl;
+
+		unsigned char output_data2[output_data_length + 16] ;
+		uint32_t output_data_length2 = output_data_length + 16 ;
+
+		CHECK(RsAES::aes_decrypt_8_16(output_data,output_data_length,key_data,salt,output_data2,output_data_length2)) ;
+
+		std::cerr << "                                output_length = " << output_data_length2 << ", decrypted string = " ;
+		printHex(output_data2,output_data_length2) ;
+		std::cerr << std::endl;
+	
+		CHECK(std::string( (const char *)output_data2,output_data_length2) == S) ;
+	}
+
+	FINALREPORT("AESTest") ;
+	return TESTRESULT() ;
+}
+