Index: opensslconf-amd64.h
===================================================================
RCS file: /usr/repo/src/secure/lib/libcrypto/opensslconf-amd64.h,v
retrieving revision 1.6
diff -u -p -r1.6 opensslconf-amd64.h
--- opensslconf-amd64.h	29 Jul 2006 19:41:32 -0000	1.6
+++ opensslconf-amd64.h	11 Aug 2006 12:30:08 -0000
@@ -18,8 +18,37 @@
 #ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
 #endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
+
+/*
+ * Remove crypto engines we don't support.
+ * This leaves only cryptodev.
+ */
+#ifndef OPENSSL_NO_HW_4758_CCA
+# define OPENSSL_NO_HW_4758_CCA
+#endif
+#ifndef OPENSSL_NO_HW_AEP
+# define OPENSSL_NO_HW_AEP
+#endif
+#ifndef OPENSSL_NO_HW_ATALLA
+# define OPENSSL_NO_HW_ATALLA
+#endif
+#ifndef OPENSSL_NO_HW_CSWIFT
+# define OPENSSL_NO_HW_CSWIFT
+#endif
+#ifndef OPENSSL_NO_HW_NCIPHER
+# define OPENSSL_NO_HW_NCIPHER
+#endif
+#ifndef OPENSSL_NO_HW_NURON
+# define OPENSSL_NO_HW_NURON
+#endif
+#ifndef OPENSSL_NO_HW_SUREWARE
+# define OPENSSL_NO_HW_SUREWARE
+#endif
+#ifndef OPENSSL_NO_HW_UBSEC
+# define OPENSSL_NO_HW_UBSEC
+#endif
+#ifndef OPENSSL_NO_HW_PADLOCK
+# define OPENSSL_NO_HW_PADLOCK
 #endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
Index: opensslconf-arm.h
===================================================================
RCS file: /usr/repo/src/secure/lib/libcrypto/opensslconf-arm.h,v
retrieving revision 1.2
diff -u -p -r1.2 opensslconf-arm.h
--- opensslconf-arm.h	29 Jul 2006 19:41:32 -0000	1.2
+++ opensslconf-arm.h	11 Aug 2006 12:30:23 -0000
@@ -18,8 +18,37 @@
 #ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
 #endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
+
+/*
+ * Remove crypto engines we don't support.
+ * This leaves only cryptodev.
+ */
+#ifndef OPENSSL_NO_HW_4758_CCA
+# define OPENSSL_NO_HW_4758_CCA
+#endif
+#ifndef OPENSSL_NO_HW_AEP
+# define OPENSSL_NO_HW_AEP
+#endif
+#ifndef OPENSSL_NO_HW_ATALLA
+# define OPENSSL_NO_HW_ATALLA
+#endif
+#ifndef OPENSSL_NO_HW_CSWIFT
+# define OPENSSL_NO_HW_CSWIFT
+#endif
+#ifndef OPENSSL_NO_HW_NCIPHER
+# define OPENSSL_NO_HW_NCIPHER
+#endif
+#ifndef OPENSSL_NO_HW_NURON
+# define OPENSSL_NO_HW_NURON
+#endif
+#ifndef OPENSSL_NO_HW_SUREWARE
+# define OPENSSL_NO_HW_SUREWARE
+#endif
+#ifndef OPENSSL_NO_HW_UBSEC
+# define OPENSSL_NO_HW_UBSEC
+#endif
+#ifndef OPENSSL_NO_HW_PADLOCK
+# define OPENSSL_NO_HW_PADLOCK
 #endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
Index: opensslconf-i386.h
===================================================================
RCS file: /usr/repo/src/secure/lib/libcrypto/opensslconf-i386.h,v
retrieving revision 1.6
diff -u -p -r1.6 opensslconf-i386.h
--- opensslconf-i386.h	29 Jul 2006 19:41:32 -0000	1.6
+++ opensslconf-i386.h	11 Aug 2006 12:28:29 -0000
@@ -18,8 +18,34 @@
 #ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
 #endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
+
+/*
+ * Remove crypto engines we don't support.
+ * This leaves cryptodev and padlock.
+ */
+#ifndef OPENSSL_NO_HW_4758_CCA
+# define OPENSSL_NO_HW_4758_CCA
+#endif
+#ifndef OPENSSL_NO_HW_AEP
+# define OPENSSL_NO_HW_AEP
+#endif
+#ifndef OPENSSL_NO_HW_ATALLA
+# define OPENSSL_NO_HW_ATALLA
+#endif
+#ifndef OPENSSL_NO_HW_CSWIFT
+# define OPENSSL_NO_HW_CSWIFT
+#endif
+#ifndef OPENSSL_NO_HW_NCIPHER
+# define OPENSSL_NO_HW_NCIPHER
+#endif
+#ifndef OPENSSL_NO_HW_NURON
+# define OPENSSL_NO_HW_NURON
+#endif
+#ifndef OPENSSL_NO_HW_SUREWARE
+# define OPENSSL_NO_HW_SUREWARE
+#endif
+#ifndef OPENSSL_NO_HW_UBSEC
+# define OPENSSL_NO_HW_UBSEC
 #endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
