diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
| commit | 367b2622e0527401666a65476f4111fdda2e3c12 (patch) | |
| tree | dc507d2394eb3b616bd9eae56d17671899a24a05 /lib/libcrypto/evp/c_all.c | |
| parent | ae9cbeba0dc25f0e95e6a0e50b6c161bf6384e17 (diff) | |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/evp/c_all.c')
| -rw-r--r-- | lib/libcrypto/evp/c_all.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/evp/c_all.c b/lib/libcrypto/evp/c_all.c index a5da52e62d8..766c4cecdf7 100644 --- a/lib/libcrypto/evp/c_all.c +++ b/lib/libcrypto/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 |