From a5ec1a6f44b149c0b018c1da8c1703109c5bdc8c Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 28 Feb 2011 23:53:43 +0100 Subject: [PATCH] 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. --- client_common.c | 1 - command.c | 1 - crypt.h | 4 ++++ rc4.h | 4 ---- user_list.c | 1 - 5 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 rc4.h diff --git a/client_common.c b/client_common.c index 8e1ca284..b5d34ed7 100644 --- 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 6bb8cbed..ece87e16 100644 --- 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 b963d105..0e0695e5 100644 --- 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 index d2c6de79..00000000 --- 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 f835c110..0f56b651 100644 --- 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; -- 2.30.2