Add code and changes to implement the ENGINE mechanism. These are the

patches that Geoff had in a patch file in his play directory.

NOTE for openssl-cvs:  THIS IS A CVS BRANCH (BRANCH_engine).  IT IS
NOT FOR THE FAINTHEARTED TO PLAY WITH.  The code works as it is, but
it's not at all sure it ends up in the OpenSSL distributio in this
form, so do not get dependent on it!

Those rsyncing the repository are considered warned!

1 files changed, 13 insertions, 1 deletions

diff --git a/Configure b/Configure
index 80b20efeef..af9833ef3e 100755
--- a/Configure
+++ b/Configure
@@ -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] [hw-xxx] [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".
 #
+# hw-xxx        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. Currently, hw-cswift is the only support
+#               of this form.
 # rsaref        use RSAref
 # [no-]threads  [don't] try to create a library that is suitable for
 #               multithreaded applications (default is "threads" if we
@@ -459,6 +464,13 @@ foreach (@ARGV)
 			$openssl_algorithm_defines .= "#define NO_MDC2\n";
 			}
 		}
+	elsif (/^hw-(.+)$/)
+		{
+		my $hw=$1;
+		$hw =~ tr/[a-z]/[A-Z]/;
+		$flags .= "-DHW_$hw ";
+		$openssl_other_defines .= "#define HW_$hw\n";
+		}
 	elsif (/^386$/)
 		{ $processor=386; }
 	elsif (/^rsaref$/)