Remove rc4.h.

It's kind of silly to have an extra file which contains only a singe
preprocessor define. Move that define to crypt.h and kill rc4.h.

diff --git a/client_common.c b/client_common.c
index 8e1ca2841b13267c80c9f6328ba4c436ea94701b..b5d34ed7b7d3d7a6cf8ee6f95eafa3facc776834 100644 (file)
--- a/client_common.c
+++ b/client_common.c
@@ -16,7 +16,6 @@
 #include "sched.h"
 #include "client.cmdline.h"
 #include "crypt.h"
-#include "rc4.h"
 #include "net.h"
 #include "fd.h"
 #include "string.h"

diff --git a/command.c b/command.c
index 6bb8cbed7117777fc98513a4a70b1c88e016bd28..ece87e168a7e42b406526a9638ef5bf7126cd45c 100644 (file)
--- a/command.c
+++ b/command.c
@@ -26,7 +26,6 @@
 #include "list.h"
 #include "send.h"
 #include "vss.h"
-#include "rc4.h"
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"

diff --git a/crypt.h b/crypt.h
index b963d1055894fa2a5919db7c6bd3b49b19ed878c..0e0695e574ecbfcb6dd4c5491fa2f499329a8d14 100644 (file)
--- a/crypt.h
+++ b/crypt.h
@@ -20,8 +20,12 @@ void free_asymmetric_key(struct asymmetric_key *key);
 void get_random_bytes_or_die(unsigned char *buf, int num);
 void init_random_seed_or_die(void);
 
+/** Opaque structure for stream cipher crypto. */
 struct stream_cipher;
 
+/** Number of bytes of the session key. */
+#define SESSION_KEY_LEN 32
+
 /**
  * Used on the server-side for client-server communication encryption.
  *

diff --git a/rc4.h b/rc4.h
deleted file mode 100644 (file)
index d2c6de7..0000000
--- a/rc4.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/** \file rc4.h common symbols of command.c and client_common.c */
-
-/** Number of bytes of the session key. */
-#define SESSION_KEY_LEN 32

diff --git a/user_list.c b/user_list.c
index f835c11015aaf9f866edeaead3423b40724c2b05..0f56b651680e1b5f4c275432e7f209714222045e 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -17,7 +17,6 @@
 #include "string.h"
 #include "list.h"
 #include "user_list.h"
-#include "rc4.h"
 
 static struct list_head user_list;