From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sun, 26 Sep 2010 22:19:45 +0000 (-1000)
Subject: Merge branch 'vendor/OPENSSL'
X-Git-Tag: v2.9.0~74^2~34
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/5e4280d05cad56ce9c9d259d23e209d60609f371

Merge branch 'vendor/OPENSSL'
---

5e4280d05cad56ce9c9d259d23e209d60609f371
diff --cc crypto/openssl/crypto/engine/eng_cryptodev.c
index 396c619529,52f4ca3901..ee79d53411
--- a/crypto/openssl/crypto/engine/eng_cryptodev.c
+++ b/crypto/openssl/crypto/engine/eng_cryptodev.c
@@@ -30,15 -30,11 +30,11 @@@
  #include <openssl/engine.h>
  #include <openssl/evp.h>
  #include <openssl/bn.h>
- #include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/dh.h>
- #include <openssl/err.h>
  
  #if (defined(__unix__) || defined(unix)) && !defined(USG) && \
 -	(defined(OpenBSD) || defined(__FreeBSD__))
 +	(defined(OpenBSD) || defined(__FreeBSD__) || defined(__DragonFly__))
  #include <sys/param.h>
 -# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
 +# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || (__DragonFly_version >= 200500)
  #  define HAVE_CRYPTODEV
  # endif
  # if (OpenBSD >= 200110)