PR: 1974 (partial)

Submitted by: David McCullough <david_mccullough@securecomputing.com>
Approved by: steve@openssl.org

If -DHAVE_CRYPTODEV is set enable cryptodev support

diff --git a/INSTALL b/INSTALL
index 85e266019111962378b7720b30685fa13654116f..1325079f2a993b2bcd4346c1dd924b5800dea96c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -103,6 +103,12 @@
                 define preprocessor symbols, specify additional libraries,
                 library directories or other compiler options.
 
+  -DHAVE_CRYPTODEV Enable the BSD cryptodev engine even if we are not using
+               BSD. Useful if you are running ocf-linux or something
+               similar. Once enabled you can also enable the use of
+               cryptodev digests, which is usually slower unless you have
+               large amounts data. Use -DUSE_CRYPTODEV_DIGESTS to force
+               it.
 
  Installation in Detail
  ----------------------

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index a6f5499340a93f12d0ac5c2fe83444d61e72545f..22c120454f13dac85b2eb1c4c26a2c4f837fa5af 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -68,7 +68,7 @@ void ENGINE_load_builtin_engines(void)
         * *no* builtin implementations). */
        ENGINE_load_openssl();
 #endif
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
        ENGINE_load_cryptodev();
 #endif
        ENGINE_load_dynamic();
@@ -114,7 +114,7 @@ void ENGINE_load_builtin_engines(void)
 #endif
        }
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
 void ENGINE_setup_bsd_cryptodev(void) {
        static int bsd_cryptodev_default_loaded = 0;
        if (!bsd_cryptodev_default_loaded) {

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index 10b5d6787ac30b6c5b773b5364fbef0c318dd528..c411806066b9b65c09a8e579ce0c264b13bf2ed4 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -732,7 +732,7 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
  * values. */
 void *ENGINE_get_static_state(void);
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
 void ENGINE_setup_bsd_cryptodev(void);
 #endif
 

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index a5da52e62d8b03ef8625fe39eb64df4f59faf97e..766c4cecdf7e4bbea6ab9ed502ef9d13347c41a2 100644 (file)
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -83,7 +83,7 @@ void OPENSSL_add_all_algorithms_noconf(void)
        OpenSSL_add_all_ciphers();
        OpenSSL_add_all_digests();
 #ifndef OPENSSL_NO_ENGINE
-# if defined(__OpenBSD__) || defined(__FreeBSD__)
+# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
        ENGINE_setup_bsd_cryptodev();
 # endif
 #endif