import openssl-0.9.7-beta1

1 files changed, 15 insertions, 9 deletions

diff --git a/src/lib/libcrypto/rc4/rc4test.c b/src/lib/libcrypto/rc4/rc4test.c
index 041e1aff95..a28d457c8d 100644
--- a/src/lib/libcrypto/rc4/rc4test.c
+++ b/src/lib/libcrypto/rc4/rc4test.c
@@ -59,9 +59,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rc4.h"
 
-unsigned char keys[7][30]={
+#ifdef OPENSSL_NO_RC4
+int main(int argc, char *argv[])
+{
+    printf("No RC4 support\n");
+    return(0);
+}
+#else
+#include <openssl/rc4.h>
+
+static unsigned char keys[7][30]={
         {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
         {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
         {8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
@@ -70,8 +78,8 @@ unsigned char keys[7][30]={
         {4,0xef,0x01,0x23,0x45},
         };
 
-unsigned char data_len[7]={8,8,8,20,28,10};
-unsigned char data[7][30]={
+static unsigned char data_len[7]={8,8,8,20,28,10};
+static unsigned char data[7][30]={
         {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xff},
         {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
         {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
@@ -86,7 +94,7 @@ unsigned char data[7][30]={
         {0},
         };
 
-unsigned char output[7][30]={
+static unsigned char output[7][30]={
         {0x75,0xb7,0x87,0x80,0x99,0xe0,0xc5,0x96,0x00},
         {0x74,0x94,0xc2,0xe7,0x10,0x4b,0x08,0x79,0x00},
         {0xde,0x18,0x89,0x41,0xa3,0x37,0x5d,0x3a,0x00},
@@ -101,9 +109,7 @@ unsigned char output[7][30]={
         {0},
         };
 
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
         {
         int i,err=0;
         int j;
@@ -192,4 +198,4 @@ char *argv[];
         exit(err);
         return(0);
         }
-
+#endif