OpenSSL 0.9.4 merge

13 files changed, 79 insertions, 533 deletions

diff --git a/src/lib/libcrypto/rc4/Makefile.ssl b/src/lib/libcrypto/rc4/Makefile.ssl
index 19c1e980f3..64092fd4f1 100644
--- a/src/lib/libcrypto/rc4/Makefile.ssl
+++ b/src/lib/libcrypto/rc4/Makefile.ssl
@@ -7,9 +7,11 @@ TOP=	../..
 CC=     cc
 INCLUDES=
 CFLAG=-g
+INSTALL_PREFIX=
+OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
 MAKE=           make -f Makefile.ssl
-MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEDEPEND=     $(TOP)/util/domd $(TOP)
 MAKEFILE=       Makefile.ssl
 AR=             ar r
 
@@ -44,7 +46,7 @@ all:	lib
 
 lib:    $(LIBOBJ)
         $(AR) $(LIB) $(LIBOBJ)
-        sh $(TOP)/util/ranlib.sh $(LIB)
+        $(RANLIB) $(LIB)
         @touch lib
 
 # elf
@@ -63,26 +65,25 @@ asm/rx86-out.o: asm/rx86unix.cpp
 
 # bsdi
 asm/rx86bsdi.o: asm/rx86unix.cpp
-        $(CPP) -DBSDI asm/rx86unix.cpp | as -o asm/rx86bsdi.o
+        $(CPP) -DBSDI asm/rx86unix.cpp | sed 's/ :/:/' | as -o asm/rx86bsdi.o
 
-asm/rx86unix.cpp:
-        (cd asm; perl rc4-586.pl cpp >rx86unix.cpp)
+asm/rx86unix.cpp: asm/rc4-586.pl
+        (cd asm; $(PERL) rc4-586.pl cpp >rx86unix.cpp)
 
 files:
-        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
-        /bin/rm -f Makefile
-        $(TOP)/util/point.sh Makefile.ssl Makefile ;
-        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
-        $(TOP)/util/mklink.sh ../../test $(TEST)
-        $(TOP)/util/mklink.sh ../../apps $(APPS)
+        @$(TOP)/util/point.sh Makefile.ssl Makefile
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install:
         @for i in $(EXHEADER) ; \
         do  \
