diff --git a/libretroshare/src/services/p3chatservice.cc b/libretroshare/src/services/p3chatservice.cc index c22eda594..18c2c36f1 100644 --- a/libretroshare/src/services/p3chatservice.cc +++ b/libretroshare/src/services/p3chatservice.cc @@ -2948,6 +2948,8 @@ void p3ChatService::receiveTurtleData( RsTurtleGenericTunnelItem *gitem,const st std::cerr << " Using IV: " << std::hex << *(uint64_t*)item->data_bytes << std::dec << std::endl; std::cerr << " Decrypted buffer size: " << decrypted_size << std::endl; + std::cerr << " key : " ; printBinaryData(aes_key,16) ; std::cerr << std::endl; + std::cerr << " data : " ; printBinaryData(item->data_bytes,item->data_size) ; std::cerr << std::endl; if(!RsAES::aes_decrypt_8_16((uint8_t*)item->data_bytes+8,item->data_size-8,aes_key,(uint8_t*)item->data_bytes,decrypted_data,decrypted_size)) { @@ -3005,7 +3007,7 @@ void p3ChatService::sendTurtleData(RsChatItem *item) } it->second.last_contact = time(NULL) ; virtual_peer_id = it->second.virtual_peer_id ; - memcpy(aes_key,it->second.aes_key,8) ; + memcpy(aes_key,it->second.aes_key,DISTANT_CHAT_AES_KEY_SIZE) ; } std::cerr << "p3ChatService::sendTurtleData(): tunnel found. Encrypting data." << std::endl; @@ -3017,6 +3019,7 @@ void p3ChatService::sendTurtleData(RsChatItem *item) uint64_t IV = RSRandom::random_u64() ; // make a random 8 bytes IV std::cerr << " Using IV: " << std::hex << IV << std::dec << std::endl; + std::cerr << " Using Key: " ; printBinaryData(aes_key,16) ; std::cerr << std::endl; if(!RsAES::aes_crypt_8_16(buff,rssize,aes_key,(uint8_t*)&IV,encrypted_data,encrypted_size)) { diff --git a/libretroshare/src/tests/util/Makefile b/libretroshare/src/tests/util/Makefile index 1a1a06227..9be844a06 100644 --- a/libretroshare/src/tests/util/Makefile +++ b/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 aes_test.o -TESTS = dirtest sha1_test aes_test +TESTOBJ = dirtest.o sha1_test.o aes_test.o dchat_decrypt.o +TESTS = dirtest sha1_test aes_test dchat_decrypt all: tests @@ -20,6 +20,8 @@ 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 diff --git a/libretroshare/src/tests/util/aes_test.cc b/libretroshare/src/tests/util/aes_test.cc index 18631de7f..f7e2531fd 100644 --- a/libretroshare/src/tests/util/aes_test.cc +++ b/libretroshare/src/tests/util/aes_test.cc @@ -76,6 +76,9 @@ int main(int argc,char *argv[]) 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;iconnect(timer, SIGNAL(timeout()), this, SLOT(updateFeed())); - timer->start(1000); +// QTimer *timer = new QTimer(this); +// timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateFeed())); +// timer->start(1000); } NewsFeed::~NewsFeed() @@ -95,7 +95,7 @@ NewsFeed::~NewsFeed() } } -void NewsFeed::updateFeed() +void NewsFeed::updateDisplay() { if (!rsNotify) return; diff --git a/retroshare-gui/src/gui/NewsFeed.h b/retroshare-gui/src/gui/NewsFeed.h index 958d9bc84..d97356224 100644 --- a/retroshare-gui/src/gui/NewsFeed.h +++ b/retroshare-gui/src/gui/NewsFeed.h @@ -26,6 +26,7 @@ #include "ui_NewsFeed.h" #include "gui/feeds/FeedHolder.h" +#include class RsFeedItem; class ForumNewItem; @@ -33,7 +34,7 @@ class ChanMsgItem; class ChatMsgItem; class FeedNotify; -class NewsFeed : public MainPage, public FeedHolder, private Ui::NewsFeed +class NewsFeed : public RsAutoUpdatePage, public FeedHolder, private Ui::NewsFeed { Q_OBJECT @@ -52,6 +53,7 @@ public: static void testFeeds(uint notifyFlags); static void testFeed(FeedNotify *feedNotify); + virtual void updateDisplay(); signals: void newsFeedChanged(int count); @@ -59,7 +61,6 @@ private slots: // void toggleChanMsgItems(bool on); void feedoptions(); - void updateFeed(); void removeAll(); void itemDestroyed(QObject*);