Change functions to ANSI C.

8 files changed, 23 insertions, 64 deletions

diff --git a/crypto/sha/sha.c b/crypto/sha/sha.c
index 713fec3610..486819d6f7 100644
--- a/crypto/sha/sha.c
+++ b/crypto/sha/sha.c
@@ -72,9 +72,7 @@ void pt();
 int read();
 #endif
 
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 	{
 	int i,err=0;
 	FILE *IN;
@@ -102,8 +100,7 @@ char **argv;
 	exit(err);
 	}
 
-void do_fp(f)
-FILE *f;
+void do_fp(FILE *f)
 	{
 	SHA_CTX c;
 	unsigned char md[SHA_DIGEST_LENGTH];
@@ -123,8 +120,7 @@ FILE *f;
 	pt(md);
 	}
 
-void pt(md)
-unsigned char *md;
+void pt(unsigned char *md)
 	{
 	int i;
 
diff --git a/crypto/sha/sha1.c b/crypto/sha/sha1.c
index a4739ac9fd..b708dec06c 100644
--- a/crypto/sha/sha1.c
+++ b/crypto/sha/sha1.c
@@ -72,9 +72,7 @@ void pt();
 int read();
 #endif
 
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 	{
 	int i,err=0;
 	FILE *IN;
@@ -102,8 +100,7 @@ char **argv;
 	exit(err);
 	}
 
-void do_fp(f)
-FILE *f;
+void do_fp(FILE *f)
 	{
 	SHA_CTX c;
 	unsigned char md[SHA_DIGEST_LENGTH];
@@ -123,8 +120,7 @@ FILE *f;
 	pt(md);
 	}
 
-void pt(md)
-unsigned char *md;
+void pt(unsigned char *md)
 	{
 	int i;
 
diff --git a/crypto/sha/sha1_one.c b/crypto/sha/sha1_one.c
index fe5770d601..07af9bf4da 100644
--- a/crypto/sha/sha1_one.c
+++ b/crypto/sha/sha1_one.c
@@ -60,10 +60,7 @@
 #include <string.h>
 #include "sha.h"
 
-unsigned char *SHA1(d, n, md)
-unsigned char *d;
-unsigned long n;
-unsigned char *md;
+unsigned char *SHA1(unsigned char *d, unsigned long n, unsigned char *md)
 	{
 	SHA_CTX c;
 	static unsigned char m[SHA_DIGEST_LENGTH];
diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index 344b3833d3..d7fb4d4dfa 100644
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -111,8 +111,7 @@ char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;
 #  define	M_nl2c		nl2c
 #endif
 
-void SHA1_Init(c)
-SHA_CTX *c;
+void SHA1_Init(SHA_CTX *c)
 	{
 	c->h0=INIT_DATA_h0;
 	c->h1=INIT_DATA_h1;
@@ -124,10 +123,8 @@ SHA_CTX *c;
 	c->num=0;
 	}
 
-void SHA1_Update(c, data, len)
-SHA_CTX *c;
-register unsigned char *data;
-unsigned long len;
+void SHA1_Update(SHA_CTX *c, register unsigned char *data,
+	     unsigned long len)
 	{
 	register ULONG *p;
 	int ew,ec,sw,sc;
@@ -257,9 +254,7 @@ unsigned long len;
 	p[sw]=l;
 	}
 
-void SHA1_Transform(c,b)
-SHA_CTX *c;
-unsigned char *b;
+void SHA1_Transform(SHA_CTX *c, unsigned char *b)
 	{
 	ULONG p[16];
 #ifndef B_ENDIAN
@@ -296,10 +291,7 @@ unsigned char *b;
 
 #ifndef SHA1_ASM
 
-void sha1_block(c, W, num)
-SHA_CTX *c;
-register unsigned long *W;
-int num;
+void sha1_block(SHA_CTX *c, register unsigned long *W, int num)
 	{
 	register ULONG A,B,C,D,E,T;
 	ULONG X[16];
@@ -416,9 +408,7 @@ int num;
 	}
 #endif
 
-void SHA1_Final(md, c)
-unsigned char *md;
-SHA_CTX *c;
+void SHA1_Final(unsigned char *md, SHA_CTX *c)
 	{
 	register int i,j;
 	register ULONG l;
diff --git a/crypto/sha/sha1test.c b/crypto/sha/sha1test.c
index 3c62a218b4..78c94f1aca 100644
--- a/crypto/sha/sha1test.c
+++ b/crypto/sha/sha1test.c
@@ -93,9 +93,7 @@ static char *pt(unsigned char *md);
 static char *pt();
 #endif
 
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
 	{
 	int i,err=0;
 	unsigned char **P,**R;
@@ -143,8 +141,7 @@ char *argv[];
 	return(0);
 	}
 
-static char *pt(md)
-unsigned char *md;
+static char *pt(unsigned char *md)
 	{
 	int i;
 	static char buf[80];
diff --git a/crypto/sha/sha_dgst.c b/crypto/sha/sha_dgst.c
index 15245e3b2c..e99cb1149d 100644
--- a/crypto/sha/sha_dgst.c
+++ b/crypto/sha/sha_dgst.c
@@ -92,8 +92,7 @@ char *SHA_version="SHA" OPENSSL_VERSION_PTEXT;
 #define	M_p_c2nl_p	p_c2nl_p
 #define	M_nl2c		nl2c
 
-void SHA_Init(c)
-SHA_CTX *c;
+void SHA_Init(SHA_CTX *c)
 	{
 	c->h0=INIT_DATA_h0;
 	c->h1=INIT_DATA_h1;
@@ -105,10 +104,7 @@ SHA_CTX *c;
 	c->num=0;
 	}
 
-void SHA_Update(c, data, len)
-SHA_CTX *c;
-register unsigned char *data;
-unsigned long len;
+void SHA_Update(SHA_CTX *c, register unsigned char *data, unsigned long len)
 	{
 	register ULONG *p;
 	int ew,ec,sw,sc;
@@ -238,9 +234,7 @@ unsigned long len;
 	p[sw]=l;
 	}
 
-void SHA_Transform(c,b)
-SHA_CTX *c;
-unsigned char *b;
+void SHA_Transform(SHA_CTX *c, unsigned char *b)
 	{
 	ULONG p[16];
 #if !defined(B_ENDIAN)
@@ -275,10 +269,7 @@ unsigned char *b;
 	sha_block(c,p,64);
 	}
 
-void sha_block(c, W, num)
-SHA_CTX *c;
-register unsigned long *W;
-int num;
+void sha_block(SHA_CTX *c, register unsigned long *W, int num)
 	{
 	register ULONG A,B,C,D,E,T;
 	ULONG X[16];
@@ -394,9 +385,7 @@ int num;
 		}
 	}
 
-void SHA_Final(md, c)
-unsigned char *md;
-SHA_CTX *c;
+void SHA_Final(unsigned char *md, SHA_CTX *c)
 	{
 	register int i,j;
 	register ULONG l;
diff --git a/crypto/sha/sha_one.c b/crypto/sha/sha_one.c
index 18ab7f61bc..3e2751ec84 100644
--- a/crypto/sha/sha_one.c
+++ b/crypto/sha/sha_one.c
@@ -60,10 +60,7 @@
 #include <string.h>
 #include "sha.h"
 
-unsigned char *SHA(d, n, md)
-unsigned char *d;
-unsigned long n;
-unsigned char *md;
+unsigned char *SHA(unsigned char *d, unsigned long n, unsigned char *md)
 	{
 	SHA_CTX c;
 	static unsigned char m[SHA_DIGEST_LENGTH];
diff --git a/crypto/sha/shatest.c b/crypto/sha/shatest.c
index 03816e9b39..5a1a99880f 100644
--- a/crypto/sha/shatest.c
+++ b/crypto/sha/shatest.c
@@ -93,9 +93,7 @@ static char *pt(unsigned char *md);
 static char *pt();
 #endif
 
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
 	{
 	int i,err=0;
 	unsigned char **P,**R;
@@ -143,8 +141,7 @@ char *argv[];
 	return(0);
 	}
 
-static char *pt(md)
-unsigned char *md;
+static char *pt(unsigned char *md)
 	{
 	int i;
 	static char buf[80];