-        (cp $$i $(INSTALLTOP)/include/$$i; \
-        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
         done;
 
 tags:
@@ -94,15 +95,19 @@ lint:
         lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+        $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
 
 dclean:
-        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
         mv -f Makefile.new $(MAKEFILE)
 
 clean:
-        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
-
-errors:
+        rm -f asm/rx86unix.cpp *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
+
+rc4_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc4.h
+rc4_enc.o: rc4_locl.h
+rc4_skey.o: ../../include/openssl/opensslconf.h
+rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc4.h
+rc4_skey.o: rc4_locl.h
diff --git a/src/lib/libcrypto/rc4/Makefile.uni b/src/lib/libcrypto/rc4/Makefile.uni
index 79dc17b8d1..855d9e50f3 100644
--- a/src/lib/libcrypto/rc4/Makefile.uni
+++ b/src/lib/libcrypto/rc4/Makefile.uni
@@ -19,6 +19,7 @@ MAKE=           make
 MAKEDEPEND=     makedepend
 MAKEFILE=       Makefile.uni
 AR=             ar r
+RANLIB=         ranlib
 
 RC4_ENC=rc4_enc.o
 # or use
@@ -48,7 +49,7 @@ all:    $(LIB) $(TEST) $(APPS)
 
 $(LIB):    $(LIBOBJ)
         $(AR) $(LIB) $(LIBOBJ)
-        sh $(TOP)/ranlib.sh $(LIB)
+        $(RANLIB) $(LIB)
 
 # elf
 asm/rx86-elf.o: asm/rx86unix.cpp
diff --git a/src/lib/libcrypto/rc4/asm/rc4-586.pl b/src/lib/libcrypto/rc4/asm/rc4-586.pl
index 0dd8eb1ba9..7ef889e5a1 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-586.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-586.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 
 # define for pentium pro friendly version
 
diff --git a/src/lib/libcrypto/rc4/asm/rx86unix.cpp b/src/lib/libcrypto/rc4/asm/rx86unix.cpp
deleted file mode 100644
index ec1d72a110..0000000000
--- a/src/lib/libcrypto/rc4/asm/rx86unix.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/* Run the C pre-processor over this file with one of the following defined
- * ELF - elf object files,
- * OUT - a.out object files,
- * BSDI - BSDI style a.out object files
- * SOL - Solaris style elf
- */
-
-#define TYPE(a,b)       .type   a,b
-#define SIZE(a,b)       .size   a,b
-
-#if defined(OUT) || defined(BSDI)
-#define RC4 _RC4
-
-#endif
-
-#ifdef OUT
-#define OK      1
-#define ALIGN   4
-#endif
-
-#ifdef BSDI
-#define OK              1
-#define ALIGN           4
-#undef SIZE
-#undef TYPE
-#define SIZE(a,b)
-#define TYPE(a,b)
-#endif
-
-#if defined(ELF) || defined(SOL)
-#define OK              1
-#define ALIGN           16
-#endif
-
-#ifndef OK
-You need to define one of
-ELF - elf systems - linux-elf, NetBSD and DG-UX
-OUT - a.out systems - linux-a.out and FreeBSD
-SOL - solaris systems, which are elf with strange comment lines
-BSDI - a.out with a very primative version of as.
-#endif
-
-/* Let the Assembler begin :-) */
-        /* Don't even think of reading this code */
-        /* It was automatically generated by rc4-586.pl */
-        /* Which is a perl program used to generate the x86 assember for */
-        /* any of elf, a.out, BSDI,Win32, or Solaris */
-        /* eric <eay@cryptsoft.com> */
-
-        .file   "rc4-586.s"
-        .version        "01.01"
-gcc2_compiled.:
-.text
-        .align ALIGN
-.globl RC4
-        TYPE(RC4,@function)
-RC4:
-
-        pushl   %ebp
-        pushl   %ebx
-        movl    12(%esp),       %ebp
-        movl    16(%esp),       %ebx
-        pushl   %esi
-        pushl   %edi
-        movl    (%ebp),         %ecx
-        movl    4(%ebp),        %edx
-        movl    28(%esp),       %esi
-        incl    %ecx
-        subl    $12,            %esp
-        addl    $8,             %ebp
-        andl    $255,           %ecx
-        leal    -8(%ebx,%esi,), %ebx
-        movl    44(%esp),       %edi
-        movl    %ebx,           8(%esp)
-        movl    (%ebp,%ecx,4),  %eax
-        cmpl    %esi,           %ebx
-        jl      .L000end
-.L001start:
-        addl    $8,             %esi
-        /* Round 0 */
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    %bl,            (%esp)
-        /* Round 1 */
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    %bl,            1(%esp)
-        /* Round 2 */
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    %bl,            2(%esp)
-        /* Round 3 */
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    %bl,            3(%esp)
-        /* Round 4 */
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    %bl,            4(%esp)
-        /* Round 5 */
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    %bl,            5(%esp)
-        /* Round 6 */
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    %bl,            6(%esp)
-        /* Round 7 */
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        addl    $8,             %edi
-        movb    %bl,            7(%esp)
-        /* apply the cipher text */
-        movl    (%esp),         %eax
-        movl    -8(%esi),       %ebx
-        xorl    %ebx,           %eax
-        movl    -4(%esi),       %ebx
-        movl    %eax,           -8(%edi)
-        movl    4(%esp),        %eax
-        xorl    %ebx,           %eax
-        movl    8(%esp),        %ebx
-        movl    %eax,           -4(%edi)
-        movl    (%ebp,%ecx,4),  %eax
-        cmpl    %ebx,           %esi
-        jle     .L001start
-.L000end:
-        /* Round 0 */
-        addl    $8,             %ebx
-        incl    %esi
-        cmpl    %esi,           %ebx
-        jl      .L002finished
-        movl    %ebx,           8(%esp)
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    -1(%esi),       %bh
-        xorb    %bh,            %bl
-        movb    %bl,            (%edi)
-        /* Round 1 */
-        movl    8(%esp),        %ebx
-        cmpl    %esi,           %ebx
-        jle     .L002finished
-        incl    %esi
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    -1(%esi),       %bh
-        xorb    %bh,            %bl
-        movb    %bl,            1(%edi)
-        /* Round 2 */
-        movl    8(%esp),        %ebx
-        cmpl    %esi,           %ebx
-        jle     .L002finished
-        incl    %esi
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    -1(%esi),       %bh
-        xorb    %bh,            %bl
-        movb    %bl,            2(%edi)
-        /* Round 3 */
-        movl    8(%esp),        %ebx
-        cmpl    %esi,           %ebx
-        jle     .L002finished
-        incl    %esi
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    -1(%esi),       %bh
-        xorb    %bh,            %bl
-        movb    %bl,            3(%edi)
-        /* Round 4 */
-        movl    8(%esp),        %ebx
-        cmpl    %esi,           %ebx
-        jle     .L002finished
-        incl    %esi
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    -1(%esi),       %bh
-        xorb    %bh,            %bl
-        movb    %bl,            4(%edi)
-        /* Round 5 */
-        movl    8(%esp),        %ebx
-        cmpl    %esi,           %ebx
-        jle     .L002finished
-        incl    %esi
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movl    (%ebp,%ecx,4),  %eax
-        movb    -1(%esi),       %bh
-        xorb    %bh,            %bl
-        movb    %bl,            5(%edi)
-        /* Round 6 */
-        movl    8(%esp),        %ebx
-        cmpl    %esi,           %ebx
-        jle     .L002finished
-        incl    %esi
-        addl    %eax,           %edx
-        andl    $255,           %edx
-        incl    %ecx
-        movl    (%ebp,%edx,4),  %ebx
-        movl    %ebx,           -4(%ebp,%ecx,4)
-        addl    %eax,           %ebx
-        andl    $255,           %ecx
-        andl    $255,           %ebx
-        movl    %eax,           (%ebp,%edx,4)
-        nop
-        movl    (%ebp,%ebx,4),  %ebx
-        movb    -1(%esi),       %bh
-        xorb    %bh,            %bl
-        movb    %bl,            6(%edi)
-.L002finished:
-        decl    %ecx
-        addl    $12,            %esp
-        movl    %edx,           -4(%ebp)
-        movb    %cl,            -8(%ebp)
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-.RC4_end:
-        SIZE(RC4,.RC4_end-RC4)
-.ident  "RC4"
diff --git a/src/lib/libcrypto/rc4/rc4.c b/src/lib/libcrypto/rc4/rc4.c
index 127e8a5093..709b7aff35 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;
diff --git a/src/lib/libcrypto/rc4/rc4.org b/src/lib/libcrypto/rc4/rc4.h
index c558651af8..7418c2a9a2 100644
--- a/src/lib/libcrypto/rc4/rc4.org
+++ b/src/lib/libcrypto/rc4/rc4.h
@@ -1,4 +1,4 @@
-/* crypto/rc4/rc4.org */
+/* crypto/rc4/rc4.h */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,14 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * Always modify rc4.org since rc4.h is automatically generated from
- * it during SSLeay configuration.
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
- */
-
 #ifndef HEADER_RC4_H
 #define HEADER_RC4_H
 
@@ -71,9 +63,11 @@
 extern "C" {
 #endif
 
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-#define RC4_INT unsigned int
+#ifdef NO_RC4
+#error RC4 is disabled.
+#endif
+
+#include <openssl/opensslconf.h> /* RC4_INT */
 
 typedef struct rc4_key_st
         {
@@ -81,21 +75,12 @@ typedef struct rc4_key_st
         RC4_INT data[256];
         } RC4_KEY;
 
-#ifndef NOPROTO
  
-char *RC4_options(void);
+const char *RC4_options(void);
 void RC4_set_key(RC4_KEY *key, int len, unsigned char *data);
 void RC4(RC4_KEY *key, unsigned long len, unsigned char *indata,
                 unsigned char *outdata);
 
-#else
-
-char *RC4_options();
-void RC4_set_key();
-void RC4();
-
-#endif
-
 #ifdef  __cplusplus
 }
 #endif
diff --git a/src/lib/libcrypto/rc4/rc4_enc.c b/src/lib/libcrypto/rc4/rc4_enc.c
index ab8a111b52..3256bea8cc 100644
--- a/src/lib/libcrypto/rc4/rc4_enc.c
+++ b/src/lib/libcrypto/rc4/rc4_enc.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "rc4.h"
+#include <openssl/rc4.h>
 #include "rc4_locl.h"
 
 /* RC4 as implemented from a posting from
@@ -67,11 +67,8 @@
  * Date: Wed, 14 Sep 1994 06:35:31 GMT
  */
 
-void RC4(key, len, indata, outdata)
-RC4_KEY *key;
-unsigned long len;
-unsigned char *indata;
-unsigned char *outdata;
+void RC4(RC4_KEY *key, unsigned long len, unsigned char *indata,
+             unsigned char *outdata)
         {
         register RC4_INT *d;
         register RC4_INT x,y,tx,ty;
@@ -95,7 +92,6 @@ unsigned char *outdata;
 #define RC4_LOOP(a,b,i) LOOP(a[i],b[i])
 #endif
 
-        i= -(int)len;
         i=(int)(len>>3L);
         if (i)
                 {
diff --git a/src/lib/libcrypto/rc4/rc4_locl.h b/src/lib/libcrypto/rc4/rc4_locl.h
new file mode 100644
index 0000000000..3bb80b6ce9
--- /dev/null
+++ b/src/lib/libcrypto/rc4/rc4_locl.h
@@ -0,0 +1,4 @@
+#ifndef HEADER_RC4_LOCL_H
+#define HEADER_RC4_LOCL_H
+#include <openssl/opensslconf.h>
+#endif
diff --git a/src/lib/libcrypto/rc4/rc4_locl.org b/src/lib/libcrypto/rc4/rc4_locl.org
deleted file mode 100644
index 1ef4455fb7..0000000000
--- a/src/lib/libcrypto/rc4/rc4_locl.org
+++ /dev/null
@@ -1,70 +0,0 @@
-/* crypto/rc4/rc4_locl.org */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * Always modify bf_locl.org since bf_locl.h is automatically generated from
- * it during SSLeay configuration.
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- */
-
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#undef RC4_INDEX
-
diff --git a/src/lib/libcrypto/rc4/rc4_skey.c b/src/lib/libcrypto/rc4/rc4_skey.c
index 0be5fde67b..c67a445f1f 100644
--- a/src/lib/libcrypto/rc4/rc4_skey.c
+++ b/src/lib/libcrypto/rc4/rc4_skey.c
@@ -56,12 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
-#include "rc4.h"
+#include <openssl/rc4.h>
 #include "rc4_locl.h"
+#include <openssl/opensslv.h>
 
-char *RC4_version="RC4 part of SSLeay 0.9.0b 29-Jun-1998";
+const char *RC4_version="RC4" OPENSSL_VERSION_PTEXT;
 
-char *RC4_options()
+const char *RC4_options(void)
         {
 #ifdef RC4_INDEX
         if (sizeof(RC4_INT) == 1)
@@ -84,10 +85,7 @@ char *RC4_options()
  * Date: Wed, 14 Sep 1994 06:35:31 GMT
  */
 
-void RC4_set_key(key, len, data)
-RC4_KEY *key;
-int len;
-register unsigned char *data;
+void RC4_set_key(RC4_KEY *key, int len, register unsigned char *data)
         {
         register RC4_INT tmp;
         register int id1,id2;
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..4fb5ebf573 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(MSDOS) && (!defined(VMS) || defined(__DECC))
 #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(VMS) && defined(__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];
diff --git a/src/lib/libcrypto/rc4/rc4test.c b/src/lib/libcrypto/rc4/rc4test.c
index 041e1aff95..5abf8cff30 100644
--- a/src/lib/libcrypto/rc4/rc4test.c
+++ b/src/lib/libcrypto/rc4/rc4test.c
@@ -59,7 +59,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "rc4.h"
+
+#ifdef NO_RC4
+int main(int argc, char *argv[])
+{
+    printf("No RC4 support\n");
+    return(0);
+}
+#else
+#include <openssl/rc4.h>
 
 unsigned char keys[7][30]={
         {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
@@ -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