import openssl-0.9.7-beta1

4 files changed, 43 insertions, 58 deletions

diff --git a/src/lib/libcrypto/rc4/rc4.c b/src/lib/libcrypto/rc4/rc4.c
index 127e8a5093..c2165b0b75 100644
--- a/src/lib/libcrypto/rc4/rc4.c
+++ b/src/lib/libcrypto/rc4/rc4.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rc4.h"
+#include <openssl/rc4.h>
 
 char *usage[]={
 "usage: rc4 args\n",
@@ -70,9 +70,7 @@ char *usage[]={
 NULL
 };
 
-int main(argc, argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
         {
         FILE *in=NULL,*out=NULL;
         char *infile=NULL,*outfile=NULL,*keystr=NULL;
@@ -115,7 +113,7 @@ char *argv[];
                 {
 bad:
                 for (pp=usage; (*pp != NULL); pp++)
-                        fprintf(stderr,*pp);
+                        fprintf(stderr,"%s",*pp);
                 exit(1);
                 }
 
@@ -143,7 +141,7 @@ bad:
                         }
                 }
                 
-#ifdef MSDOS
+#ifdef OPENSSL_SYS_MSDOS
         /* This should set the file to binary mode. */
         {
 #include <fcntl.h>
@@ -164,7 +162,7 @@ bad:
                 keystr=buf;
                 }
 
-        MD5((unsigned char *)keystr,(unsigned long)strlen(keystr),md);
+        EVP_Digest((unsigned char *)keystr,(unsigned long)strlen(keystr),md,NULL,EVP_md5());
         memset(keystr,0,strlen(keystr));
         RC4_set_key(&key,MD5_DIGEST_LENGTH,md);
         
diff --git a/src/lib/libcrypto/rc4/rc4s.cpp b/src/lib/libcrypto/rc4/rc4s.cpp
index 39f1727dd3..3814fde997 100644
--- a/src/lib/libcrypto/rc4/rc4s.cpp
+++ b/src/lib/libcrypto/rc4/rc4s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rc4.h"
+#include <openssl/rc4.h>
 
 void main(int argc,char *argv[])
         {
diff --git a/src/lib/libcrypto/rc4/rc4speed.c b/src/lib/libcrypto/rc4/rc4speed.c
index 5298dad6d0..ced98c52df 100644
--- a/src/lib/libcrypto/rc4/rc4speed.c
+++ b/src/lib/libcrypto/rc4/rc4speed.c
@@ -59,19 +59,17 @@
 /* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
 /* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
 
-#ifndef MSDOS
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
 #define TIMES
 #endif
 
 #include <stdio.h>
-#ifndef MSDOS
-#include <unistd.h>
-#else
-#include <io.h>
-extern int exit();
-#endif
+
+#include <openssl/e_os2.h>
+#include OPENSSL_UNISTD_IO
+OPENSSL_DECLARE_EXIT
+
 #include <signal.h>
-#ifndef VMS
 #ifndef _IRIX
 #include <time.h>
 #endif
@@ -79,34 +77,31 @@ extern int exit();
 #include <sys/types.h>
 #include <sys/times.h>
 #endif
-#else /* VMS */
-#include <types.h>
-struct tms {
-        time_t tms_utime;
-        time_t tms_stime;
-        time_t tms_uchild;      /* I dunno...  */
-        time_t tms_uchildsys;   /* so these names are a guess :-) */
-        }
+
+/* Depending on the VMS version, the tms structure is perhaps defined.
+   The __TMS macro will show if it was.  If it wasn't defined, we should
+   undefine TIMES, since that tells the rest of the program how things
+   should be handled.                           -- Richard Levitte */
+#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
+#undef TIMES
 #endif
+
 #ifndef TIMES
 #include <sys/timeb.h>
 #endif
 
-#ifdef sun
+#if defined(sun) || defined(__ultrix)
+#define _POSIX_SOURCE
 #include <limits.h>
 #include <sys/param.h>
 #endif
 
-#include "rc4.h"
+#include <openssl/rc4.h>
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ
 #ifndef CLK_TCK
-#ifndef VMS
-#define HZ      100.0
-#else /* VMS */
 #define HZ      100.0
-#endif
 #else /* CLK_TCK */
 #define HZ ((double)CLK_TCK)
 #endif
@@ -115,12 +110,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
@@ -128,14 +118,8 @@ double Time_F();
 #define SIGRETTYPE int
 #endif
 
-#ifndef NOPROTO
 SIGRETTYPE sig_done(int sig);
-#else
-SIGRETTYPE sig_done();
-#endif
-
-SIGRETTYPE sig_done(sig)
-int sig;
+SIGRETTYPE sig_done(int sig)
         {
         signal(SIGALRM,sig_done);
         run=0;
@@ -148,8 +132,7 @@ int sig;
 #define START   0
 #define STOP    1
 
-double Time_F(s)
-int s;
+double Time_F(int s)
         {
         double ret;
 #ifdef TIMES
@@ -185,9 +168,7 @@ int s;
 #endif
         }
 
-int main(argc,argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
         {
         long count;
         static unsigned char buf[BUFSIZE];
@@ -202,7 +183,7 @@ char **argv;
 #endif
 
 #ifndef TIMES
-        printf("To get the most acurate results, try to run this\n");
+        printf("To get the most accurate results, try to run this\n");
         printf("program when this computer is idle.\n");
 #endif
 
@@ -262,7 +243,7 @@ char **argv;
         printf("RC4 set_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a);
         printf("RC4   bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c);
         exit(0);
-#if defined(LINT) || defined(MSDOS)
+#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
         return(0);
 #endif
         }
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