FreeBSD has /dev/crypto as well.

PR: 462

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 6bb7e93bb2f9a7b0bd5b984518d444895c67acda..7cc05bfe0be2294a8afd1892df2d7edbab850b24 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -97,19 +97,19 @@ void ENGINE_load_builtin_engines(void)
        ENGINE_load_4758cca();
 #endif
 #endif
        ENGINE_load_4758cca();
 #endif
 #endif

-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__FreeBSD__)

        ENGINE_load_cryptodev();
 #endif
 #endif
        }
 
        ENGINE_load_cryptodev();
 #endif
 #endif
        }
 

-#ifdef __OpenBSD__
-void ENGINE_setup_openbsd(void) {
-       static int openbsd_default_loaded = 0;
-       if (!openbsd_default_loaded) {
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
+void ENGINE_setup_bsd_cryptodev(void) {
+       static int bsd_cryptodev_default_loaded = 0;
+       if (!bsd_cryptodev_default_loaded) {

                ENGINE_load_cryptodev();
                ENGINE_register_all_complete();
        }
                ENGINE_load_cryptodev();
                ENGINE_register_all_complete();
        }

-       openbsd_default_loaded=1;
+       bsd_cryptodev_default_loaded=1;

 }
 #endif
 }
 #endif

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index be7ed6bb3f808c036859a1c5e4fd11a3e8d17fcb..a658528d315ccedd4e0aba844a001e3f44457f3a 100644 (file)
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -33,31 +33,28 @@
 #include <openssl/engine.h>
 #include <openssl/evp.h>
 
 #include <openssl/engine.h>
 #include <openssl/evp.h>
 

-#ifndef __OpenBSD__
-
-void
-ENGINE_load_cryptodev(void)
-{
-       /* This is a NOP unless __OpenBSD__ is defined */
-       return;
-}
-
-#else /* __OpenBSD__ */
-
-#include <sys/types.h>
+#if (defined(__unix__) || defined(unix)) && !defined(USG)

 #include <sys/param.h>
 #include <sys/param.h>

+# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 50000) || __FreeBSD_version >= 50041)
+#  define HAVE_CRYPTODEV
+# endif
+# if (OpenBSD >= 200110)
+#  define HAVE_SYSLOG_R
+# endif
+#endif

 
 

-#if OpenBSD < 200112
+#ifndef HAVE_CRYPTODEV

 
 void
 ENGINE_load_cryptodev(void)
 {
 
 void
 ENGINE_load_cryptodev(void)
 {

-       /* This is a NOP unless we have release 3.0 (released december 2001) */
+       /* This is a NOP on platforms without /dev/crypto */

        return;
 }
 
        return;
 }
 

-#else /* OpenBSD 3.0 or above */
-
+#else 
+ 
+#include <sys/types.h>

 #include <crypto/cryptodev.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <crypto/cryptodev.h>
 #include <sys/ioctl.h>
 #include <errno.h>


@@ -1032,12 +1029,18 @@ static DH_METHOD cryptodev_dh = {
 static int
 cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
 {
 static int
 cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
 {

+#ifdef HAVE_SYSLOG_R

        struct syslog_data sd = SYSLOG_DATA_INIT;
        struct syslog_data sd = SYSLOG_DATA_INIT;

+#endif

 
        switch (cmd) {
        default:
 
        switch (cmd) {
        default:

+#ifdef HAVE_SYSLOG_R

                syslog_r(LOG_ERR, &sd,
                    "cryptodev_ctrl: unknown command %d", cmd);
                syslog_r(LOG_ERR, &sd,
                    "cryptodev_ctrl: unknown command %d", cmd);

+#else
+               syslog(LOG_ERR, "cryptodev_ctrl: unknown command %d", cmd);
+#endif

                break;
        }
        return (1);
                break;
        }
        return (1);


@@ -1064,7 +1067,7 @@ ENGINE_load_cryptodev(void)
        close(fd);
 
        if (!ENGINE_set_id(engine, "cryptodev") ||
        close(fd);
 
        if (!ENGINE_set_id(engine, "cryptodev") ||

-           !ENGINE_set_name(engine, "OpenBSD cryptodev engine") ||
+           !ENGINE_set_name(engine, "BSD cryptodev engine") ||

            !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
            !ENGINE_set_digests(engine, cryptodev_engine_digests) ||
            !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) ||
            !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
            !ENGINE_set_digests(engine, cryptodev_engine_digests) ||
            !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) ||


@@ -1126,5 +1129,4 @@ ENGINE_load_cryptodev(void)
        ERR_clear_error();
 }
 
        ERR_clear_error();
 }
 

-#endif /* OpenBSD 3.0 or above */
-#endif /* __OpenBSD__ */
+#endif /* HAVE_CRYPTODEV */

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index 1bd54d791e3a293db7642bbc59804134d66af07e..af3dd261629a7184888c54aaa32f6f07a7ca009b 100644 (file)
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -73,7 +73,7 @@ void OPENSSL_add_all_algorithms_noconf(void)
        {
        OpenSSL_add_all_ciphers();
        OpenSSL_add_all_digests();
        {
        OpenSSL_add_all_ciphers();
        OpenSSL_add_all_digests();

-#ifdef __OpenBSD__
-       ENGINE_setup_openbsd();
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
+       ENGINE_setup_bsd_cryptodev();

 #endif
        }
 #endif
        }