From a165822bc975624a64f3075e4366f96a848f0957 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 21 Oct 1999 12:58:52 +0000 Subject: [PATCH] make this build git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7215 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/des/rc4.h | 28 ++++++++-------------------- lib/des/rc4_enc.c | 6 ++++-- lib/des/rc4_skey.c | 22 +++------------------- 3 files changed, 15 insertions(+), 41 deletions(-) diff --git a/lib/des/rc4.h b/lib/des/rc4.h index 7418c2a9a..99afa6b83 100644 --- a/lib/des/rc4.h +++ b/lib/des/rc4.h @@ -56,33 +56,21 @@ * [including the GNU Public Licence.] */ +/* $Id$ */ + #ifndef HEADER_RC4_H #define HEADER_RC4_H -#ifdef __cplusplus -extern "C" { -#endif +typedef unsigned int RC4_INT; -#ifdef NO_RC4 -#error RC4 is disabled. -#endif - -#include /* RC4_INT */ - -typedef struct rc4_key_st - { - RC4_INT x,y; - RC4_INT data[256]; - } RC4_KEY; +typedef struct rc4_key_st { + RC4_INT x,y; + RC4_INT data[256]; +} RC4_KEY; -const char *RC4_options(void); void RC4_set_key(RC4_KEY *key, int len, unsigned char *data); void RC4(RC4_KEY *key, unsigned long len, unsigned char *indata, - unsigned char *outdata); - -#ifdef __cplusplus -} -#endif + unsigned char *outdata); #endif diff --git a/lib/des/rc4_enc.c b/lib/des/rc4_enc.c index 3256bea8c..c584b7a6d 100644 --- a/lib/des/rc4_enc.c +++ b/lib/des/rc4_enc.c @@ -56,8 +56,10 @@ * [including the GNU Public Licence.] */ -#include -#include "rc4_locl.h" +#include "des_locl.h" +#include "rc4.h" + +RCSID("$Id$"); /* RC4 as implemented from a posting from * Newsgroups: sci.crypt diff --git a/lib/des/rc4_skey.c b/lib/des/rc4_skey.c index c67a445f1..ae6b9b270 100644 --- a/lib/des/rc4_skey.c +++ b/lib/des/rc4_skey.c @@ -56,26 +56,10 @@ * [including the GNU Public Licence.] */ -#include -#include "rc4_locl.h" -#include +#include "des_locl.h" +#include "rc4.h" -const char *RC4_version="RC4" OPENSSL_VERSION_PTEXT; - -const char *RC4_options(void) - { -#ifdef RC4_INDEX - if (sizeof(RC4_INT) == 1) - return("rc4(idx,char)"); - else - return("rc4(idx,int)"); -#else - if (sizeof(RC4_INT) == 1) - return("rc4(ptr,char)"); - else - return("rc4(ptr,int)"); -#endif - } +RCSID("$Id$"); /* RC4 as implemented from a posting from * Newsgroups: sci.crypt