Index: opensslconf-ia64.h
===================================================================
RCS file: /usr/repo/src/secure/lib/libcrypto/opensslconf-ia64.h,v
retrieving revision 1.5
diff -u -p -r1.5 opensslconf-ia64.h
--- opensslconf-ia64.h	29 Jul 2006 19:41:32 -0000	1.5
+++ opensslconf-ia64.h	11 Aug 2006 12:30:46 -0000
@@ -18,8 +18,37 @@
 #ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
 #endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
+
+/*
+ * Remove crypto engines we don't support.
+ * This leaves only cryptodev.
+ */
+#ifndef OPENSSL_NO_HW_4758_CCA
+# define OPENSSL_NO_HW_4758_CCA
+#endif
+#ifndef OPENSSL_NO_HW_AEP
+# define OPENSSL_NO_HW_AEP
+#endif
+#ifndef OPENSSL_NO_HW_ATALLA
+# define OPENSSL_NO_HW_ATALLA
+#endif
+#ifndef OPENSSL_NO_HW_CSWIFT
+# define OPENSSL_NO_HW_CSWIFT
+#endif
+#ifndef OPENSSL_NO_HW_NCIPHER
+# define OPENSSL_NO_HW_NCIPHER
+#endif
+#ifndef OPENSSL_NO_HW_NURON
+# define OPENSSL_NO_HW_NURON
+#endif
+#ifndef OPENSSL_NO_HW_SUREWARE
+# define OPENSSL_NO_HW_SUREWARE
+#endif
+#ifndef OPENSSL_NO_HW_UBSEC
+# define OPENSSL_NO_HW_UBSEC
+#endif
+#ifndef OPENSSL_NO_HW_PADLOCK
+# define OPENSSL_NO_HW_PADLOCK
 #endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
Index: opensslconf-powerpc.h
===================================================================
RCS file: /usr/repo/src/secure/lib/libcrypto/opensslconf-powerpc.h,v
retrieving revision 1.4
diff -u -p -r1.4 opensslconf-powerpc.h
--- opensslconf-powerpc.h	29 Jul 2006 19:41:32 -0000	1.4
+++ opensslconf-powerpc.h	11 Aug 2006 12:30:58 -0000
@@ -18,8 +18,37 @@
 #ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
 #endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
+
+/*
+ * Remove crypto engines we don't support.
+ * This leaves only cryptodev.
+ */
+#ifndef OPENSSL_NO_HW_4758_CCA
+# define OPENSSL_NO_HW_4758_CCA
+#endif
+#ifndef OPENSSL_NO_HW_AEP
+# define OPENSSL_NO_HW_AEP
+#endif
+#ifndef OPENSSL_NO_HW_ATALLA
+# define OPENSSL_NO_HW_ATALLA
+#endif
+#ifndef OPENSSL_NO_HW_CSWIFT
+# define OPENSSL_NO_HW_CSWIFT
+#endif
+#ifndef OPENSSL_NO_HW_NCIPHER
+# define OPENSSL_NO_HW_NCIPHER
+#endif
+#ifndef OPENSSL_NO_HW_NURON
+# define OPENSSL_NO_HW_NURON
+#endif
+#ifndef OPENSSL_NO_HW_SUREWARE
+# define OPENSSL_NO_HW_SUREWARE
+#endif
+#ifndef OPENSSL_NO_HW_UBSEC
+# define OPENSSL_NO_HW_UBSEC
+#endif
+#ifndef OPENSSL_NO_HW_PADLOCK
+# define OPENSSL_NO_HW_PADLOCK
 #endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
Index: opensslconf-sparc64.h
===================================================================
RCS file: /usr/repo/src/secure/lib/libcrypto/opensslconf-sparc64.h,v
retrieving revision 1.5
diff -u -p -r1.5 opensslconf-sparc64.h
--- opensslconf-sparc64.h	29 Jul 2006 19:41:32 -0000	1.5
+++ opensslconf-sparc64.h	11 Aug 2006 12:31:09 -0000
@@ -18,8 +18,37 @@
 #ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
 #endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
+
+/*
+ * Remove crypto engines we don't support.
+ * This leaves only cryptodev.
+ */
+#ifndef OPENSSL_NO_HW_4758_CCA
+# define OPENSSL_NO_HW_4758_CCA
+#endif
+#ifndef OPENSSL_NO_HW_AEP
+# define OPENSSL_NO_HW_AEP
+#endif
+#ifndef OPENSSL_NO_HW_ATALLA
+# define OPENSSL_NO_HW_ATALLA
+#endif
+#ifndef OPENSSL_NO_HW_CSWIFT
+# define OPENSSL_NO_HW_CSWIFT
+#endif
+#ifndef OPENSSL_NO_HW_NCIPHER
+# define OPENSSL_NO_HW_NCIPHER
+#endif
+#ifndef OPENSSL_NO_HW_NURON
+# define OPENSSL_NO_HW_NURON
+#endif
+#ifndef OPENSSL_NO_HW_SUREWARE
+# define OPENSSL_NO_HW_SUREWARE
+#endif
+#ifndef OPENSSL_NO_HW_UBSEC
+# define OPENSSL_NO_HW_UBSEC
+#endif
+#ifndef OPENSSL_NO_HW_PADLOCK
+# define OPENSSL_NO_HW_PADLOCK
 #endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application