Merge the engine branch into the main trunk.  All conflicts resolved.
At the same time, add VMS support for Rijndael.

apps/apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 0951299..7a834f9 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -163,6 +163,7 @@
 #define FORMAT_NETSCAPE 4
 #define FORMAT_PKCS12   5
 #define FORMAT_SMIME    6
+#define FORMAT_ENGINE   7
 
 #define NETSCAPE_CERT_HDR	"certificate"