summaryrefslogtreecommitdiffstats
path: root/friendfinder
diff options
context:
space:
mode:
authorPatrick Hornecker2010-01-15 13:40:29 +0100
committerPatrick Hornecker2010-01-15 13:40:29 +0100
commita39dc765c6dfd17afaeb8a1fce5e340feef5f7be (patch)
tree407209e0c44913f5e210fef29e2ef5a1634cb371 /friendfinder
parentadded key read from file (diff)
downloadfriendfinder-a39dc765c6dfd17afaeb8a1fce5e340feef5f7be.tar.gz
friendfinder-a39dc765c6dfd17afaeb8a1fce5e340feef5f7be.tar.xz
friendfinder-a39dc765c6dfd17afaeb8a1fce5e340feef5f7be.zip
keys are read vom from file key.pem now
Diffstat (limited to 'friendfinder')
-rw-r--r--friendfinder/msg_sender.c3
-rw-r--r--friendfinder/read_file.c6
-rw-r--r--friendfinder/receiver.c7
-rw-r--r--friendfinder/sender.c4
4 files changed, 14 insertions, 6 deletions
diff --git a/friendfinder/msg_sender.c b/friendfinder/msg_sender.c
index da304bf..4980ad1 100644
--- a/friendfinder/msg_sender.c
+++ b/friendfinder/msg_sender.c
@@ -7,6 +7,7 @@
#include "msg_sender.h"
#include "gui.h"
+#include "read_file.h"
static irc_session_t *session;
irc_callbacks_t callbacks;
@@ -140,7 +141,7 @@ void send_message(irc_session_t *session, char *msg)
void on_connect(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count)
{
char *_key = read_key();
-
+ printf("%s \n", _key);
irc_cmd_join(session, "#msg", NULL);
irc_cmd_msg(session, "#msg", "connected");
diff --git a/friendfinder/read_file.c b/friendfinder/read_file.c
index e213c04..ebd35c9 100644
--- a/friendfinder/read_file.c
+++ b/friendfinder/read_file.c
@@ -6,11 +6,11 @@ char* read_key()
FILE *fr;
int key_value;
char key_string;
- char key[300]; //supports max. key length of 300 chars!
+ char *key = (char(*)[300]) malloc(sizeof(char) * 300); //supports max keylength of 300
int i = 0;
fr = fopen ("key.pem", "rt");
-
+
if (fr == NULL)
{
printf("READ_FILE: key could not have been read \n");
@@ -28,7 +28,7 @@ char* read_key()
}
fclose(fr);
-
+
return key;
}
diff --git a/friendfinder/receiver.c b/friendfinder/receiver.c
index f92b3d2..b97e94c 100644
--- a/friendfinder/receiver.c
+++ b/friendfinder/receiver.c
@@ -6,6 +6,7 @@
#include "openssl/blowfish.h"
#include "draw_user.h"
+#include "read_file.h"
static irc_session_t *session;
irc_callbacks_t callbacks;
@@ -62,6 +63,7 @@ void dump_data(char* lat, char* lon, char* nick)
pos->lon = lon;
pos->nick = nick;
+ printf("%s || %s \n", pos->lat, pos->lon);
draw_user(pos);
}
@@ -142,7 +144,10 @@ void get_position(irc_session_t * session, const char * event, const char * orig
void on_connect_receiver(irc_session_t * session, const char * event, const char * origin, const char ** params, unsigned int count)
{
printf("RECEIVER: on_connect_receiver \n");
- BF_set_key(&key, 5, "abcde");
+
+ char *_key = read_key();
+
+ BF_set_key(&key, strlen(_key) -1, _key);
irc_cmd_join(session, "#test", NULL);
irc_cmd_msg(session, "#test", "connected");
diff --git a/friendfinder/sender.c b/friendfinder/sender.c
index d8a6159..8fc1c43 100644
--- a/friendfinder/sender.c
+++ b/friendfinder/sender.c
@@ -68,7 +68,9 @@ void send_position(irc_session_t * session, const char * event, const char * ori
if (first_send == 0)
{
- BF_set_key(&key, 5, "abcde");
+ char *_key = read_key();
+
+ BF_set_key(&key, strlen(_key) - 1, _key);
irc_cmd_join(session, "#test", NULL);
irc_cmd_msg(session, "#test", "connected");