X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fidea%2Fideatest.c;h=64b9353e414f4557858f3aa4401b44995f1bc12c;hb=4328d51d08e89cf9d46836a2875b3d545711a4d8;hp=ee01ba5b2cece650311b73fd15933f694d0a0db1;hpb=b7896b3cb86d80206af14a14d69b0717786f2729;p=oweals%2Fopenssl.git

diff --git a/crypto/idea/ideatest.c b/crypto/idea/ideatest.c
index ee01ba5b2c..64b9353e41 100644
--- a/crypto/idea/ideatest.c
+++ b/crypto/idea/ideatest.c
@@ -1,5 +1,5 @@
 /* crypto/idea/ideatest.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -59,7 +59,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "idea.h"
+
+#ifdef NO_IDEA
+int main(int argc, char *argv[])
+{
+    printf("No IDEA support\n");
+    return(0);
+}
+#else
+#include <openssl/idea.h>
 
 unsigned char k[16]={
 	0x00,0x01,0x00,0x02,0x00,0x03,0x00,0x04,
@@ -95,17 +103,9 @@ 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(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
 	{
 	int i,err=0;
 	IDEA_KEY_SCHEDULE key,dkey; 
@@ -171,8 +171,7 @@ char *argv[];
 	return(err);
 	}
 
-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;
@@ -210,8 +209,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;
@@ -229,4 +227,4 @@ unsigned char *p;
 	ret[16]='\0';
 	return(ret);
 	}
-	
+#endif