Change functions to ANSI C.

7 files changed, 18 insertions, 52 deletions

diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c
index 5506572..2305dd0 100644
--- a/crypto/rc5/rc5_ecb.c
+++ b/crypto/rc5/rc5_ecb.c
@@ -62,11 +62,8 @@
 
 char *RC5_version="RC5" OPENSSL_VERSION_PTEXT;
 
-void RC5_32_ecb_encrypt(in, out, ks, encrypt)
-unsigned char *in;
-unsigned char *out;
-RC5_32_KEY *ks;
-int encrypt;
+void RC5_32_ecb_encrypt(unsigned char *in, unsigned char *out, RC5_32_KEY *ks,
+	     int encrypt)
 	{
 	unsigned long l,d[2];
 
diff --git a/crypto/rc5/rc5_enc.c b/crypto/rc5/rc5_enc.c
index ee5f97e..ba79dd4 100644
--- a/crypto/rc5/rc5_enc.c
+++ b/crypto/rc5/rc5_enc.c
@@ -60,13 +60,8 @@
 #include "rc5.h"
 #include "rc5_locl.h"
 
-void RC5_32_cbc_encrypt(in, out, length, ks, iv, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-RC5_32_KEY *ks;
-unsigned char *iv;
-int encrypt;
+void RC5_32_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
+	     RC5_32_KEY *ks, unsigned char *iv, int encrypt)
 	{
 	register unsigned long tin0,tin1;
 	register unsigned long tout0,tout1,xor0,xor1;
@@ -139,9 +134,7 @@ int encrypt;
 	tin[0]=tin[1]=0;
 	}
 
-void RC5_32_encrypt(d,key)
-unsigned long *d;
-RC5_32_KEY *key;
+void RC5_32_encrypt(unsigned long *d, RC5_32_KEY *key)
 	{
 	RC5_32_INT a,b,*s;
 
@@ -180,9 +173,7 @@ RC5_32_KEY *key;
 	d[1]=b;
 	}
 
-void RC5_32_decrypt(d,key)
-unsigned long *d;
-RC5_32_KEY *key;
+void RC5_32_decrypt(unsigned long *d, RC5_32_KEY *key)
 	{
 	RC5_32_INT a,b,*s;
 
diff --git a/crypto/rc5/rc5_skey.c b/crypto/rc5/rc5_skey.c
index 5753390..2f36531 100644
--- a/crypto/rc5/rc5_skey.c
+++ b/crypto/rc5/rc5_skey.c
@@ -59,11 +59,8 @@
 #include "rc5.h"
 #include "rc5_locl.h"
 
-void RC5_32_set_key(key,len,data,rounds)
-RC5_32_KEY *key;
-int len;
-unsigned char *data;
-int rounds;
+void RC5_32_set_key(RC5_32_KEY *key, int len, unsigned char *data,
+	     int rounds)
 	{
 	RC5_32_INT L[64],l,ll,A,B,*S,k;
 	int i,j,m,c,t,ii,jj;
diff --git a/crypto/rc5/rc5cfb64.c b/crypto/rc5/rc5cfb64.c
index fe245d0..dbc7ae1 100644
--- a/crypto/rc5/rc5cfb64.c
+++ b/crypto/rc5/rc5cfb64.c
@@ -64,14 +64,8 @@
  * 64bit block we have used is contained in *num;
  */
 
-void RC5_32_cfb64_encrypt(in, out, length, schedule, ivec, num, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-RC5_32_KEY *schedule;
-unsigned char *ivec;
-int *num;
-int encrypt;
+void RC5_32_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
+	     RC5_32_KEY *schedule, unsigned char *ivec, int *num, int encrypt)
 	{
 	register unsigned long v0,v1,t;
 	register int n= *num;
diff --git a/crypto/rc5/rc5ofb64.c b/crypto/rc5/rc5ofb64.c
index aa43b6a..b52e145 100644
--- a/crypto/rc5/rc5ofb64.c
+++ b/crypto/rc5/rc5ofb64.c
@@ -63,13 +63,8 @@
  * used.  The extra state information to record how much of the
  * 64bit block we have used is contained in *num;
  */
-void RC5_32_ofb64_encrypt(in, out, length, schedule, ivec, num)
-unsigned char *in;
-unsigned char *out;
-long length;
-RC5_32_KEY *schedule;
-unsigned char *ivec;
-int *num;
+void RC5_32_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
+	     RC5_32_KEY *schedule, unsigned char *ivec, int *num)
 	{
 	register unsigned long v0,v1,t;
 	register int n= *num;
diff --git a/crypto/rc5/rc5speed.c b/crypto/rc5/rc5speed.c
index 29148dc..54163b8 100644
--- a/crypto/rc5/rc5speed.c
+++ b/crypto/rc5/rc5speed.c
@@ -135,8 +135,7 @@ SIGRETTYPE sig_done(int sig);
 SIGRETTYPE sig_done();
 #endif
 
-SIGRETTYPE sig_done(sig)
-int sig;
+SIGRETTYPE sig_done(int sig)
 	{
 	signal(SIGALRM,sig_done);
 	run=0;
@@ -149,8 +148,7 @@ int sig;
 #define START	0
 #define STOP	1
 
-double Time_F(s)
-int s;
+double Time_F(int s)
 	{
 	double ret;
 #ifdef TIMES
@@ -186,9 +184,7 @@ int s;
 #endif
 	}
 
-int main(argc,argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 	{
 	long count;
 	static unsigned char buf[BUFSIZE];
diff --git a/crypto/rc5/rc5test.c b/crypto/rc5/rc5test.c
index 14c321d..5ca5195 100644
--- a/crypto/rc5/rc5test.c
+++ b/crypto/rc5/rc5test.c
@@ -224,9 +224,7 @@ unsigned char rc5_cbc_iv[RC5_CBC_NUM][8]={
 	{0x7c,0xb3,0xf1,0xdf,0x34,0xf9,0x48,0x11},
 	};
 
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
 	{
 	int i,n,err=0;
 	RC5_32_KEY key; 
@@ -317,8 +315,7 @@ char *argv[];
 	}
 
 #ifdef undef
-static int cfb64_test(cfb_cipher)
-unsigned char *cfb_cipher;
+static int cfb64_test(unsigned char *cfb_cipher)
         {
         IDEA_KEY_SCHEDULE eks,dks;
         int err=0,i,n;
@@ -356,8 +353,7 @@ unsigned char *cfb_cipher;
         return(err);
         }
 
-static char *pt(p)
-unsigned char *p;
+static char *pt(unsigned char *p)
 	{
 	static char bufs[10][20];
 	static int bnum=0;