1 files changed, 16 insertions, 17 deletions

diff --git a/src/lib/libcrypto/rc2/rc2test.c b/src/lib/libcrypto/rc2/rc2test.c
index 9d0f8016ec..d9a2a0a1cb 100644
--- a/src/lib/libcrypto/rc2/rc2test.c
+++ b/src/lib/libcrypto/rc2/rc2test.c
@@ -62,9 +62,17 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "rc2.h"
 
-unsigned char RC2key[4][16]={
+#ifdef OPENSSL_NO_RC2
+int main(int argc, char *argv[])
+{
+    printf("No RC2 support\n");
+    return(0);
+}
+#else
+#include <openssl/rc2.h>
+
+static unsigned char RC2key[4][16]={
         {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
          0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -75,14 +83,14 @@ unsigned char RC2key[4][16]={
          0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F},
         };
 
-unsigned char RC2plain[4][8]={
+static unsigned char RC2plain[4][8]={
         {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
         {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
         };
 
-unsigned char RC2cipher[4][8]={
+static unsigned char RC2cipher[4][8]={
         {0x1C,0x19,0x8A,0x83,0x8D,0xF0,0x28,0xB7},
         {0x21,0x82,0x9C,0x78,0xA9,0xF9,0xC0,0x74},
         {0x13,0xDB,0x35,0x17,0xD3,0x21,0x86,0x9E},
@@ -125,19 +133,11 @@ static unsigned char cfb_cipher64[CFB_TEST_SIZE]={
         }; 
 
 
-#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
 
-#endif
-
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
         {
         int i,n,err=0;
         RC2_KEY key; 
@@ -208,8 +208,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;
@@ -247,8 +246,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;
@@ -268,3 +266,4 @@ unsigned char *p;
         }
         
 #endif
+#endif