Merged blowfish branch into trunk.

[become] / src / daemon.c

diff --git a/src/daemon.c b/src/daemon.c
index 317a7fb..61638df 100644 (file)
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: daemon.c,v 1.7 1997/09/17 10:23:23 mdw Exp $
+ * $Id: daemon.c,v 1.8 1997/09/26 09:14:58 mdw Exp $
  *
  * Running a `become' daemon
  *
@@ -29,6 +29,14 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: daemon.c,v $
+ * Revision 1.8  1997/09/26 09:14:58  mdw
+ * Merged blowfish branch into trunk.
+ *
+ * Revision 1.7.2.1  1997/09/26 09:08:05  mdw
+ * Use the Blowfish encryption algorithm instead of IDEA.  This is partly
+ * because I prefer Blowfish (without any particularly strong evidence) but
+ * mainly because IDEA is patented and Blowfish isn't.
+ *
  * Revision 1.7  1997/09/17 10:23:23  mdw
  * Fix a typo.  Port numbers are in network order now, so don't change them.
  *
@@ -79,10 +87,10 @@
 /* --- Local headers --- */
 
 #include "become.h"
+#include "blowfish.h"
 #include "config.h"
 #include "crypt.h"
 #include "daemon.h"
-#include "idea.h"
 #include "lexer.h"
 #include "name.h"
 #include "netg.h"
@@ -103,7 +111,7 @@ static int daemon__port = -1;               /* No particular port yet */
 static volatile sig_atomic_t daemon__rescan = 0; /* Rescan as soon as poss */
 #define daemon__signum daemon__rescan  /* Alias for readbility */
 static int daemon__readKey = 0;                /* Have I read a key? */
-static unsigned char daemon__key[IDEA_KEYSIZE];        /* encryption key */
+static unsigned char daemon__key[BLOWFISH_KEYSIZE]; /* Encryption key */
 static jmp_buf daemon__dieBuf;         /* Jump here to kill the daemon */
 
 /*----- Main code ---------------------------------------------------------*/
@@ -219,7 +227,7 @@ void daemon__read(int fd)
   unsigned char rpl[crp_size];         /* Buffer for outgoing replies */
   struct sockaddr_in sin;              /* Address of packet sender */
   char sender[64];                     /* Sender's hostname (resolved) */
-  unsigned char sk[IDEA_KEYSIZE];      /* Session key for reply */
+  unsigned char sk[BLOWFISH_KEYSIZE];  /* Session key for reply */
   request rq;                          /* Request buffer for verification */
 
   /* --- Read the message --- */
@@ -328,7 +336,7 @@ void daemon_init(const char *cf, int port)
   if (daemon__port == 0) {
     struct servent *se = getservbyname(quis(), "udp");
     if (!se)
-      die("no idea which port to use");
+      die("no idea which port to listen to");
     daemon__port = se->s_port;
   }