Commit 5270e702 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge the engine branch into the main trunk. All conflicts resolved. 

At the same time, add VMS support for Rijndael.
parent 1df586be

CHANGES

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,16 @@ 


 Changes between 0.9.6 and 0.9.7  [xx XXX 2000]



  *) Add VMS support for the Rijndael code

     [Richard Levitte]



  *) Added untested support for Nuron crypto accelerator.

     [Ben Laurie]



  *) Add support for external cryptographic devices.  This code was

     previously distributed separately as the "engine" branch.

     [Geoff Thorpe, Richard Levitte]



  *) Rework the filename-translation in the DSO code. It is now possible to

     have far greater control over how a "name" is turned into a filename

     depending on the operating environment and any oddities about the

Configure

+18 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ use strict; 


# see INSTALL for instructions.



my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] os/compiler[:flags]\n";

my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] os/compiler[:flags]\n";



# Options:

#
@@ -23,6 +23,11 @@ my $usage="Usage: Configure [no-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [- 
#               default).  This needn't be set in advance, you can

#               just as well use "make INSTALL_PREFIX=/whatever install".

#

# no-hw-xxx     do not compile support for specific crypto hardware.

#               Generic OpenSSL-style methods relating to this support

#               are always compiled but return NULL if the hardware

#               support isn't compiled.

# no-hw         do not compile support for any crypto hardware.

# rsaref        use RSAref

# [no-]threads  [don't] try to create a library that is suitable for

#               multithreaded applications (default is "threads" if we
@@ -490,6 +495,18 @@ PROCESS_ARGS: 
			$flags .= "-DNO_ASM ";

			$openssl_other_defines .= "#define NO_ASM\n";

			}

		elsif (/^no-hw-(.+)$/)

			{

			my $hw=$1;

			$hw =~ tr/[a-z]/[A-Z]/;

			$flags .= "-DNO_HW_$hw ";

			$openssl_other_defines .= "#define NO_HW_$hw\n";

			}

		elsif (/^no-hw$/)

			{

			$flags .= "-DNO_HW ";

			$openssl_other_defines .= "#define NO_HW\n";

			}

		elsif (/^no-dso$/)

			{ $no_dso=1; }

		elsif (/^no-threads$/)

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ SHLIBDIRS= crypto ssl 
SDIRS=  \

	md2 md4 md5 sha mdc2 hmac ripemd \

	des rc2 rc4 rc5 idea bf cast \

	bn rsa dsa dh dso rijndael \

	bn rsa dsa dh dso engine rijndael \

	buffer bio stack lhash rand err objects \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp

STATUS

+1 −1
Original line number Diff line number Diff line 


  OpenSSL STATUS                           Last modified at

  ______________                           $Date: 2000/10/23 14:36:18 $

  ______________                           $Date: 2000/10/26 21:07:27 $



  DEVELOPMENT STATE

TABLE

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) 
$cc           = gcc

$cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE

$lflags       = 

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$bn_obj       = asm/bn86-elf.o asm/co86-elf.o