Remove NOPROTO definitions and error code comments.

4 files changed, 0 insertions, 33 deletions

diff --git a/crypto/idea/i_skey.c b/crypto/idea/i_skey.c
index 87c63759a7..bbbda6b5c8 100644
--- a/crypto/idea/i_skey.c
+++ b/crypto/idea/i_skey.c
@@ -59,12 +59,7 @@
 #include <openssl/idea.h>
 #include "idea_lcl.h"
 
-#ifndef NOPROTO
 static IDEA_INT inverse(unsigned int xin);
-#else
-static IDEA_INT inverse();
-#endif
-
 void idea_set_encrypt_key(unsigned char *key, IDEA_KEY_SCHEDULE *ks)
 	{
 	int i;
diff --git a/crypto/idea/idea.h b/crypto/idea/idea.h
index c2f44d3c6e..0075426d94 100644
--- a/crypto/idea/idea.h
+++ b/crypto/idea/idea.h
@@ -75,7 +75,6 @@ typedef struct idea_key_st
 	IDEA_INT data[9][6];
 	} IDEA_KEY_SCHEDULE;
 
-#ifndef NOPROTO
 const char *idea_options(void);
 void idea_ecb_encrypt(unsigned char *in, unsigned char *out,
 	IDEA_KEY_SCHEDULE *ks);
@@ -89,17 +88,6 @@ void idea_cfb64_encrypt(unsigned char *in, unsigned char *out,
 void idea_ofb64_encrypt(unsigned char *in, unsigned char *out,
 	long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num);
 void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
-#else
-const char *idea_options();
-void idea_ecb_encrypt();
-void idea_set_encrypt_key();
-void idea_set_decrypt_key();
-void idea_cbc_encrypt();
-void idea_cfb64_encrypt();
-void idea_ofb64_encrypt();
-void idea_encrypt();
-#endif
-
 #ifdef  __cplusplus
 }
 #endif
diff --git a/crypto/idea/idea_spd.c b/crypto/idea/idea_spd.c
index fb0bee51cb..661626f8d9 100644
--- a/crypto/idea/idea_spd.c
+++ b/crypto/idea/idea_spd.c
@@ -116,12 +116,7 @@ struct tms {
 #define BUFSIZE	((long)1024)
 long run=0;
 
-#ifndef NOPROTO
 double Time_F(int s);
-#else
-double Time_F();
-#endif
-
 #ifdef SIGALRM
 #if defined(__STDC__) || defined(sgi) || defined(_AIX)
 #define SIGRETTYPE void
@@ -129,12 +124,7 @@ double Time_F();
 #define SIGRETTYPE int
 #endif
 
-#ifndef NOPROTO
 SIGRETTYPE sig_done(int sig);
-#else
-SIGRETTYPE sig_done();
-#endif
-
 SIGRETTYPE sig_done(int sig)
 	{
 	signal(SIGALRM,sig_done);
diff --git a/crypto/idea/ideatest.c b/crypto/idea/ideatest.c
index 220b422aa5..4593d9e694 100644
--- a/crypto/idea/ideatest.c
+++ b/crypto/idea/ideatest.c
@@ -95,14 +95,8 @@ static unsigned char cfb_cipher64[CFB_TEST_SIZE]={
 	0x3D,0x1E,0xAE,0x47,0xFC,0xCF,0x29,0x0B,*/
 	}; 
 
-#ifndef NOPROTO
 static int cfb64_test(unsigned char *cfb_cipher);
 static char *pt(unsigned char *p);
-#else
-static int cfb64_test();
-static char *pt();
-#endif
-
 int main(int argc, char *argv[])
 	{
 	int i,err=0;