Changeset ba5add7 for otr.c

Timestamp:

2008-02-17T01:39:39Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

82e8fe8

Parents:

fd9fa52

Message:

explicitly initialize ssl in order to avoid gnutls and libotr fighting over the global state of libgcrypt

File:

• otr.c (modified) (5 diffs)

otr.c

@@ -112 +112 @@
 
 /* main function for the forked keygen slave */
-void keygen_child_main(OtrlUserState us, int infd, int outfd);
+void keygen_child_main(const char *nick, int infd, int outfd);
 
 /* mainloop handler for when a keygen finishes */
@@ -1527 +1527 @@
                         /* child process */
                         signal(SIGTERM, exit);
-                        keygen_child_main(irc->otr->us, to[0], from[1]);
+                        keygen_child_main(irc->nick, to[0], from[1]);
                         exit(0);
                 }
@@ -1548 +1548 @@
                         kg=&((*kg)->next);
                 *kg = g_new0(kg_t, 1);
-                (*kg)->accountname = handle;
-                (*kg)->protocol = protocol;
+                (*kg)->accountname = g_strdup(handle);
+                (*kg)->protocol = g_strdup(protocol);
         } else {
                 /* send our job over and remember it */
@@ -1555 +1555 @@
                 fprintf(irc->otr->to, "%s\n%s\n", handle, protocol);
                 fflush(irc->otr->to);
-                irc->otr->sent_accountname = handle;
-                irc->otr->sent_protocol = protocol;
-        }
-}
-
-void keygen_child_main(OtrlUserState us, int infd, int outfd)
-{
+                irc->otr->sent_accountname = g_strdup(handle);
+                irc->otr->sent_protocol = g_strdup(protocol);
+        }
+}
+
+void keygen_child_main(const char *nick, int infd, int outfd)
+{
+        OtrlUserState us;
+        char *kf;
         FILE *input, *output;
         char filename[128], accountname[512], protocol[512];
         gcry_error_t e;
         int tempfd;
+        
+        us = otrl_userstate_create();
+        kf = g_strdup_printf("%s%s.otr_keys", global.conf->configdir, nick);
+        otrl_privkey_read(us, kf);
+        g_free(kf);
         
         input = fdopen(infd, "r");
@@ -1620 +1627 @@
         
         /* forget this job */
+        g_free(irc->otr->sent_accountname);
+        g_free(irc->otr->sent_protocol);
         irc->otr->sent_accountname = NULL;
         irc->otr->sent_protocol = NULL;