1 files changed, 9 insertions, 11 deletions

diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index 626b202e..2fe5f84e 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -28,9 +28,6 @@
 
 #include "chat.h"
 
-GNUNET_RSA_PublicKey pub_key;
-const struct GNUNET_RSA_PrivateKey *priv_key;
-
 static struct GNUNET_ClientServerConnection *sock;
 
 static struct GNUNET_Mutex *lock;
@@ -230,10 +227,9 @@ init_chat (struct GNUNET_GE_Context *ectx,
   chat_cfg = cfg;
   room_member_list = NULL;
 
-  /*GNUNET_disable_entropy_gathering (); */
-  /* FIXME: yes G, read key from disk */
-  priv_key = GNUNET_RSA_create_key ();
-  GNUNET_RSA_get_public_key (priv_key, &pub_key);
+  
+  /*priv_key = GNUNET_RSA_create_key ();
+  GNUNET_RSA_get_public_key (priv_key, &pub_key);*/
 
   sock = GNUNET_client_connection_create (chat_ectx, chat_cfg);
   lock = GNUNET_mutex_create (GNUNET_NO);
@@ -298,14 +294,16 @@ create_chat_room_tab (char *room_name, char *nick)
   client = GNUNET_malloc (sizeof (struct GNUNET_CHAT_gui_chat_client));
   client->room_name = GNUNET_malloc (strlen (room_name));
   strcpy (client->room_name, room_name);
-
+        
+        client->priv_key = NULL;
+  client->priv_key = GNUNET_CHAT_initPrivateKey (chat_ectx,chat_cfg,room_name,&client->pub_key);
 
   /* We do a silly strdup later on member_info... either check for NULL or only pass "" for member_info!! */
   chatRoom =
-    GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick, room_name, &pub_key,
-                           priv_key, "", &receive_callback, client,
+    GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick, room_name, &client->pub_key,
+                           client->priv_key, "", &receive_callback, client,
                            &member_list_callback, client);
-
+                           
   client->room = chatRoom;
   client->chatFrame = newChatWindow;
   client->number =