Remove NOPROTO definitions and error code comments.

7 files changed, 0 insertions, 53 deletions

diff --git a/crypto/sha/sha.c b/crypto/sha/sha.c
index 3d339819cb..42126551d1 100644
--- a/crypto/sha/sha.c
+++ b/crypto/sha/sha.c
@@ -62,16 +62,9 @@
 
 #define BUFSIZE	1024*16
 
-#ifndef NOPROTO
 void do_fp(FILE *f);
 void pt(unsigned char *md);
 int read(int, void *, unsigned int);
-#else
-void do_fp();
-void pt();
-int read();
-#endif
-
 int main(int argc, char **argv)
 	{
 	int i,err=0;
diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
index a7df1d7e49..ac10d4c517 100644
--- a/crypto/sha/sha.h
+++ b/crypto/sha/sha.h
@@ -84,7 +84,6 @@ typedef struct SHAstate_st
 	int num;
 	} SHA_CTX;
 
-#ifndef NOPROTO
 void SHA_Init(SHA_CTX *c);
 void SHA_Update(SHA_CTX *c, unsigned char *data, unsigned long len);
 void SHA_Final(unsigned char *md, SHA_CTX *c);
@@ -95,19 +94,6 @@ void SHA1_Update(SHA_CTX *c, unsigned char *data, unsigned long len);
 void SHA1_Final(unsigned char *md, SHA_CTX *c);
 unsigned char *SHA1(unsigned char *d, unsigned long n,unsigned char *md);
 void SHA1_Transform(SHA_CTX *c, unsigned char *data);
-#else
-void SHA_Init();
-void SHA_Update();
-void SHA_Final();
-unsigned char *SHA();
-void SHA_Transform();
-void SHA1_Init();
-void SHA1_Update();
-void SHA1_Final();
-unsigned char *SHA1();
-void SHA1_Transform();
-#endif
-
 #ifdef  __cplusplus
 }
 #endif
diff --git a/crypto/sha/sha1.c b/crypto/sha/sha1.c
index 317e9ac255..3c81a96ef6 100644
--- a/crypto/sha/sha1.c
+++ b/crypto/sha/sha1.c
@@ -62,16 +62,9 @@
 
 #define BUFSIZE	1024*16
 
-#ifndef NOPROTO
 void do_fp(FILE *f);
 void pt(unsigned char *md);
 int read(int, void *, unsigned int);
-#else
-void do_fp();
-void pt();
-int read();
-#endif
-
 int main(int argc, char **argv)
 	{
 	int i,err=0;
diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index 53b8d8cc30..18a492d0e6 100644
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -80,22 +80,12 @@ char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;
 #define K_40_59 0x8f1bbcdcUL
 #define K_60_79 0xca62c1d6UL
 
-#ifndef NOPROTO
 #  ifdef SHA1_ASM
      void sha1_block_x86(SHA_CTX *c, register SHA_LONG *p, int num);
 #    define sha1_block sha1_block_x86
 #  else
      void sha1_block(SHA_CTX *c, register SHA_LONG *p, int num);
 #  endif
-#else
-#  ifdef SHA1_ASM
-     void sha1_block_x86();
-#    define sha1_block sha1_block_x86
-#  else
-     void sha1_block();
-#  endif
-#endif
-
 
 #if defined(L_ENDIAN) && defined(SHA1_ASM)
 #  define	M_c2nl 		c2l
diff --git a/crypto/sha/sha1test.c b/crypto/sha/sha1test.c
index 831a3441a4..9e4d3f178b 100644
--- a/crypto/sha/sha1test.c
+++ b/crypto/sha/sha1test.c
@@ -87,12 +87,7 @@ char *bigret=
 	"34aa973cd4c4daa4f61eeb2bdbad27316534016f";
 #endif
 
-#ifndef NOPROTO
 static char *pt(unsigned char *md);
-#else
-static char *pt();
-#endif
-
 int main(int argc, char *argv[])
 	{
 	int i,err=0;
diff --git a/crypto/sha/sha_dgst.c b/crypto/sha/sha_dgst.c
index ebfbb53aee..950c69c07a 100644
--- a/crypto/sha/sha_dgst.c
+++ b/crypto/sha/sha_dgst.c
@@ -80,12 +80,7 @@ char *SHA_version="SHA" OPENSSL_VERSION_PTEXT;
 #define K_40_59 0x8f1bbcdcUL
 #define K_60_79 0xca62c1d6UL
 
-#ifndef NOPROTO
    void sha_block(SHA_CTX *c, register SHA_LONG *p, int num);
-#else
-   void sha_block();
-#endif
-
 #define	M_c2nl 		c2nl
 #define	M_p_c2nl	p_c2nl
 #define	M_c2nl_p	c2nl_p
diff --git a/crypto/sha/shatest.c b/crypto/sha/shatest.c
index 9224e88dd8..4e201ed7ea 100644
--- a/crypto/sha/shatest.c
+++ b/crypto/sha/shatest.c
@@ -87,12 +87,7 @@ char *bigret=
 	"34aa973cd4c4daa4f61eeb2bdbad27316534016f";
 #endif
 
-#ifndef NOPROTO
 static char *pt(unsigned char *md);
-#else
-static char *pt();
-#endif
-
 int main(int argc, char *argv[])
 	{
 	int i,err=0;